fix warnings

jef-n · jef-n · commit 24f1519b1b5c · 2013-03-27T11:06:36.000+01:00
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -751,6 +751,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
       else if ( name == "subgroup" ) s = QgsComposerLegendStyle::Subgroup;
       else if ( name == "symbol" ) s = QgsComposerLegendStyle::Symbol;
       else if ( name == "symbolLabel" ) s = QgsComposerLegendStyle::SymbolLabel;
+      else continue;
       setStyle( s, style );
     }
   }
diff --git a/src/plugins/topology/topolTest.h b/src/plugins/topology/topolTest.h
@@ -37,12 +37,12 @@ typedef ErrorList( topolTest::*testFunction )( double, QgsVectorLayer*, QgsVecto
 class TopologyRule
 {
   public:
+    testFunction f;
     bool useSecondLayer;
     bool useTolerance;
     bool useSpatialIndex;
     QList<QGis::GeometryType> layer1SupportedTypes;
     QList<QGis::GeometryType> layer2SupportedTypes;
-    testFunction f;
 
     bool layer1AcceptsType( QGis::GeometryType type )
     {

Original file line number	Diff line number	Diff line change
`@@ -751,6 +751,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument`
`751`	`751`	`else if ( name == "subgroup" ) s = QgsComposerLegendStyle::Subgroup;`
`752`	`752`	`else if ( name == "symbol" ) s = QgsComposerLegendStyle::Symbol;`
`753`	`753`	`else if ( name == "symbolLabel" ) s = QgsComposerLegendStyle::SymbolLabel;`
	`754`	`+ else continue;`
`754`	`755`	`setStyle( s, style );`
`755`	`756`	`}`
`756`	`757`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ typedef ErrorList( topolTest::testFunction )( double, QgsVectorLayer, QgsVecto`
`37`	`37`	`class TopologyRule`
`38`	`38`	`{`
`39`	`39`	`public:`
	`40`	`+ testFunction f;`
`40`	`41`	`bool useSecondLayer;`
`41`	`42`	`bool useTolerance;`
`42`	`43`	`bool useSpatialIndex;`
`43`	`44`	`QList<QGis::GeometryType> layer1SupportedTypes;`
`44`	`45`	`QList<QGis::GeometryType> layer2SupportedTypes;`
`45`		`- testFunction f;`
`46`	`46`
`47`	`47`	`bool layer1AcceptsType( QGis::GeometryType type )`
`48`	`48`	`{`