Skip to content
Permalink
Browse files
fix warnings
  • Loading branch information
jef-n committed Jan 31, 2013
1 parent f8705c3 commit ec27d28c2cf877830a42ad099e4c6ce02d1662b9
Showing with 6 additions and 8 deletions.
  1. +1 −3 src/providers/mssql/CMakeLists.txt
  2. +5 −5 src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -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
@@ -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

0 comments on commit ec27d28

Please sign in to comment.