QgsLayerItem uri/providerKey/mapLayerType better vithout virtual methods

qgis · May 18, 2011 · 0797640 · 0797640
1 parent b4fde40
commit 0797640
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 32 deletions.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -195,8 +195,9 @@ void QgsDataItem::refresh()
 
 // ---------------------------------------------------------------------
 
-QgsLayerItem::QgsLayerItem(QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType)
-  : QgsDataItem(Layer, parent, name, path), mUri(uri), mLayerType(layerType)
+QgsLayerItem::QgsLayerItem(QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType, QString providerKey)
+  : QgsDataItem(Layer, parent, name, path), mUri(uri), mLayerType(layerType),
+    mProviderKey(providerKey)
 {
   if (sIconPoint.isNull())
   {
@@ -218,6 +219,12 @@ QgsLayerItem::QgsLayerItem(QgsDataItem* parent, QString name, QString path, QStr
   }
 }
 
+QgsMapLayer::LayerType QgsLayerItem::mapLayerType()
+{
+  if ( mLayerType == QgsLayerItem::Raster ) return QgsMapLayer::RasterLayer;
+  return QgsMapLayer::VectorLayer;
+}
+
 bool QgsLayerItem::equal(const QgsDataItem *other)
 {
   //QgsDebugMsg ( mPath + " x " + other->mPath );
@@ -227,7 +234,7 @@ bool QgsLayerItem::equal(const QgsDataItem *other)
   }
   //const QgsLayerItem *o = qobject_cast<const QgsLayerItem *> ( other );
   const QgsLayerItem *o = dynamic_cast<const QgsLayerItem *> ( other );
-  return ( mPath == o->mPath && mName == o->mName && mUri == o->mUri && mProvider == o->mProvider );
+  return ( mPath == o->mPath && mName == o->mName && mUri == o->mUri && mProviderKey == o->mProviderKey );
 }
 
 // ---------------------------------------------------------------------

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -140,7 +140,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
     SetCrs         =          1 //Can set CRS on layer or group of layers
   };
 
-  QgsLayerItem(QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType);
+  QgsLayerItem(QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType, QString providerKey);
 
   // --- reimplemented from QgsDataItem ---
 
@@ -149,13 +149,13 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
   // --- New virtual methods for layer item derived classes ---
 
   // Returns QgsMapLayer::LayerType  
-  virtual QgsMapLayer::LayerType mapLayerType() { return QgsMapLayer::VectorLayer; }
+  QgsMapLayer::LayerType mapLayerType();
 
   // Returns layer uri or empty string if layer cannot be created
-  virtual QString uri() { return QString(); }
+  QString uri() { return mUri; }
 
   // Returns provider key 
-  virtual QString providerKey() { return QString(); }
+  QString providerKey() { return mProviderKey; }
 
   // This will _write_ selected crs in data source
   virtual bool setCrs ( QgsCoordinateReferenceSystem crs ) { return false; }
@@ -164,7 +164,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
 
 protected:
 
-  QString mProvider;
+  QString mProviderKey;
   QString mUri;
   LayerType mLayerType;
 

diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -1876,19 +1876,14 @@ QGISEXTERN int dataCapabilities () {
 
 QgsGdalLayerItem::QgsGdalLayerItem ( QgsDataItem* parent,
     QString name, QString path, QString uri )
-  : QgsLayerItem ( parent, name, path, uri, QgsLayerItem::Raster )
+  : QgsLayerItem ( parent, name, path, uri, QgsLayerItem::Raster, "gdal" )
 {
 }
 
 QgsGdalLayerItem::~QgsGdalLayerItem ()
 {
 }
 
-QString QgsGdalLayerItem::uri()
-{
-  return mUri;
-}
-
 QgsLayerItem::Capability QgsGdalLayerItem::capabilities()
 {
   // Check if data sour can be opened for update

diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
@@ -293,10 +293,6 @@ class QgsGdalLayerItem : public QgsLayerItem
                       QString name, QString path, QString uri );
     ~QgsGdalLayerItem ();
 
-    QgsMapLayer::LayerType mapLayerType() { return QgsMapLayer::RasterLayer; }
-    QString uri();
-    QString providerKey() { return "gdal"; }
-
     bool setCrs ( QgsCoordinateReferenceSystem crs );
     Capability capabilities();
 };

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -2132,19 +2132,14 @@ QGISEXTERN int dataCapabilities () {
 
 QgsOgrLayerItem::QgsOgrLayerItem ( QgsDataItem* parent,
     QString name, QString path, QString uri, LayerType layerType )
-  : QgsLayerItem ( parent, name, path, uri, layerType )
+  : QgsLayerItem ( parent, name, path, uri, layerType, "ogr" )
 {
 }
 
 QgsOgrLayerItem::~QgsOgrLayerItem ()
 {
 }
 
-QString QgsOgrLayerItem::uri()
-{
-  return mUri;
-}
-
 QgsLayerItem::Capability QgsOgrLayerItem::capabilities()
 {
     QgsDebugMsg( "mPath = " + mPath );

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -312,9 +312,6 @@ class QgsOgrLayerItem : public QgsLayerItem
     QgsOgrLayerItem ( QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType );
     ~QgsOgrLayerItem ();
 
-    QgsMapLayer::LayerType mapLayerType() { return QgsMapLayer::VectorLayer; }
-    QString uri();
-    QString providerKey() { return "ogr"; }
     bool setCrs ( QgsCoordinateReferenceSystem crs );
     Capability capabilities();
 };

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3104,11 +3104,14 @@ bool QgsWMSConnectionItem::equal(const QgsDataItem *other)
 }
 // ---------------------------------------------------------------------------
 QgsWMSLayerItem::QgsWMSLayerItem ( QgsDataItem* parent, QString name, QString path, QgsWmsCapabilitiesProperty capabilitiesProperty, QString connInfo, QgsWmsLayerProperty layerProperty )
-  : QgsLayerItem ( parent, name, path, QString(), QgsLayerItem::Raster ),
+  : QgsLayerItem ( parent, name, path, QString(), QgsLayerItem::Raster, "wms" ),
     mCapabilitiesProperty ( capabilitiesProperty ),
     mConnInfo ( connInfo ),
     mLayerProperty ( layerProperty )
+    //mProviderKey ("wms"),
+    //mLayerType ( QgsLayerItem::Raster )
 {
+  mUri = createUri();
   // Populate everything, it costs nothing, all info about layers is collected
   /*
     // TODO
@@ -3133,7 +3136,7 @@ QgsWMSLayerItem::~QgsWMSLayerItem ()
 {
 }
 
-QString QgsWMSLayerItem::uri() 
+QString QgsWMSLayerItem::createUri() 
 {
   QString uri;
   if ( mLayerProperty.name.isEmpty() ) return uri; // layer collection

diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -990,9 +990,7 @@ class QgsWMSLayerItem : public QgsLayerItem
         QgsWmsCapabilitiesProperty capabilitiesProperty, QString connInfo, QgsWmsLayerProperty layerProperties );
     ~QgsWMSLayerItem ();
 
-    QgsMapLayer::LayerType mapLayerType() { return QgsMapLayer::RasterLayer; }
-    QString uri();
-    QString providerKey() { return "wms"; }
+    QString createUri();
 
     QgsWmsCapabilitiesProperty mCapabilitiesProperty;
     QString mConnInfo;