fix warnings

jef-n · jef-n · commit ec27d28c2cf8 · 2013-01-31T14:11:04.000+01:00
diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt
@@ -1,7 +1,5 @@
-	
 SET (MSSQL_SRCS qgsmssqlprovider.cpp qgsmssqlgeometryparser.cpp qgsmssqlsourceselect.cpp qgsmssqltablemodel.cpp qgsmssqlnewconnection.cpp qgsmssqldataitems.cpp qgsmssqlfeatureiterator.cpp)
-
-SET (MSSQL_MOC_HDRS qgsmssqlprovider.h qgsmssqlsourceselect.h qgsmssqltablemodel.h qgsmssqlnewconnection.h qgsmssqldataitems.h qgsmssqlfeatureiterator.h)
+SET (MSSQL_MOC_HDRS qgsmssqlprovider.h qgsmssqlsourceselect.h qgsmssqltablemodel.h qgsmssqlnewconnection.h qgsmssqldataitems.h)
 
 ########################################################
 # Build
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -437,7 +437,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
   sqliteHandle = handle->handle();
 
   bool alreadyDone = false;
-  bool ret;
+  bool ret = false;
 
 #ifdef SPATIALITE_VERSION_GE_4_0_0
   // only if libspatialite version is >= 4.0.0
@@ -449,7 +449,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
   if ( mQuery.startsWith( "(" ) && mQuery.endsWith( ")" ) )
     specialCase = true;
 
-  if ( specialCase == false )
+  if ( !specialCase )
   {
     // using v.4.0 Abstract Interface
     ret = true;
@@ -469,14 +469,14 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
   }
 #endif
 
-  if ( alreadyDone == false )
+  if ( !alreadyDone )
   {
     // check if this one Layer is based on a Table, View or VirtualShapefile
     // by using the traditional methods
     ret = checkLayerType();
   }
 
-  if ( ret == false )
+  if ( !ret )
   {
     // invalid metadata
     numberFeatures = 0;
@@ -529,7 +529,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
   }
 #endif
 
-  if ( alreadyDone == false )
+  if ( !alreadyDone )
   {
     // using the traditional methods
     if ( !getGeometryDetails() )  // gets srid and geometry type

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`437`	`437`	`sqliteHandle = handle->handle();`
`438`	`438`
`439`	`439`	`bool alreadyDone = false;`
`440`		`- bool ret;`
	`440`	`+ bool ret = false;`
`441`	`441`
`442`	`442`	`#ifdef SPATIALITE_VERSION_GE_4_0_0`
`443`	`443`	`// only if libspatialite version is >= 4.0.0`
`@@ -449,7 +449,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`449`	`449`	`if ( mQuery.startsWith( "(" ) && mQuery.endsWith( ")" ) )`
`450`	`450`	`specialCase = true;`
`451`	`451`
`452`		`- if ( specialCase == false )`
	`452`	`+ if ( !specialCase )`
`453`	`453`	`{`
`454`	`454`	`// using v.4.0 Abstract Interface`
`455`	`455`	`ret = true;`
`@@ -469,14 +469,14 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`469`	`469`	`}`
`470`	`470`	`#endif`
`471`	`471`
`472`		`- if ( alreadyDone == false )`
	`472`	`+ if ( !alreadyDone )`
`473`	`473`	`{`
`474`	`474`	`// check if this one Layer is based on a Table, View or VirtualShapefile`
`475`	`475`	`// by using the traditional methods`
`476`	`476`	`ret = checkLayerType();`
`477`	`477`	`}`
`478`	`478`
`479`		`- if ( ret == false )`
	`479`	`+ if ( !ret )`
`480`	`480`	`{`
`481`	`481`	`// invalid metadata`
`482`	`482`	`numberFeatures = 0;`
`@@ -529,7 +529,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`529`	`529`	`}`
`530`	`530`	`#endif`
`531`	`531`
`532`		`- if ( alreadyDone == false )`
	`532`	`+ if ( !alreadyDone )`
`533`	`533`	`{`
`534`	`534`	`// using the traditional methods`
`535`	`535`	`if ( !getGeometryDetails() ) // gets srid and geometry type`