fix some warnings

jef-n · jef-n · commit 928504a72720 · 2015-09-30T18:16:50.000+02:00
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -3049,6 +3049,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass
   return true;
   // end remove
 
+#if 0
   if ( isDisabled() )
     return false;
 
@@ -3123,6 +3124,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass
   }
 
   return true;
+#endif
 }
 
 bool QgsAuthManager::reencryptAllAuthenticationIdentities( const QString &prevpass, const QString &prevciv )
diff --git a/src/core/geometry/qgsabstractgeometryv2.cpp b/src/core/geometry/qgsabstractgeometryv2.cpp
@@ -227,8 +227,6 @@ QgsPointV2 QgsAbstractGeometryV2::centroid() const
   {
     return QgsPointV2( Cx / ( 3. * A ), Cy / ( 3. * A ) );
   }
-
-  return QgsPointV2();
 }
 
 bool QgsAbstractGeometryV2::isEmpty() const
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -1652,7 +1652,6 @@ QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeW
     }
     CATCH_GEOS_WITH_ERRMSG( 0 )
   }
-  return 0;
 }
 
 GEOSGeometry* QgsGeos::reshapeLine( const GEOSGeometry* line, const GEOSGeometry* reshapeLineGeos )
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -332,7 +332,6 @@ double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2 ) const
       return area;
     }
   }
-  return 0.0;
 }
 
 double QgsDistanceArea::measure( const QgsGeometry *geometry ) const

Original file line number	Diff line number	Diff line change
`@@ -3049,6 +3049,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass`
`3049`	`3049`	`return true;`
`3050`	`3050`	`// end remove`
`3051`	`3051`
	`3052`	`+#if 0`
`3052`	`3053`	`if ( isDisabled() )`
`3053`	`3054`	`return false;`
`3054`	`3055`
`@@ -3123,6 +3124,7 @@ bool QgsAuthManager::reencryptAllAuthenticationSettings( const QString &prevpass`
`3123`	`3124`	`}`
`3124`	`3125`
`3125`	`3126`	`return true;`
	`3127`	`+#endif`
`3126`	`3128`	`}`
`3127`	`3129`
`3128`	`3130`	`bool QgsAuthManager::reencryptAllAuthenticationIdentities( const QString &prevpass, const QString &prevciv )`
Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,6 @@ QgsPointV2 QgsAbstractGeometryV2::centroid() const`
`227`	`227`	`{`
`228`	`228`	`return QgsPointV2( Cx / ( 3. * A ), Cy / ( 3. * A ) );`
`229`	`229`	`}`
`230`		`-`
`231`		`- return QgsPointV2();`
`232`	`230`	`}`
`233`	`231`
`234`	`232`	`bool QgsAbstractGeometryV2::isEmpty() const`
Original file line number	Diff line number	Diff line change
`@@ -1652,7 +1652,6 @@ QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeW`
`1652`	`1652`	`}`
`1653`	`1653`	`CATCH_GEOS_WITH_ERRMSG( 0 )`
`1654`	`1654`	`}`
`1655`		`- return 0;`
`1656`	`1655`	`}`
`1657`	`1656`
`1658`	`1657`	`GEOSGeometry* QgsGeos::reshapeLine( const GEOSGeometry* line, const GEOSGeometry* reshapeLineGeos )`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,6 @@ double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2 ) const`
`332`	`332`	`return area;`
`333`	`333`	`}`
`334`	`334`	`}`
`335`		`- return 0.0;`
`336`	`335`	`}`
`337`	`336`
`338`	`337`	`double QgsDistanceArea::measure( const QgsGeometry *geometry ) const`