Skip to content
Permalink
Browse files

remove deprecated private helpers QgsMapToolIdentify::convertMeasurem…

…ent and displayUnits
  • Loading branch information
3nids committed Aug 8, 2016
1 parent 6f51a13 commit 820cc560b2a94fc3d3e500ccdc9dcc1e7cf4be02
Showing with 0 additions and 37 deletions.
  1. +0 −9 python/gui/qgsmaptoolidentify.sip
  2. +0 −19 src/gui/qgsmaptoolidentify.cpp
  3. +0 −9 src/gui/qgsmaptoolidentify.h
@@ -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()
@@ -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();
@@ -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()

0 comments on commit 820cc56

Please sign in to comment.
You can’t perform that action at this time.