Skip to content

Commit

Permalink
Use preferred naming conventions for enums
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@9535 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 24, 2008
1 parent e8d1090 commit 0e4c6a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/core/qgsmaprenderer.cpp
Expand Up @@ -51,7 +51,7 @@ QgsMapRenderer::QgsMapRenderer()
mProjectionsEnabled = FALSE;
mDestCRS = new QgsCoordinateReferenceSystem( GEO_EPSG_CRS_ID, QgsCoordinateReferenceSystem::EpsgCrsId ); //WGS 84

mOutputUnits = QgsMapRenderer::MM;
mOutputUnits = QgsMapRenderer::Millimeters;
}

QgsMapRenderer::~QgsMapRenderer()
Expand Down Expand Up @@ -241,7 +241,7 @@ void QgsMapRenderer::render( QPainter* painter )
//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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsmaprenderer.h
Expand Up @@ -47,8 +47,8 @@ class CORE_EXPORT QgsMapRenderer : public QObject
/**Output units for pen width and point marker width/height*/
enum OutputUnits
{
MM, //millimeters
PIXEL
Millimeters,
Pixels
//MAP_UNITS probably supported in future versions
};

Expand Down

0 comments on commit 0e4c6a1

Please sign in to comment.