mark some methods as deprecated

qgis · Sep 15, 2011 · c942ee4ad0f7117b7236189f4e138c81bec7d698 · c942ee4
1 parent 5f9956e
commit c942ee4ad0f7117b7236189f4e138c81bec7d698
Unified Split

Showing with 27 additions and 9 deletions.

+13 −4 python/core/qgsrasterlayer.sip

+1 −1 src/core/raster/qgsrasterlayer.cpp

+13 −4 src/core/raster/qgsrasterlayer.h
diff --git a/python/core/qgsrasterlayer.sip b/python/core/qgsrasterlayer.sip
@@ -228,8 +228,10 @@ public:
     /** \brief  Accessor for transparent band name mapping */
     QString transparentBandName() const;
 
-    /**  \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? */
-    bool usesProvider();
+    /**  \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? 
+     * @deprecated in 2.0
+     */
+    bool usesProvider() /Deprecated/;
 
     /** \brief Accessor that returns the width of the (unclipped) raster  */
     int width();
@@ -375,8 +377,15 @@ public:
     /** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
     QPixmap paletteAsPixmap( int theBand = 1 );
 
-    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
-    QString providerKey() const;
+    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? 
+     * @note added in 2.0
+     */
+    QString providerType() const;
+
+    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? 
+     * @deprecated in 2.0
+     */
+    QString providerKey() const /Deprecated/;
 
     /** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
     double rasterUnitsPerPixel();

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1994,7 +1994,7 @@ void QgsRasterLayer::populateHistogram( int theBandNo, int theBinCount, bool the
   mDataProvider->populateHistogram( theBandNo, myRasterBandStats, theBinCount, theIgnoreOutOfRangeFlag, theHistogramEstimatedFlag );
 }
 
-QString QgsRasterLayer::providerKey() const
+QString QgsRasterLayer::providerType() const
 {
   if ( mProviderKey.isEmpty() )
   {

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -397,8 +397,10 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     /** \brief  Accessor for transparent band name mapping */
     QString transparentBandName() const { return mTransparencyBandName; }
 
-    /**  \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? */
-    bool usesProvider();
+    /**  \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data? 
+     * @deprecated in 2.0
+     */
+    Q_DECL_DEPRECATED bool usesProvider();
 
     /** \brief Accessor that returns the width of the (unclipped) raster  */
     int width() { return mWidth; }
@@ -546,8 +548,15 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     /** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
     QPixmap paletteAsPixmap( int theBandNumber = 1 );
 
-    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
-    QString providerKey() const;
+    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? 
+     * @note added in 2.0
+     */
+    QString providerType() const;
+
+    /**  \brief [ data provider interface ] Which provider is being used for this Raster Layer? 
+     * @deprecated use providerType()
+     */
+    Q_DECL_DEPRECATED QString providerKey() const { return providerType(); }
 
     /** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
     double rasterUnitsPerPixel();