fix size_t vs. int warnings

jef-n · jef-n · commit 8fffd535237f · 2013-09-06T16:29:40.000+02:00
diff --git a/src/analysis/openstreetmap/qgsosmdatabase.cpp b/src/analysis/openstreetmap/qgsosmdatabase.cpp
@@ -421,7 +421,7 @@ void QgsOSMDatabase::exportSpatiaLiteNodes( const QString& tableName, const QStr
         sqlite3_bind_null( stmtInsert, ++col );
     }
 
-    sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), geom->wkbSize(), SQLITE_STATIC );
+    sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), (int) geom->wkbSize(), SQLITE_STATIC );
 
     int insertRes = sqlite3_step( stmtInsert );
     if ( insertRes != SQLITE_DONE )
@@ -489,7 +489,7 @@ void QgsOSMDatabase::exportSpatiaLiteWays( bool closed, const QString& tableName
         sqlite3_bind_null( stmtInsert, ++col );
     }
 
-    sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), geom->wkbSize(), SQLITE_STATIC );
+    sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), (int) geom->wkbSize(), SQLITE_STATIC );
 
     int insertRes = sqlite3_step( stmtInsert );
     if ( insertRes != SQLITE_DONE )
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -669,7 +669,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
         return 0;
       }
 
-      OGRErr err = OGR_G_ImportFromWkb( mGeom2, const_cast<unsigned char *>( geom->asWkb() ), geom->wkbSize() );
+      OGRErr err = OGR_G_ImportFromWkb( mGeom2, const_cast<unsigned char *>( geom->asWkb() ), (int) geom->wkbSize() );
       if ( err != OGRERR_NONE )
       {
         mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
@@ -685,7 +685,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
     }
     else if ( geom )
     {
-      OGRErr err = OGR_G_ImportFromWkb( mGeom, const_cast<unsigned char *>( geom->asWkb() ), geom->wkbSize() );
+      OGRErr err = OGR_G_ImportFromWkb( mGeom, const_cast<unsigned char *>( geom->asWkb() ), (int) geom->wkbSize() );
       if ( err != OGRERR_NONE )
       {
         mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -324,7 +324,7 @@ bool QgsRasterBlock::isNoData( size_t index )
     return false;
   }
   // TODO: optimize
-  int row = index / mWidth;
+  int row = (int) index / mWidth;
   int column = index % mWidth;
   size_t byte = ( size_t )row * mNoDataBitmapWidth + column / 8 ;
   int bit = column % 8;
@@ -406,7 +406,7 @@ bool QgsRasterBlock::setIsNoData( size_t index )
       }
     }
     // TODO: optimize
