fix warnings

jef-n · jef-n · commit 314eca9934c9 · 2018-06-21T17:02:37.000+02:00
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1931,7 +1931,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
 
     QString srsProj4;
     QString srsDesc;
-    bool srsDeprecated;
+    bool srsDeprecated = deprecated;
     if ( statement.step() == SQLITE_ROW )
     {
       srsProj4 = statement.columnAsText( 0 );
@@ -2133,6 +2133,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
     return -1;
   }
 
+  Q_UNUSED( deleted );
   QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 4 );
 
   if ( errors > 0 )
diff --git a/src/core/qgssettings.h b/src/core/qgssettings.h
@@ -251,25 +251,25 @@ class CORE_EXPORT QgsSettings : public QObject
         QByteArray ba = value( key, metaEnum.valueToKey( defaultValue ) ).toString().toUtf8();
         const char *vs = ba.data();
         v = static_cast<T>( metaEnum.keyToValue( vs, &ok ) );
+        if ( ok )
+          return v;
       }
-      if ( !ok )
+
+      // if failed, try to read as int (old behavior)
+      // this code shall be removed later (probably after QGIS 3.4 LTR for 3.6)
+      // then the method could be marked as const
+      v = static_cast<T>( value( key, static_cast<int>( defaultValue ), section ).toInt( &ok ) );
+      if ( metaEnum.isValid() )
       {
-        // if failed, try to read as int (old behavior)
-        // this code shall be removed later (probably after QGIS 3.4 LTR for 3.6)
-        // then the method could be marked as const
-        v = static_cast<T>( value( key, static_cast<int>( defaultValue ), section ).toInt( &ok ) );
-        if ( metaEnum.isValid() )
+        if ( !ok || !metaEnum.valueToKey( static_cast<int>( v ) ) )
         {
-          if ( !ok || !metaEnum.valueToKey( static_cast<int>( v ) ) )
-          {
-            v = defaultValue;
-          }
-          else
-          {
-            // found setting as an integer
-            // convert the setting to the new form (string)
-            setEnumValue( key, v, section );
-          }
+          v = defaultValue;
+        }
+        else
+        {
+          // found setting as an integer
+          // convert the setting to the new form (string)
+          setEnumValue( key, v, section );
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -1931,7 +1931,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()`
`1931`	`1931`
`1932`	`1932`	`QString srsProj4;`
`1933`	`1933`	`QString srsDesc;`
`1934`		`- bool srsDeprecated;`
	`1934`	`+ bool srsDeprecated = deprecated;`
`1935`	`1935`	`if ( statement.step() == SQLITE_ROW )`
`1936`	`1936`	`{`
`1937`	`1937`	`srsProj4 = statement.columnAsText( 0 );`
`@@ -2133,6 +2133,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()`
`2133`	`2133`	`return -1;`
`2134`	`2134`	`}`
`2135`	`2135`
	`2136`	`+ Q_UNUSED( deleted );`
`2136`	`2137`	`QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 4 );`
`2137`	`2138`
`2138`	`2139`	`if ( errors > 0 )`