[QGIS Commit] r9535 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-10-24 17:20:16 -0400 (Fri, 24 Oct 2008)
New Revision: 9535

Modified:
   trunk/qgis/src/core/qgsmaprenderer.cpp
   trunk/qgis/src/core/qgsmaprenderer.h
Log:
Use preferred naming conventions for enums

Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp	2008-10-24 15:54:39 UTC (rev 9534)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp	2008-10-24 21:20:16 UTC (rev 9535)
@@ -51,7 +51,7 @@
   mProjectionsEnabled = FALSE;
   mDestCRS = new QgsCoordinateReferenceSystem( GEO_EPSG_CRS_ID, QgsCoordinateReferenceSystem::EpsgCrsId ); //WGS 84
 
-  mOutputUnits = QgsMapRenderer::MM;
+  mOutputUnits = QgsMapRenderer::Millimeters;
 }
 
 QgsMapRenderer::~QgsMapRenderer()
@@ -241,7 +241,7 @@
   //because sometimes QPainter units are in a local coord sys (e.g. in case of QGraphicsScene)
   double sceneDpi = mScaleCalculator->dpi();
   double scaleFactor = 1.0;
-  if ( mOutputUnits == QgsMapRenderer::MM )
+  if ( mOutputUnits == QgsMapRenderer::Millimeters )
   {
     scaleFactor = sceneDpi / 25.4;
   }

Modified: trunk/qgis/src/core/qgsmaprenderer.h
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.h	2008-10-24 15:54:39 UTC (rev 9534)
+++ trunk/qgis/src/core/qgsmaprenderer.h	2008-10-24 21:20:16 UTC (rev 9535)
@@ -47,8 +47,8 @@
     /**Output units for pen width and point marker width/height*/
     enum OutputUnits
     {
-      MM, //millimeters
-      PIXEL
+      Millimeters,
+      Pixels
       //MAP_UNITS probably supported in future versions
     };