Skip to content

Commit

Permalink
missed two pedantic warnings
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12150 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 16, 2009
1 parent 9f0becf commit 03701e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/core/pal/layer.h
Expand Up @@ -98,12 +98,11 @@ namespace pal
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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.cpp
Expand Up @@ -105,8 +105,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
mRenderer( 0 ),
mLabel( 0 ),
mLabelOn( false ),
mVertexMarkerOnlyForSelection( false ),
mActiveCommand( NULL ),
mVertexMarkerOnlyForSelection( false ),
mFetching( false ),
mRendererV2( NULL ),
mUsingRendererV2( false ),
Expand Down

0 comments on commit 03701e7

Please sign in to comment.