sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated private helpers QgsMapToolIdentify::convertMeasurement and displayUnits

Browse Source
This commit is contained in:
Denis Rouzaud 2016-08-08 09:04:37 +02:00
parent 6f51a13cd6
commit 820cc560b2
3 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/gui/qgsmaptoolidentify.sip
View File

@ -112,15 +112,6 @@ class QgsMapToolIdentify : QgsMapTool
private: 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. /** Desired units for distance display.
* @note added in QGIS 2.14 * @note added in QGIS 2.14
* @see displayAreaUnits() * @see displayAreaUnits()

19
src/gui/qgsmaptoolidentify.cpp
View File

@ -660,25 +660,6 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg
return true; 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 QgsUnitTypes::DistanceUnit QgsMapToolIdentify::displayDistanceUnits() const
{ {
return mCanvas->mapUnits(); return mCanvas->mapUnits();

9
src/gui/qgsmaptoolidentify.h
View File

@ -159,15 +159,6 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
private: 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. /** Desired units for distance display.
* @note added in QGIS 2.14 * @note added in QGIS 2.14
* @see displayAreaUnits() * @see displayAreaUnits()