Skip to content

Commit 72d793b

Browse files
author
timlinux
committed
Use preferred naming conventions for enums
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9535 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b564b8c commit 72d793b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/core/qgsmaprenderer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ QgsMapRenderer::QgsMapRenderer()
5151
mProjectionsEnabled = FALSE;
5252
mDestCRS = new QgsCoordinateReferenceSystem( GEO_EPSG_CRS_ID, QgsCoordinateReferenceSystem::EpsgCrsId ); //WGS 84
5353

54-
mOutputUnits = QgsMapRenderer::MM;
54+
mOutputUnits = QgsMapRenderer::Millimeters;
5555
}
5656

5757
QgsMapRenderer::~QgsMapRenderer()
@@ -241,7 +241,7 @@ void QgsMapRenderer::render( QPainter* painter )
241241
//because sometimes QPainter units are in a local coord sys (e.g. in case of QGraphicsScene)
242242
double sceneDpi = mScaleCalculator->dpi();
243243
double scaleFactor = 1.0;
244-
if ( mOutputUnits == QgsMapRenderer::MM )
244+
if ( mOutputUnits == QgsMapRenderer::Millimeters )
245245
{
246246
scaleFactor = sceneDpi / 25.4;
247247
}

src/core/qgsmaprenderer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class CORE_EXPORT QgsMapRenderer : public QObject
4747
/**Output units for pen width and point marker width/height*/
4848
enum OutputUnits
4949
{
50-
MM, //millimeters
51-
PIXEL
50+
Millimeters,
51+
Pixels
5252
//MAP_UNITS probably supported in future versions
5353
};
5454

0 commit comments

Comments
 (0)