Skip to content
Permalink
Browse files

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

  • Loading branch information
etiennesky committed Sep 17, 2012
1 parent f2cc1d1 commit bb7551bf642121092604c8cc61d0ac61b8e40976
Showing with 2 additions and 13 deletions.
  1. +2 −10 src/core/symbology-ng/qgscptcityarchive.cpp
  2. +0 −3 src/core/symbology-ng/qgscptcityarchive.h
@@ -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 &&
@@ -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

0 comments on commit bb7551b

Please sign in to comment.
You can’t perform that action at this time.