From bb7551bf642121092604c8cc61d0ac61b8e40976 Mon Sep 17 00:00:00 2001 From: Etienne Tourigny Date: Sun, 16 Sep 2012 23:06:54 -0300 Subject: [PATCH] remove unused constructor (also fix build error in mac osx) --- src/core/symbology-ng/qgscptcityarchive.cpp | 12 ++---------- src/core/symbology-ng/qgscptcityarchive.h | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp index 0ccc3cc98e11..d1a6d3d97c58 100644 --- 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 index f4af32cbcb81..10cabef843aa 100644 --- 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