remove unused constructor (also fix build error in mac osx)

etiennesky · etiennesky · commit bb7551bf6421 · 2012-09-16T23:06:54.000-03:00
diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -1251,20 +1251,11 @@ QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
 {
   Q_ASSERT( mArchive != NULL );
   QgsDebugMsg( "archiveName = " + archive->archiveName() + " viewType=" + ( int ) viewType );
+  // keep iconsize for now, but not effectively used
   mIconSize = QSize( 100, 15 );
   addRootItems();
 }
 
-QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
-    QgsCptCityArchive* archive, QVector< QgsCptCityDataItem* > rootItems )
-    : QAbstractItemModel( parent ), mArchive( archive ), mViewType( List )
-{
-  Q_ASSERT( mArchive != NULL );
-  QgsDebugMsg( QString( "archiveName = %1 / %2 rootItems" ).arg( archive->archiveName() ).arg( rootItems.count() ) );
-  mIconSize = QSize( 75, 50 ); // TODO pass this as an argument
-  mRootItems = rootItems;
-}
-
 QgsCptCityBrowserModel::~QgsCptCityBrowserModel()
 {
   removeRootItems();
@@ -1334,6 +1325,7 @@ QVariant QgsCptCityBrowserModel::data( const QModelIndex &index, int role ) cons
   else if ( role == Qt::DecorationRole && index.column() == 1 &&
             item->type() == QgsCptCityDataItem::ColorRamp )
   {
+    // keep iconsize for now, but not effectively used
     return item->icon( mIconSize );
   }
   else if ( role == Qt::FontRole &&
diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h
@@ -296,9 +296,6 @@ class CORE_EXPORT QgsCptCityBrowserModel : public QAbstractItemModel
     QgsCptCityBrowserModel( QObject* parent = 0,
                             QgsCptCityArchive* archive = QgsCptCityArchive::defaultArchive(),
                             ViewType Type = Authors );
-    QgsCptCityBrowserModel( QObject* parent = 0,
-                            QgsCptCityArchive* archive = QgsCptCityArchive::defaultArchive(),
-                            QVector< QgsCptCityDataItem* > rootItems = 0 );
     ~QgsCptCityBrowserModel();
 
     // implemented methods from QAbstractItemModel for read-only access

Original file line number	Diff line number	Diff line change
`@@ -1251,20 +1251,11 @@ QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,`
`1251`	`1251`	`{`
`1252`	`1252`	`Q_ASSERT( mArchive != NULL );`
`1253`	`1253`	`QgsDebugMsg( "archiveName = " + archive->archiveName() + " viewType=" + ( int ) viewType );`
	`1254`	`+ // keep iconsize for now, but not effectively used`
`1254`	`1255`	`mIconSize = QSize( 100, 15 );`
`1255`	`1256`	`addRootItems();`
`1256`	`1257`	`}`
`1257`	`1258`
`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`		`-`
`1268`	`1259`	`QgsCptCityBrowserModel::~QgsCptCityBrowserModel()`
`1269`	`1260`	`{`
`1270`	`1261`	`removeRootItems();`
`@@ -1334,6 +1325,7 @@ QVariant QgsCptCityBrowserModel::data( const QModelIndex &index, int role ) cons`
`1334`	`1325`	`else if ( role == Qt::DecorationRole && index.column() == 1 &&`
`1335`	`1326`	`item->type() == QgsCptCityDataItem::ColorRamp )`
`1336`	`1327`	`{`
	`1328`	`+ // keep iconsize for now, but not effectively used`
`1337`	`1329`	`return item->icon( mIconSize );`
`1338`	`1330`	`}`
`1339`	`1331`	`else if ( role == Qt::FontRole &&`