Hide QgsDataItem members: use getters for access

wonder-sk · wonder-sk · commit c2457ae4fdee · 2011-05-16T23:42:22.000+02:00
diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp
@@ -90,7 +90,7 @@ void QgsBrowser::expand( QString path, const QModelIndex& index )
     QModelIndex idx = mModel->index(i, 0, index);
     QgsDataItem* ptr = (QgsDataItem*) idx.internalPointer();
 
-    if ( path.indexOf ( ptr->mPath ) == 0 )
+    if ( path.indexOf ( ptr->path() ) == 0 )
     {
       treeView->expand( idx );
       treeView->scrollTo (idx, QAbstractItemView::PositionAtTop );
@@ -145,7 +145,7 @@ void QgsBrowser::itemClicked(const QModelIndex& index)
     paramEnable = true;
   }
 
-  if (ptr->mType == QgsDataItem::Layer)
+  if (ptr->type() == QgsDataItem::Layer)
   {
     QgsLayerItem* item = static_cast<QgsLayerItem*>(ptr);
     bool res = layerClicked(item);
@@ -186,7 +186,7 @@ void QgsBrowser::itemClicked(const QModelIndex& index)
     tabWidget->setCurrentIndex ( selected );
   }
 
-  qDebug("clicked: %d %d %s", index.row(), index.column(), ptr->mName.toAscii().data());
+  qDebug("clicked: %d %d %s", index.row(), index.column(), ptr->name().toAscii().data());
 }
 
 bool QgsBrowser::layerClicked(QgsLayerItem* ptr)
@@ -250,7 +250,7 @@ void QgsBrowser::itemDoubleClicked(const QModelIndex& index)
   QgsDataItem* ptr = (QgsDataItem*) index.internalPointer();
 
   ptr->doubleClick();
-  qDebug("doubleclicked: %d %d %s", index.row(), index.column(), ptr->mName.toAscii().data());
+  qDebug("doubleclicked: %d %d %s", index.row(), index.column(), ptr->name().toAscii().data());
 }
 
 void QgsBrowser::itemExpanded(const QModelIndex& index)
@@ -265,8 +265,8 @@ void QgsBrowser::itemExpanded(const QModelIndex& index)
   }
 */
   // TODO: save separately each type (FS, WMS)
-  settings.setValue ( "/Browser/lastExpanded", ptr->mPath );
-  QgsDebugMsg( "last expanded: " + ptr->mPath );
+  settings.setValue ( "/Browser/lastExpanded", ptr->path() );
+  QgsDebugMsg( "last expanded: " + ptr->path() );
 }
 
 void QgsBrowser::newVectorLayer()
@@ -320,7 +320,7 @@ void QgsBrowser::on_mActionSetProjection_triggered()
     // selectedIndexes() is protected
 
     QgsDataItem* ptr = (QgsDataItem*) mIndex.internalPointer();
