Skip to content

Commit bb7551b

Browse files
committedSep 17, 2012
remove unused constructor (also fix build error in mac osx)
1 parent f2cc1d1 commit bb7551b

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed
 

‎src/core/symbology-ng/qgscptcityarchive.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,20 +1251,11 @@ QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
12511251
{
12521252
Q_ASSERT( mArchive != NULL );
12531253
QgsDebugMsg( "archiveName = " + archive->archiveName() + " viewType=" + ( int ) viewType );
1254+
// keep iconsize for now, but not effectively used
12541255
mIconSize = QSize( 100, 15 );
12551256
addRootItems();
12561257
}
12571258

1258-
QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
1259-
QgsCptCityArchive* archive, QVector< QgsCptCityDataItem* > rootItems )
1260-
: QAbstractItemModel( parent ), mArchive( archive ), mViewType( List )
1261-
{
1262-
Q_ASSERT( mArchive != NULL );
1263-
QgsDebugMsg( QString( "archiveName = %1 / %2 rootItems" ).arg( archive->archiveName() ).arg( rootItems.count() ) );
1264-
mIconSize = QSize( 75, 50 ); // TODO pass this as an argument
1265-
mRootItems = rootItems;
1266-
}
1267-
12681259
QgsCptCityBrowserModel::~QgsCptCityBrowserModel()
12691260
{
12701261
removeRootItems();
@@ -1334,6 +1325,7 @@ QVariant QgsCptCityBrowserModel::data( const QModelIndex &index, int role ) cons
13341325
else if ( role == Qt::DecorationRole && index.column() == 1 &&
13351326
item->type() == QgsCptCityDataItem::ColorRamp )
13361327
{
1328+
// keep iconsize for now, but not effectively used
13371329
return item->icon( mIconSize );
13381330
}
13391331
else if ( role == Qt::FontRole &&

‎src/core/symbology-ng/qgscptcityarchive.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,6 @@ class CORE_EXPORT QgsCptCityBrowserModel : public QAbstractItemModel
296296
QgsCptCityBrowserModel( QObject* parent = 0,
297297
QgsCptCityArchive* archive = QgsCptCityArchive::defaultArchive(),
298298
ViewType Type = Authors );
299-
QgsCptCityBrowserModel( QObject* parent = 0,
300-
QgsCptCityArchive* archive = QgsCptCityArchive::defaultArchive(),
301-
QVector< QgsCptCityDataItem* > rootItems = 0 );
302299
~QgsCptCityBrowserModel();
303300

304301
// implemented methods from QAbstractItemModel for read-only access

0 commit comments

Comments
 (0)
Please sign in to comment.