Skip to content

Commit 0dafcf1

Browse files
author
jef
committed
missed two pedantic warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@12150 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6fbf048 commit 0dafcf1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/core/pal/layer.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,11 @@ namespace pal
9898
double min_scale;
9999
double max_scale;
100100

101-
bool mergeLines;
102-
103101
/** optional flags used for some placement methods */
102+
Arrangement arrangement;
104103
unsigned long arrangementFlags;
105104
LabelMode mode;
106-
Arrangement arrangement;
105+
bool mergeLines;
107106

108107
// indexes (spatial and id)
109108
RTree<FeaturePart*, double, 2, double, 8, 4> *rtree;

src/core/qgsvectorlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
105105
mRenderer( 0 ),
106106
mLabel( 0 ),
107107
mLabelOn( false ),
108-
mVertexMarkerOnlyForSelection( false ),
109108
mActiveCommand( NULL ),
109+
mVertexMarkerOnlyForSelection( false ),
110110
mFetching( false ),
111111
mRendererV2( NULL ),
112112
mUsingRendererV2( false ),

0 commit comments

Comments
 (0)