-    if ( ptr->mType == QgsDataItem::Layer )
+    if ( ptr->type() == QgsDataItem::Layer )
     {
       QgsLayerItem* layerItem = static_cast<QgsLayerItem*>(ptr);
       if ( ! layerItem->setCrs ( srs ) )
@@ -490,7 +490,7 @@ void QgsBrowser::refresh( const QModelIndex& index )
   if ( index.isValid() ) 
   {
     QgsDataItem* item = (QgsDataItem*) index.internalPointer();
-    QgsDebugMsg( "path = " + item->mPath );
+    QgsDebugMsg( "path = " + item->path() );
   }
   mModel->refresh( index );
   for ( int i = 0 ; i < mModel->rowCount(index); i++ ) 
diff --git a/src/browser/qgsbrowsermodel.cpp b/src/browser/qgsbrowsermodel.cpp
@@ -57,7 +57,7 @@ QgsBrowserModel::QgsBrowserModel(QObject *parent) :
     QgsDataItem * item = dataItem ( "", NULL ); // empty path -> top level
     if ( item )
     {
-      QgsDebugMsg ( "Add new top level item : " + item->mName );
+      QgsDebugMsg ( "Add new top level item : " + item->name() );
       connectItem(item);
       mRootItems << item;
     }
@@ -88,7 +88,7 @@ QVariant QgsBrowserModel::data( const QModelIndex & index, int role ) const
 
   if (role == Qt::DisplayRole)
   {
-     return QVariant(ptr->mName);
+     return QVariant(ptr->name());
   }
   else if (role == Qt::DecorationRole && index.column() == 0)
   {
@@ -162,13 +162,13 @@ QModelIndex QgsBrowserModel::index( int row, int column, const QModelIndex & par
   {
     // this is ordinary item: return a valid index if the requested child exists
     QgsDataItem* ptr = (QgsDataItem*) parent.internalPointer();
-    if (ptr->mType == QgsDataItem::Directory || ptr->mType == QgsDataItem::Collection)
+    if (ptr->type() == QgsDataItem::Directory || ptr->type() == QgsDataItem::Collection)
     {
       // this is a directory: get index of its subdir!
       QgsDirectoryItem* di = (QgsDirectoryItem*) ptr;
-      return createIndex(row, column, di->mChildren.at(row));
+      return createIndex(row, column, di->children().at(row));
     }
-    if (ptr->mType == QgsDataItem::Layer)
+    if (ptr->type() == QgsDataItem::Layer)
     {
       return QModelIndex(); // has no children
     }
@@ -184,7 +184,7 @@ QModelIndex QgsBrowserModel::index( QgsDataItem *item )
   // Item index
   QModelIndex index = QModelIndex();
 
-  const QVector<QgsDataItem*>& children = item->mParent ? item->mParent->mChildren : mRootItems;
+  const QVector<QgsDataItem*>& children = item->parent() ? item->parent()->children() : mRootItems;
 
   Q_ASSERT( children.size() > 0 );
   int row = -1;
@@ -213,7 +213,7 @@ QModelIndex QgsBrowserModel::parent( const QModelIndex & index ) const
   //qDebug("parent of: %d %d", index.row(), index.column());
 
   QgsDataItem* ptr = (QgsDataItem*) index.internalPointer();
-  QgsDataItem* parentItem = ptr->mParent;
+  QgsDataItem* parentItem = ptr->parent();
 
   if (parentItem == NULL)
   {
@@ -222,7 +222,7 @@ QModelIndex QgsBrowserModel::parent( const QModelIndex & index ) const
   }
 
   const QVector<QgsDataItem*>& children =
-      parentItem->mParent ? ((QgsDirectoryItem*)parentItem->mParent)->mChildren : mRootItems;
+      parentItem->parent() ? ((QgsDirectoryItem*)parentItem->parent())->children() : mRootItems;
   Q_ASSERT(children.count() > 0);
 
   for (int i = 0; i < children.count(); i++)
@@ -243,13 +243,13 @@ void QgsBrowserModel::refresh( QString path, const QModelIndex& theIndex )
   {
     QModelIndex idx = index(i, 0, theIndex);
     QgsDataItem* ptr = (QgsDataItem*) idx.internalPointer();
-    if ( ptr->mPath == path )
+    if ( ptr->path() == path )
     {
-      QgsDebugMsg( "Arrived " + ptr->mPath );
+      QgsDebugMsg( "Arrived " + ptr->path() );
       ptr->refresh();
       return;
     }
-    if ( path.indexOf ( ptr->mPath ) == 0 )
+    if ( path.indexOf ( ptr->path() ) == 0 )
     {
       refresh( path, idx );
       break;
@@ -267,14 +267,14 @@ void QgsBrowserModel::refresh( const QModelIndex& theIndex )
   else
   {
     QgsDataItem* ptr = (QgsDataItem*) theIndex.internalPointer();
-    QgsDebugMsg( "Refresh " + ptr->mPath );
+    QgsDebugMsg( "Refresh " + ptr->path() );
     ptr->refresh();
   }
 }
 
 void QgsBrowserModel::beginInsertItems( QgsDataItem* parent, int first, int last )
 {
-  QgsDebugMsg( "parent mPath = " + parent->mPath );
+  QgsDebugMsg( "parent mPath = " + parent->path() );
   QModelIndex idx = index( parent );
   if ( !idx.isValid() ) return;
   QgsDebugMsg( "valid");
@@ -288,7 +288,7 @@ void QgsBrowserModel::endInsertItems()
 }
 void QgsBrowserModel::beginRemoveItems( QgsDataItem* parent, int first, int last )
 {
-  QgsDebugMsg( "parent mPath = " + parent->mPath );
+  QgsDebugMsg( "parent mPath = " + parent->path() );
   QModelIndex idx = index( parent );
   if ( !idx.isValid() ) return;
   beginRemoveRows( idx, first, last );
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -46,12 +46,6 @@ QIcon QgsDataCollectionItem::sDirIcon;
 QgsDataItem::QgsDataItem(QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path)
   : QObject(parent), mType(type), mParent(parent), mPopulated(false), mName(name), mPath(path)
 {
-  QgsDebugMsg(QString("@ %1 %2 %3").arg(mType).arg((unsigned long)mParent).arg(mPath));
-}
-
-QIcon QgsDataItem::icon()
-{
-  return mIcon;
 }
 
 // TODO: This is copy from QgisApp, bad
@@ -227,9 +221,8 @@ QgsLayerItem::QgsLayerItem(QgsDataItem* parent, QString name, QString path, QStr
 bool QgsLayerItem::equal(const QgsDataItem *other)
 {
   //QgsDebugMsg ( mPath + " x " + other->mPath );
-  if ( typeid ( *this ) != typeid ( *other ) )
+  if ( type() != other->type() )
   {
-    //QgsDebugMsg ( "different typeid" );
     return false;
   }
   //const QgsLayerItem *o = qobject_cast<const QgsLayerItem *> ( other );
@@ -356,12 +349,11 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
 bool QgsDirectoryItem::equal(const QgsDataItem *other)
 {
   //QgsDebugMsg ( mPath + " x " + other->mPath );
-  if ( typeid ( *this ) != typeid ( *other ) )
+  if ( type() != other->type() )
   {
-    //QgsDebugMsg ( "different typeid" );
     return false;
   }
-  return ( mPath == other->mPath );
+  return ( path() == other->path() );
 }
 
 QWidget * QgsDirectoryItem::paramWidget()
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -56,8 +56,6 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     int rowCount();
 
-    QIcon icon();
-
     //
 
     virtual void refresh();
@@ -88,13 +86,22 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     // members
 
+    Type type() const { return mType; }
+    QgsDataItem* parent() const { return mParent; }
+    QVector<QgsDataItem*> children() const { return mChildren; }
+    QIcon icon() const { return mIcon; }
+    QString name() const { return mName; }
+    QString path() const { return mPath; }
+
+  protected:
+
     Type mType;
     QgsDataItem* mParent;
     QVector<QgsDataItem*> mChildren; // easier to have it always
     bool mPopulated;
     QString mName;
-    QIcon mIcon;
     QString mPath; // it is also used to identify item in tree
+    QIcon mIcon;
 
   public slots:
     virtual void doubleClick();
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3095,7 +3095,7 @@ QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
 
 bool QgsWMSConnectionItem::equal(const QgsDataItem *other)
 {
-  if ( typeid ( *this ) != typeid ( *other ) )
+  if ( type() != other->type() )
   {
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void QgsBrowser::expand( QString path, const QModelIndex& index )`
`90`	`90`	`QModelIndex idx = mModel->index(i, 0, index);`
`91`	`91`	`QgsDataItem* ptr = (QgsDataItem*) idx.internalPointer();`
`92`	`92`
`93`		`- if ( path.indexOf ( ptr->mPath ) == 0 )`
	`93`	`+ if ( path.indexOf ( ptr->path() ) == 0 )`
`94`	`94`	`{`
`95`	`95`	`treeView->expand( idx );`
`96`	`96`	`treeView->scrollTo (idx, QAbstractItemView::PositionAtTop );`
`@@ -145,7 +145,7 @@ void QgsBrowser::itemClicked(const QModelIndex& index)`
`145`	`145`	`paramEnable = true;`
`146`	`146`	`}`
`147`	`147`
`148`		`- if (ptr->mType == QgsDataItem::Layer)`
	`148`	`+ if (ptr->type() == QgsDataItem::Layer)`
`149`	`149`	`{`
`150`	`150`	`QgsLayerItem* item = static_cast<QgsLayerItem*>(ptr);`
`151`	`151`	`bool res = layerClicked(item);`
`@@ -186,7 +186,7 @@ void QgsBrowser::itemClicked(const QModelIndex& index)`
`186`	`186`	`tabWidget->setCurrentIndex ( selected );`
`187`	`187`	`}`
`188`	`188`
`189`		`- qDebug("clicked: %d %d %s", index.row(), index.column(), ptr->mName.toAscii().data());`
	`189`	`+ qDebug("clicked: %d %d %s", index.row(), index.column(), ptr->name().toAscii().data());`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`bool QgsBrowser::layerClicked(QgsLayerItem* ptr)`
`@@ -250,7 +250,7 @@ void QgsBrowser::itemDoubleClicked(const QModelIndex& index)`
`250`	`250`	`QgsDataItem* ptr = (QgsDataItem*) index.internalPointer();`
`251`	`251`
`252`	`252`	`ptr->doubleClick();`
`253`		`- qDebug("doubleclicked: %d %d %s", index.row(), index.column(), ptr->mName.toAscii().data());`
	`253`	`+ qDebug("doubleclicked: %d %d %s", index.row(), index.column(), ptr->name().toAscii().data());`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`void QgsBrowser::itemExpanded(const QModelIndex& index)`
`@@ -265,8 +265,8 @@ void QgsBrowser::itemExpanded(const QModelIndex& index)`
`265`	`265`	`}`
`266`	`266`	`*/`
`267`	`267`	`// TODO: save separately each type (FS, WMS)`
`268`		`- settings.setValue ( "/Browser/lastExpanded", ptr->mPath );`
`269`		`- QgsDebugMsg( "last expanded: " + ptr->mPath );`
	`268`	`+ settings.setValue ( "/Browser/lastExpanded", ptr->path() );`
	`269`	`+ QgsDebugMsg( "last expanded: " + ptr->path() );`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`void QgsBrowser::newVectorLayer()`
`@@ -320,7 +320,7 @@ void QgsBrowser::on_mActionSetProjection_triggered()`
`320`	`320`	`// selectedIndexes() is protected`
`321`	`321`
`322`	`322`	`QgsDataItem* ptr = (QgsDataItem*) mIndex.internalPointer();`
`323`		`- if ( ptr->mType == QgsDataItem::Layer )`
	`323`	`+ if ( ptr->type() == QgsDataItem::Layer )`
`324`	`324`	`{`
`325`	`325`	`QgsLayerItem* layerItem = static_cast<QgsLayerItem*>(ptr);`
`326`	`326`	`if ( ! layerItem->setCrs ( srs ) )`
`@@ -490,7 +490,7 @@ void QgsBrowser::refresh( const QModelIndex& index )`
`490`	`490`	`if ( index.isValid() )`
`491`	`491`	`{`
`492`	`492`	`QgsDataItem* item = (QgsDataItem*) index.internalPointer();`
`493`		`- QgsDebugMsg( "path = " + item->mPath );`
	`493`	`+ QgsDebugMsg( "path = " + item->path() );`
`494`	`494`	`}`
`495`	`495`	`mModel->refresh( index );`
`496`	`496`	`for ( int i = 0 ; i < mModel->rowCount(index); i++ )`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ QgsBrowserModel::QgsBrowserModel(QObject *parent) :`
`57`	`57`	`QgsDataItem * item = dataItem ( "", NULL ); // empty path -> top level`
`58`	`58`	`if ( item )`
`59`	`59`	`{`
`60`		`- QgsDebugMsg ( "Add new top level item : " + item->mName );`
	`60`	`+ QgsDebugMsg ( "Add new top level item : " + item->name() );`
`61`	`61`	`connectItem(item);`
`62`	`62`	`mRootItems << item;`
`63`	`63`	`}`
`@@ -88,7 +88,7 @@ QVariant QgsBrowserModel::data( const QModelIndex & index, int role ) const`
`88`	`88`
`89`	`89`	`if (role == Qt::DisplayRole)`
`90`	`90`	`{`
`91`		`- return QVariant(ptr->mName);`
	`91`	`+ return QVariant(ptr->name());`
`92`	`92`	`}`
`93`	`93`	`else if (role == Qt::DecorationRole && index.column() == 0)`
`94`	`94`	`{`
`@@ -162,13 +162,13 @@ QModelIndex QgsBrowserModel::index( int row, int column, const QModelIndex & par`
`162`	`162`	`{`
`163`	`163`	`// this is ordinary item: return a valid index if the requested child exists`
`164`	`164`	`QgsDataItem* ptr = (QgsDataItem*) parent.internalPointer();`
`165`		`- if (ptr->mType == QgsDataItem::Directory \|\| ptr->mType == QgsDataItem::Collection)`
	`165`	`+ if (ptr->type() == QgsDataItem::Directory \|\| ptr->type() == QgsDataItem::Collection)`
`166`	`166`	`{`
`167`	`167`	`// this is a directory: get index of its subdir!`
`168`	`168`	`QgsDirectoryItem* di = (QgsDirectoryItem*) ptr;`
`169`		`- return createIndex(row, column, di->mChildren.at(row));`
	`169`	`+ return createIndex(row, column, di->children().at(row));`
`170`	`170`	`}`
`171`		`- if (ptr->mType == QgsDataItem::Layer)`
	`171`	`+ if (ptr->type() == QgsDataItem::Layer)`
`172`	`172`	`{`
`173`	`173`	`return QModelIndex(); // has no children`
`174`	`174`	`}`
`@@ -184,7 +184,7 @@ QModelIndex QgsBrowserModel::index( QgsDataItem *item )`
`184`	`184`	`// Item index`
`185`	`185`	`QModelIndex index = QModelIndex();`
`186`	`186`
`187`		`- const QVector<QgsDataItem*>& children = item->mParent ? item->mParent->mChildren : mRootItems;`
	`187`	`+ const QVector<QgsDataItem*>& children = item->parent() ? item->parent()->children() : mRootItems;`
`188`	`188`
`189`	`189`	`Q_ASSERT( children.size() > 0 );`
`190`	`190`	`int row = -1;`
`@@ -213,7 +213,7 @@ QModelIndex QgsBrowserModel::parent( const QModelIndex & index ) const`
`213`	`213`	`//qDebug("parent of: %d %d", index.row(), index.column());`
`214`	`214`
`215`	`215`	`QgsDataItem* ptr = (QgsDataItem*) index.internalPointer();`
`216`		`- QgsDataItem* parentItem = ptr->mParent;`
	`216`	`+ QgsDataItem* parentItem = ptr->parent();`
`217`	`217`
`218`	`218`	`if (parentItem == NULL)`
`219`	`219`	`{`
`@@ -222,7 +222,7 @@ QModelIndex QgsBrowserModel::parent( const QModelIndex & index ) const`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`const QVector<QgsDataItem*>& children =`
`225`		`- parentItem->mParent ? ((QgsDirectoryItem*)parentItem->mParent)->mChildren : mRootItems;`
	`225`	`+ parentItem->parent() ? ((QgsDirectoryItem*)parentItem->parent())->children() : mRootItems;`
`226`	`226`	`Q_ASSERT(children.count() > 0);`
`227`	`227`
`228`	`228`	`for (int i = 0; i < children.count(); i++)`
`@@ -243,13 +243,13 @@ void QgsBrowserModel::refresh( QString path, const QModelIndex& theIndex )`
`243`	`243`	`{`
`244`	`244`	`QModelIndex idx = index(i, 0, theIndex);`
`245`	`245`	`QgsDataItem* ptr = (QgsDataItem*) idx.internalPointer();`
`246`		`- if ( ptr->mPath == path )`
	`246`	`+ if ( ptr->path() == path )`
`247`	`247`	`{`
`248`		`- QgsDebugMsg( "Arrived " + ptr->mPath );`
	`248`	`+ QgsDebugMsg( "Arrived " + ptr->path() );`
`249`	`249`	`ptr->refresh();`
`250`	`250`	`return;`
`251`	`251`	`}`
`252`		`- if ( path.indexOf ( ptr->mPath ) == 0 )`
	`252`	`+ if ( path.indexOf ( ptr->path() ) == 0 )`
`253`	`253`	`{`
`254`	`254`	`refresh( path, idx );`
`255`	`255`	`break;`
`@@ -267,14 +267,14 @@ void QgsBrowserModel::refresh( const QModelIndex& theIndex )`
`267`	`267`	`else`
`268`	`268`	`{`
`269`	`269`	`QgsDataItem* ptr = (QgsDataItem*) theIndex.internalPointer();`
`270`		`- QgsDebugMsg( "Refresh " + ptr->mPath );`
	`270`	`+ QgsDebugMsg( "Refresh " + ptr->path() );`
`271`	`271`	`ptr->refresh();`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`void QgsBrowserModel::beginInsertItems( QgsDataItem* parent, int first, int last )`
`276`	`276`	`{`
`277`		`- QgsDebugMsg( "parent mPath = " + parent->mPath );`
	`277`	`+ QgsDebugMsg( "parent mPath = " + parent->path() );`
`278`	`278`	`QModelIndex idx = index( parent );`
`279`	`279`	`if ( !idx.isValid() ) return;`
`280`	`280`	`QgsDebugMsg( "valid");`
`@@ -288,7 +288,7 @@ void QgsBrowserModel::endInsertItems()`
`288`	`288`	`}`
`289`	`289`	`void QgsBrowserModel::beginRemoveItems( QgsDataItem* parent, int first, int last )`
`290`	`290`	`{`
`291`		`- QgsDebugMsg( "parent mPath = " + parent->mPath );`
	`291`	`+ QgsDebugMsg( "parent mPath = " + parent->path() );`
`292`	`292`	`QModelIndex idx = index( parent );`
`293`	`293`	`if ( !idx.isValid() ) return;`
`294`	`294`	`beginRemoveRows( idx, first, last );`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,6 @@ QIcon QgsDataCollectionItem::sDirIcon;`
`46`	`46`	`QgsDataItem::QgsDataItem(QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path)`
`47`	`47`	`: QObject(parent), mType(type), mParent(parent), mPopulated(false), mName(name), mPath(path)`
`48`	`48`	`{`
`49`		`- QgsDebugMsg(QString("@ %1 %2 %3").arg(mType).arg((unsigned long)mParent).arg(mPath));`
`50`		`-}`
`51`		`-`
`52`		`-QIcon QgsDataItem::icon()`
`53`		`-{`
`54`		`- return mIcon;`
`55`	`49`	`}`
`56`	`50`
`57`	`51`	`// TODO: This is copy from QgisApp, bad`
`@@ -227,9 +221,8 @@ QgsLayerItem::QgsLayerItem(QgsDataItem* parent, QString name, QString path, QStr`
`227`	`221`	`bool QgsLayerItem::equal(const QgsDataItem *other)`
`228`	`222`	`{`
`229`	`223`	`//QgsDebugMsg ( mPath + " x " + other->mPath );`
`230`		`- if ( typeid ( this ) != typeid ( other ) )`
	`224`	`+ if ( type() != other->type() )`
`231`	`225`	`{`
`232`		`- //QgsDebugMsg ( "different typeid" );`
`233`	`226`	`return false;`
`234`	`227`	`}`
`235`	`228`	`//const QgsLayerItem o = qobject_cast<const QgsLayerItem > ( other );`
`@@ -356,12 +349,11 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )`
`356`	`349`	`bool QgsDirectoryItem::equal(const QgsDataItem *other)`
`357`	`350`	`{`
`358`	`351`	`//QgsDebugMsg ( mPath + " x " + other->mPath );`
`359`		`- if ( typeid ( this ) != typeid ( other ) )`
	`352`	`+ if ( type() != other->type() )`
`360`	`353`	`{`
`361`		`- //QgsDebugMsg ( "different typeid" );`
`362`	`354`	`return false;`
`363`	`355`	`}`
`364`		`- return ( mPath == other->mPath );`
	`356`	`+ return ( path() == other->path() );`
`365`	`357`	`}`
`366`	`358`
`367`	`359`	`QWidget * QgsDirectoryItem::paramWidget()`
Original file line number	Diff line number	Diff line change
`@@ -3095,7 +3095,7 @@ QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()`
`3095`	`3095`
`3096`	`3096`	`bool QgsWMSConnectionItem::equal(const QgsDataItem *other)`
`3097`	`3097`	`{`
`3098`		`- if ( typeid ( this ) != typeid ( other ) )`
	`3098`	`+ if ( type() != other->type() )`
`3099`	`3099`	`{`
`3100`	`3100`	`return false;`
`3101`	`3101`	`}`