fix warnings

qgis · Mar 27, 2013 · 24f1519 · 24f1519
1 parent 791d71d
commit 24f1519
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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 )
     {