remove deprecated private helpers QgsMapToolIdentify::convertMeasurem…

…ent and displayUnits
qgis · Aug 8, 2016 · 820cc56 · 820cc56
1 parent 6f51a13
commit 820cc56
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 37 deletions.
diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
@@ -112,15 +112,6 @@ class QgsMapToolIdentify : QgsMapTool
 
   private:
 
-    //! Private helper
-    //! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea ) /Deprecated/;
-
-    /** Transforms the measurements of derived attributes in the desired units
-     * @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    */
-    virtual QgsUnitTypes::DistanceUnit displayUnits() /Deprecated/;
-
     /** Desired units for distance display.
      * @note added in QGIS 2.14
      * @see displayAreaUnits()

diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -660,25 +660,6 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg
   return true;
 }
 
-void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea )
-{
-  // Helper for converting between units
-  // The parameter &u is out only...
-
-  // Get the canvas units
-  QgsUnitTypes::DistanceUnit myUnits = mCanvas->mapUnits();
-
-  Q_NOWARN_DEPRECATED_PUSH
-  calc.convertMeasurement( measure, myUnits, displayUnits(), isArea );
-  u = displayUnits();
-  Q_NOWARN_DEPRECATED_POP
-}
-
-QgsUnitTypes::DistanceUnit QgsMapToolIdentify::displayUnits()
-{
-  return mCanvas->mapUnits();
-}
-
 QgsUnitTypes::DistanceUnit QgsMapToolIdentify::displayDistanceUnits() const
 {
   return mCanvas->mapUnits();

diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h
@@ -159,15 +159,6 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
 
   private:
 
-    //! Private helper
-    //! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    Q_DECL_DEPRECATED virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QgsUnitTypes::DistanceUnit &u, bool isArea );
-
-    /** Transforms the measurements of derived attributes in the desired units
-     * @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    */
-    Q_DECL_DEPRECATED virtual QgsUnitTypes::DistanceUnit displayUnits();
-
     /** Desired units for distance display.
      * @note added in QGIS 2.14
      * @see displayAreaUnits()