[QGIS Commit] r12145 - in trunk/qgis/src: core core/pal
core/symbology-ng plugins/labeling
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Nov 16 12:06:32 EST 2009
Author: jef
Date: 2009-11-16 12:06:30 -0500 (Mon, 16 Nov 2009)
New Revision: 12145
Modified:
trunk/qgis/src/core/pal/feature.h
trunk/qgis/src/core/pal/layer.h
trunk/qgis/src/core/qgsvectorlayer.cpp
trunk/qgis/src/core/qgsvectorlayer.h
trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp
trunk/qgis/src/plugins/labeling/labelinggui.cpp
Log:
fix pedantic warnings
Modified: trunk/qgis/src/core/pal/feature.h
===================================================================
--- trunk/qgis/src/core/pal/feature.h 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/pal/feature.h 2009-11-16 17:06:30 UTC (rev 12145)
@@ -88,17 +88,15 @@
void setDistLabel( double dist ) { distlabel = dist; }
protected:
+ Layer *layer;
+ PalGeometry *userGeom;
double label_x;
double label_y;
+ double distlabel;
LabelInfo* labelInfo; // optional
char *uid;
- Layer *layer;
- double distlabel;
-
- PalGeometry *userGeom;
-
// array of parts - possibly not necessary
//int nPart;
//FeaturePart** parts;
Modified: trunk/qgis/src/core/pal/layer.h
===================================================================
--- trunk/qgis/src/core/pal/layer.h 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/pal/layer.h 2009-11-16 17:06:30 UTC (rev 12145)
@@ -98,13 +98,12 @@
double min_scale;
double max_scale;
- Arrangement arrangement;
-
- LabelMode mode;
bool mergeLines;
/** optional flags used for some placement methods */
unsigned long arrangementFlags;
+ LabelMode mode;
+ Arrangement arrangement;
// 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 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp 2009-11-16 17:06:30 UTC (rev 12145)
@@ -106,8 +106,8 @@
mLabel( 0 ),
mLabelOn( false ),
mVertexMarkerOnlyForSelection( false ),
+ mActiveCommand( NULL ),
mFetching( false ),
- mActiveCommand( NULL ),
mRendererV2( NULL ),
mUsingRendererV2( false ),
mLabelingEngine( NULL )
Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/qgsvectorlayer.h 2009-11-16 17:06:30 UTC (rev 12145)
@@ -732,6 +732,8 @@
/** Geometry type as defined in enum WkbType (qgis.h) */
int mWkbType;
+ QgsUndoCommand * mActiveCommand;
+
/** Renderer object which holds the information about how to display the features */
QgsRenderer *mRenderer;
@@ -778,8 +780,6 @@
QSet<int> mFetchConsidered;
QgsGeometryMap::iterator mFetchChangedGeomIt;
QgsFeatureList::iterator mFetchAddedFeaturesIt;
-
- QgsUndoCommand * mActiveCommand;
};
#endif
Modified: trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h 2009-11-16 17:06:30 UTC (rev 12145)
@@ -89,8 +89,8 @@
void setSourceColorRamp( QgsVectorColorRampV2* ramp );
protected:
+ QString mAttrName;
QgsCategoryList mCategories;
- QString mAttrName;
QgsSymbolV2* mSourceSymbol;
QgsVectorColorRampV2* mSourceColorRamp;
Modified: trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h 2009-11-16 17:06:30 UTC (rev 12145)
@@ -97,8 +97,8 @@
void setSourceColorRamp( QgsVectorColorRampV2* ramp );
protected:
+ QString mAttrName;
QgsRangeList mRanges;
- QString mAttrName;
Mode mMode;
QgsSymbolV2* mSourceSymbol;
QgsVectorColorRampV2* mSourceColorRamp;
Modified: trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp 2009-11-16 17:06:30 UTC (rev 12145)
@@ -101,9 +101,10 @@
class MyLine
{
public:
- MyLine( QPointF p1, QPointF p2 )
+ MyLine( QPointF p1, QPointF p2 ) : mVertical(false), mIncreasing(false), mT(0.0), mLength(0.0)
{
- if ( p1 == p2 ) return; // invalid
+ if ( p1 == p2 )
+ return; // invalid
// tangent and direction
if ( p1.x() == p2.x() )
Modified: trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.cpp 2009-11-16 17:06:30 UTC (rev 12145)
@@ -269,7 +269,7 @@
if ( polyline.count() < 2 )
return newLine;
- double angle, t_new, t_old = 0;
+ double angle = 0.0, t_new, t_old = 0;
QPointF pt_old, pt_new;
QPointF p1 = polyline[0], p2;
Modified: trunk/qgis/src/plugins/labeling/labelinggui.cpp
===================================================================
--- trunk/qgis/src/plugins/labeling/labelinggui.cpp 2009-11-16 15:51:28 UTC (rev 12144)
+++ trunk/qgis/src/plugins/labeling/labelinggui.cpp 2009-11-16 17:06:30 UTC (rev 12145)
@@ -148,7 +148,7 @@
radLineParallel, radLineCurved, radLineHorizontal, // line
radAroundCentroid, radPolygonHorizontal, radPolygonFree, radPolygonPerimeter // polygon
};
- for ( int i = 0; i < sizeof( placementRadios ) / sizeof( QRadioButton* ); i++ )
+ for ( unsigned int i = 0; i < sizeof( placementRadios ) / sizeof( QRadioButton* ); i++ )
connect( placementRadios[i], SIGNAL( toggled( bool ) ), this, SLOT( updateOptions() ) );
}
More information about the QGIS-commit
mailing list