Added static QgsLayerItem::iconName(LayerType) for reuse and consistency

elpaso · elpaso · commit 31b51178b854 · 2017-09-07T16:12:01.000+02:00
diff --git a/python/core/qgsdataitem.sip b/python/core/qgsdataitem.sip
@@ -414,7 +414,14 @@ Returns provider key
 
     static QString layerTypeAsString( const LayerType &layerType );
 %Docstring
- Returns the string representatio of the given ``layerType``
+ Returns the string representation of the given ``layerType``
+.. versionadded:: 3
+ :rtype: str
+%End
+
+    static QString iconName( const LayerType &layerType );
+%Docstring
+ Returns the icon name of the given ``layerType``
 .. versionadded:: 3
  :rtype: str
 %End
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -545,49 +545,55 @@ QgsLayerItem::QgsLayerItem( QgsDataItem *parent, const QString &name, const QStr
   , mProviderKey( providerKey )
   , mUri( uri )
   , mLayerType( layerType )
+{
+  mIconName = iconName( layerType );
+}
+
+QgsMapLayer::LayerType QgsLayerItem::mapLayerType() const
+{
+  if ( mLayerType == QgsLayerItem::Raster )
+    return QgsMapLayer::RasterLayer;
+  if ( mLayerType == QgsLayerItem::Plugin )
+    return QgsMapLayer::PluginLayer;
+  return QgsMapLayer::VectorLayer;
+}
+
+QString QgsLayerItem::layerTypeAsString( const QgsLayerItem::LayerType &layerType )
+{
+  static int enumIdx = staticMetaObject.indexOfEnumerator( "LayerType" );
+  return staticMetaObject.enumerator( enumIdx ).valueToKey( layerType );
+}
+
+QString QgsLayerItem::iconName( const QgsLayerItem::LayerType &layerType )
 {
   switch ( layerType )
   {
     case Point:
-      mIconName = QStringLiteral( "/mIconPointLayer.svg" );
+      return QStringLiteral( "/mIconPointLayer.svg" );
       break;
     case Line:
-      mIconName = QStringLiteral( "/mIconLineLayer.svg" );
+      return QStringLiteral( "/mIconLineLayer.svg" );
       break;
     case Polygon:
-      mIconName = QStringLiteral( "/mIconPolygonLayer.svg" );
+      return QStringLiteral( "/mIconPolygonLayer.svg" );
       break;
     // TODO add a new icon for generic Vector layers
     case Vector :
-      mIconName = QStringLiteral( "/mIconPolygonLayer.svg" );
+      return QStringLiteral( "/mIconPolygonLayer.svg" );
       break;
     case TableLayer:
-      mIconName = QStringLiteral( "/mIconTableLayer.svg" );
+    case Table:
+      return QStringLiteral( "/mIconTableLayer.svg" );
       break;
     case Raster:
-      mIconName = QStringLiteral( "/mIconRaster.svg" );
+      return QStringLiteral( "/mIconRaster.svg" );
       break;
     default:
-      mIconName = QStringLiteral( "/mIconLayer.png" );
+      return QStringLiteral( "/mIconLayer.png" );
       break;
   }
 }
 
-QgsMapLayer::LayerType QgsLayerItem::mapLayerType() const
-{
-  if ( mLayerType == QgsLayerItem::Raster )
-    return QgsMapLayer::RasterLayer;
-  if ( mLayerType == QgsLayerItem::Plugin )
-    return QgsMapLayer::PluginLayer;
-  return QgsMapLayer::VectorLayer;
-}
-
-QString QgsLayerItem::layerTypeAsString( const QgsLayerItem::LayerType &layerType )
-{
-  static int enumIdx = staticMetaObject.indexOfEnumerator( "LayerType" );
-  return staticMetaObject.enumerator( enumIdx ).valueToKey( layerType );
-}
-
 bool QgsLayerItem::equal( const QgsDataItem *other )
 {
   //QgsDebugMsg ( mPath + " x " + other->mPath );
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -384,11 +384,16 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
      */
     virtual QString comments() const { return QString(); }
 
-    /** Returns the string representatio of the given \a layerType
+    /** Returns the string representation of the given \a layerType
      * \since QGIS 3
      */
     static QString layerTypeAsString( const LayerType &layerType );
 
+    /** Returns the icon name of the given \a layerType
+     * \since QGIS 3
+     */
+    static QString iconName( const LayerType &layerType );
+
   protected:
 
     //! The provider key