-    int row = index / mWidth;
+    int row = (int) index / mWidth;
     int column = index % mWidth;
     size_t byte = ( size_t )row * mNoDataBitmapWidth + column / 8;
     int bit = column % 8;
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -572,12 +572,11 @@ void QgsGrassEdit::setAttributeTable( int field )
 
   if ( !key->isEmpty() )   // Database link defined
   {
-    std::vector<QgsField> *cols = mProvider->columns( field );
+    QVector<QgsField> *cols = mProvider->columns( field );
 
     mAttributeTable->setRowCount( cols->size() );
 
-
-    for ( unsigned int c = 0; c < cols->size(); c++ )
+    for ( int c = 0; c < cols->size(); c++ )
     {
       QgsField col = ( *cols )[c];
 
@@ -1463,7 +1462,7 @@ void QgsGrassEdit::addAttributes( int field, int cat )
 
   if ( !key->isEmpty() )   // Database link defined
   {
-    std::vector<QgsField> *cols = mProvider->columns( field );
+    QVector<QgsField> *cols = mProvider->columns( field );
 
     if ( cols->size() == 0 )
     {
@@ -1481,7 +1480,7 @@ void QgsGrassEdit::addAttributes( int field, int cat )
       }
       else
       {
-        for ( unsigned int j = 0; j < cols->size(); j++ )
+        for ( int j = 0; j < cols->size(); j++ )
         {
           QgsField col = ( *cols )[j];
           QVariant att = ( *atts )[j];
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -62,8 +62,8 @@ extern "C"
 #endif
 
 
-std::vector<GLAYER> QgsGrassProvider::mLayers;
-std::vector<GMAP> QgsGrassProvider::mMaps;
+QVector<GLAYER> QgsGrassProvider::mLayers;
+QVector<GMAP> QgsGrassProvider::mMaps;
 
 
 static QString GRASS_KEY = "grass"; // XXX verify this
@@ -370,7 +370,7 @@ int QgsGrassProvider::openLayer( QString gisdbase, QString location, QString map
 
   // Check if this layer is already opened
 
-  for ( unsigned int i = 0; i <  mLayers.size(); i++ )
+  for ( int i = 0; i <  mLayers.size(); i++ )
   {
     if ( !( mLayers[i].valid ) )
       continue;
@@ -719,7 +719,7 @@ int QgsGrassProvider::openMap( QString gisdbase, QString location, QString mapse
   QString tmpPath = gisdbase + "/" + location + "/" + mapset + "/" + mapName;
 
   // Check if this map is already opened
-  for ( unsigned int i = 0; i <  mMaps.size(); i++ )
+  for ( int i = 0; i <  mMaps.size(); i++ )
   {
     if ( mMaps[i].valid && mMaps[i].path == tmpPath )
     {
@@ -869,7 +869,7 @@ void QgsGrassProvider::updateMap( int mapId )
     QgsDebugMsg( QString( "Cannot reopen GRASS vector: %1" ).arg( e.what() ) );
 
     // if reopen fails, mLayers should be also updated
-    for ( unsigned int i = 0; i <  mLayers.size(); i++ )
+    for ( int i = 0; i <  mLayers.size(); i++ )
     {
       if ( mLayers[i].mapId == mapId )
       {
@@ -881,7 +881,7 @@ void QgsGrassProvider::updateMap( int mapId )
 
   QgsDebugMsg( "GRASS map successfully reopened for reading." );
 
-  for ( unsigned int i = 0; i <  mLayers.size(); i++ )
+  for ( int i = 0; i <  mLayers.size(); i++ )
   {
     // if ( !(mLayers[i].valid) )
     //   continue; // ?
@@ -1365,7 +1365,7 @@ bool QgsGrassProvider::reopenMap()
   QgsDebugMsg( "GRASS map successfully reopened for reading." );
 
   // Reload sources to layers
-  for ( unsigned int i = 0; i <  mLayers.size(); i++ )
+  for ( int i = 0; i <  mLayers.size(); i++ )
   {
     // if ( !(mLayers[i].valid) )
     //   continue; // ?
@@ -1609,19 +1609,19 @@ QString *QgsGrassProvider::key( int field )
   return key;
 }
 
-std::vector<QgsField> *QgsGrassProvider::columns( int field )
+QVector<QgsField> *QgsGrassProvider::columns( int field )
 {
   QgsDebugMsg( QString( "field = %1" ).arg( field ) );
 
-  std::vector<QgsField> *col = new std::vector<QgsField>;
+  QVector<QgsField> *col = new QVector<QgsField>;
 
   struct  field_info *fi = Vect_get_field( mMap, field ); // should work also with field = 0
 
   // Read attributes
   if ( !fi )
   {
     QgsDebugMsg( "No field info -> no attributes" );
-    return ( col );
+    return col;
   }
 
   QgsDebugMsg( "Field info found -> open database" );
@@ -1631,7 +1631,7 @@ std::vector<QgsField> *QgsGrassProvider::columns( int field )
   if ( !driver )
   {
     QgsDebugMsg( QString( "Cannot open database %1 by driver %2" ).arg( fi->database ).arg( fi->driver ) );
-    return ( col );
+    return col;
   }
 
   QgsDebugMsg( "Database opened -> describe table" );
@@ -1644,7 +1644,7 @@ std::vector<QgsField> *QgsGrassProvider::columns( int field )
   if ( db_describe_table( driver, &tableName, &table ) != DB_OK )
   {
     QgsDebugMsg( "Cannot describe table" );
-    return ( col );
+    return col;
   }
 
   int nCols = db_get_table_number_of_columns( table );
diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h
@@ -352,7 +352,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
      *   @param cat
      *   @return vector of attributes
      */
-    std::vector<QgsField> *columns( int field );
+    QVector<QgsField> *columns( int field );
 
     /** Read attributes from DB
      *   @param field
@@ -640,8 +640,8 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
     void ensureUpdated();
 
     /* Static arrays of opened layers and vectors */
-    static  std::vector<GLAYER> mLayers; // Map + field/attributes
-    static  std::vector<GMAP> mMaps;     // Map
+    static QVector<GLAYER> mLayers; // Map + field/attributes
+    static QVector<GMAP> mMaps;     // Map
 
     friend class QgsGrassFeatureIterator;
     QSet< QgsGrassFeatureIterator *> mActiveIterators;

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ void QgsOSMDatabase::exportSpatiaLiteNodes( const QString& tableName, const QStr`
`421`	`421`	`sqlite3_bind_null( stmtInsert, ++col );`
`422`	`422`	`}`
`423`	`423`
`424`		`- sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), geom->wkbSize(), SQLITE_STATIC );`
	`424`	`+ sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), (int) geom->wkbSize(), SQLITE_STATIC );`
`425`	`425`
`426`	`426`	`int insertRes = sqlite3_step( stmtInsert );`
`427`	`427`	`if ( insertRes != SQLITE_DONE )`
`@@ -489,7 +489,7 @@ void QgsOSMDatabase::exportSpatiaLiteWays( bool closed, const QString& tableName`
`489`	`489`	`sqlite3_bind_null( stmtInsert, ++col );`
`490`	`490`	`}`
`491`	`491`
`492`		`- sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), geom->wkbSize(), SQLITE_STATIC );`
	`492`	`+ sqlite3_bind_blob( stmtInsert, ++col, geom->asWkb(), (int) geom->wkbSize(), SQLITE_STATIC );`
`493`	`493`
`494`	`494`	`int insertRes = sqlite3_step( stmtInsert );`
`495`	`495`	`if ( insertRes != SQLITE_DONE )`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`669`	`669`	`return 0;`
`670`	`670`	`}`
`671`	`671`
`672`		`- OGRErr err = OGR_G_ImportFromWkb( mGeom2, const_cast<unsigned char *>( geom->asWkb() ), geom->wkbSize() );`
	`672`	`+ OGRErr err = OGR_G_ImportFromWkb( mGeom2, const_cast<unsigned char *>( geom->asWkb() ), (int) geom->wkbSize() );`
`673`	`673`	`if ( err != OGRERR_NONE )`
`674`	`674`	`{`
`675`	`675`	`mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )`
`@@ -685,7 +685,7 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )`
`685`	`685`	`}`
`686`	`686`	`else if ( geom )`
`687`	`687`	`{`
`688`		`- OGRErr err = OGR_G_ImportFromWkb( mGeom, const_cast<unsigned char *>( geom->asWkb() ), geom->wkbSize() );`
	`688`	`+ OGRErr err = OGR_G_ImportFromWkb( mGeom, const_cast<unsigned char *>( geom->asWkb() ), (int) geom->wkbSize() );`
`689`	`689`	`if ( err != OGRERR_NONE )`
`690`	`690`	`{`
`691`	`691`	`mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ bool QgsRasterBlock::isNoData( size_t index )`
`324`	`324`	`return false;`
`325`	`325`	`}`
`326`	`326`	`// TODO: optimize`
`327`		`- int row = index / mWidth;`
	`327`	`+ int row = (int) index / mWidth;`
`328`	`328`	`int column = index % mWidth;`
`329`	`329`	`size_t byte = ( size_t )row * mNoDataBitmapWidth + column / 8 ;`
`330`	`330`	`int bit = column % 8;`
`@@ -406,7 +406,7 @@ bool QgsRasterBlock::setIsNoData( size_t index )`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`	`// TODO: optimize`
`409`		`- int row = index / mWidth;`
	`409`	`+ int row = (int) index / mWidth;`
`410`	`410`	`int column = index % mWidth;`
`411`	`411`	`size_t byte = ( size_t )row * mNoDataBitmapWidth + column / 8;`
`412`	`412`	`int bit = column % 8;`
Original file line number	Diff line number	Diff line change
`@@ -572,12 +572,11 @@ void QgsGrassEdit::setAttributeTable( int field )`
`572`	`572`
`573`	`573`	`if ( !key->isEmpty() ) // Database link defined`
`574`	`574`	`{`
`575`		`- std::vector<QgsField> *cols = mProvider->columns( field );`
	`575`	`+ QVector<QgsField> *cols = mProvider->columns( field );`
`576`	`576`
`577`	`577`	`mAttributeTable->setRowCount( cols->size() );`
`578`	`578`
`579`		`-`
`580`		`- for ( unsigned int c = 0; c < cols->size(); c++ )`
	`579`	`+ for ( int c = 0; c < cols->size(); c++ )`
`581`	`580`	`{`
`582`	`581`	`QgsField col = ( *cols )[c];`
`583`	`582`
`@@ -1463,7 +1462,7 @@ void QgsGrassEdit::addAttributes( int field, int cat )`
`1463`	`1462`
`1464`	`1463`	`if ( !key->isEmpty() ) // Database link defined`
`1465`	`1464`	`{`
`1466`		`- std::vector<QgsField> *cols = mProvider->columns( field );`
	`1465`	`+ QVector<QgsField> *cols = mProvider->columns( field );`
`1467`	`1466`
`1468`	`1467`	`if ( cols->size() == 0 )`
`1469`	`1468`	`{`
`@@ -1481,7 +1480,7 @@ void QgsGrassEdit::addAttributes( int field, int cat )`
`1481`	`1480`	`}`
`1482`	`1481`	`else`
`1483`	`1482`	`{`
`1484`		`- for ( unsigned int j = 0; j < cols->size(); j++ )`
	`1483`	`+ for ( int j = 0; j < cols->size(); j++ )`
`1485`	`1484`	`{`
`1486`	`1485`	`QgsField col = ( *cols )[j];`
`1487`	`1486`	`QVariant att = ( *atts )[j];`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ extern "C"`
`62`	`62`	`#endif`
`63`	`63`
`64`	`64`
`65`		`-std::vector<GLAYER> QgsGrassProvider::mLayers;`
`66`		`-std::vector<GMAP> QgsGrassProvider::mMaps;`
	`65`	`+QVector<GLAYER> QgsGrassProvider::mLayers;`
	`66`	`+QVector<GMAP> QgsGrassProvider::mMaps;`
`67`	`67`
`68`	`68`
`69`	`69`	`static QString GRASS_KEY = "grass"; // XXX verify this`
`@@ -370,7 +370,7 @@ int QgsGrassProvider::openLayer( QString gisdbase, QString location, QString map`
`370`	`370`
`371`	`371`	`// Check if this layer is already opened`
`372`	`372`
`373`		`- for ( unsigned int i = 0; i < mLayers.size(); i++ )`
	`373`	`+ for ( int i = 0; i < mLayers.size(); i++ )`
`374`	`374`	`{`
`375`	`375`	`if ( !( mLayers[i].valid ) )`
`376`	`376`	`continue;`
`@@ -719,7 +719,7 @@ int QgsGrassProvider::openMap( QString gisdbase, QString location, QString mapse`
`719`	`719`	`QString tmpPath = gisdbase + "/" + location + "/" + mapset + "/" + mapName;`
`720`	`720`
`721`	`721`	`// Check if this map is already opened`
`722`		`- for ( unsigned int i = 0; i < mMaps.size(); i++ )`
	`722`	`+ for ( int i = 0; i < mMaps.size(); i++ )`
`723`	`723`	`{`
`724`	`724`	`if ( mMaps[i].valid && mMaps[i].path == tmpPath )`
`725`	`725`	`{`
`@@ -869,7 +869,7 @@ void QgsGrassProvider::updateMap( int mapId )`
`869`	`869`	`QgsDebugMsg( QString( "Cannot reopen GRASS vector: %1" ).arg( e.what() ) );`
`870`	`870`
`871`	`871`	`// if reopen fails, mLayers should be also updated`
`872`		`- for ( unsigned int i = 0; i < mLayers.size(); i++ )`
	`872`	`+ for ( int i = 0; i < mLayers.size(); i++ )`
`873`	`873`	`{`
`874`	`874`	`if ( mLayers[i].mapId == mapId )`
`875`	`875`	`{`
`@@ -881,7 +881,7 @@ void QgsGrassProvider::updateMap( int mapId )`
`881`	`881`
`882`	`882`	`QgsDebugMsg( "GRASS map successfully reopened for reading." );`
`883`	`883`
`884`		`- for ( unsigned int i = 0; i < mLayers.size(); i++ )`
	`884`	`+ for ( int i = 0; i < mLayers.size(); i++ )`
`885`	`885`	`{`
`886`	`886`	`// if ( !(mLayers[i].valid) )`
`887`	`887`	`// continue; // ?`
`@@ -1365,7 +1365,7 @@ bool QgsGrassProvider::reopenMap()`
`1365`	`1365`	`QgsDebugMsg( "GRASS map successfully reopened for reading." );`
`1366`	`1366`
`1367`	`1367`	`// Reload sources to layers`
`1368`		`- for ( unsigned int i = 0; i < mLayers.size(); i++ )`
	`1368`	`+ for ( int i = 0; i < mLayers.size(); i++ )`
`1369`	`1369`	`{`
`1370`	`1370`	`// if ( !(mLayers[i].valid) )`
`1371`	`1371`	`// continue; // ?`
`@@ -1609,19 +1609,19 @@ QString *QgsGrassProvider::key( int field )`
`1609`	`1609`	`return key;`
`1610`	`1610`	`}`
`1611`	`1611`
`1612`		`-std::vector<QgsField> *QgsGrassProvider::columns( int field )`
	`1612`	`+QVector<QgsField> *QgsGrassProvider::columns( int field )`
`1613`	`1613`	`{`
`1614`	`1614`	`QgsDebugMsg( QString( "field = %1" ).arg( field ) );`
`1615`	`1615`
`1616`		`- std::vector<QgsField> *col = new std::vector<QgsField>;`
	`1616`	`+ QVector<QgsField> *col = new QVector<QgsField>;`
`1617`	`1617`
`1618`	`1618`	`struct field_info *fi = Vect_get_field( mMap, field ); // should work also with field = 0`
`1619`	`1619`
`1620`	`1620`	`// Read attributes`
`1621`	`1621`	`if ( !fi )`
`1622`	`1622`	`{`
`1623`	`1623`	`QgsDebugMsg( "No field info -> no attributes" );`
`1624`		`- return ( col );`
	`1624`	`+ return col;`
`1625`	`1625`	`}`
`1626`	`1626`
`1627`	`1627`	`QgsDebugMsg( "Field info found -> open database" );`
`@@ -1631,7 +1631,7 @@ std::vector<QgsField> *QgsGrassProvider::columns( int field )`
`1631`	`1631`	`if ( !driver )`
`1632`	`1632`	`{`
`1633`	`1633`	`QgsDebugMsg( QString( "Cannot open database %1 by driver %2" ).arg( fi->database ).arg( fi->driver ) );`
`1634`		`- return ( col );`
	`1634`	`+ return col;`
`1635`	`1635`	`}`
`1636`	`1636`
`1637`	`1637`	`QgsDebugMsg( "Database opened -> describe table" );`
`@@ -1644,7 +1644,7 @@ std::vector<QgsField> *QgsGrassProvider::columns( int field )`
`1644`	`1644`	`if ( db_describe_table( driver, &tableName, &table ) != DB_OK )`
`1645`	`1645`	`{`
`1646`	`1646`	`QgsDebugMsg( "Cannot describe table" );`
`1647`		`- return ( col );`
	`1647`	`+ return col;`
`1648`	`1648`	`}`
`1649`	`1649`
`1650`	`1650`	`int nCols = db_get_table_number_of_columns( table );`