From 820cc560b2a94fc3d3e500ccdc9dcc1e7cf4be02 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Mon, 8 Aug 2016 09:04:37 +0200
Subject: [PATCH] remove deprecated private helpers
 QgsMapToolIdentify::convertMeasurement and displayUnits

---
 python/gui/qgsmaptoolidentify.sip |  9 ---------
 src/gui/qgsmaptoolidentify.cpp    | 19 -------------------
 src/gui/qgsmaptoolidentify.h      |  9 ---------
 3 files changed, 37 deletions(-)

diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
index 74da899db96..f0fc3ac551a 100644
--- 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
index 2160b4508d6..2682f856358 100644
--- 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
index ea18440a944..aad40cbe92e 100644
--- 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()