[QGIS Commit] r12150 - in trunk/qgis/src/core: . pal

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-11-16 16:24:51 -0500 (Mon, 16 Nov 2009)
New Revision: 12150

Modified:
   trunk/qgis/src/core/pal/layer.h
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
missed two pedantic warnings

Modified: trunk/qgis/src/core/pal/layer.h
===================================================================
--- trunk/qgis/src/core/pal/layer.h	2009-11-16 19:51:57 UTC (rev 12149)
+++ trunk/qgis/src/core/pal/layer.h	2009-11-16 21:24:51 UTC (rev 12150)
@@ -98,12 +98,11 @@
       double min_scale;
       double max_scale;
 
-      bool mergeLines;
-
       /** optional flags used for some placement methods */
+      Arrangement arrangement;
       unsigned long arrangementFlags;
       LabelMode mode;
-      Arrangement arrangement;
+      bool mergeLines;
 
       // indexes (spatial and id)
       RTree<FeaturePart*, double, 2, double, 8, 4> *rtree;

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2009-11-16 19:51:57 UTC (rev 12149)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2009-11-16 21:24:51 UTC (rev 12150)
@@ -105,8 +105,8 @@
     mRenderer( 0 ),
     mLabel( 0 ),
     mLabelOn( false ),
+    mActiveCommand( NULL ),
     mVertexMarkerOnlyForSelection( false ),
-    mActiveCommand( NULL ),
     mFetching( false ),
     mRendererV2( NULL ),
     mUsingRendererV2( false ),