spit: use qt templates

jef-n · jef-n · commit e73718edd2db · 2013-10-12T22:18:29.000+02:00
diff --git a/src/plugins/spit/qgsshapefile.cpp b/src/plugins/spit/qgsshapefile.cpp
@@ -272,7 +272,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_
                   .arg( QgsPgUtil::quotedIdentifier( table_name ) )
                   .arg( QgsPgUtil::quotedIdentifier( primary_key ) );
 
-  for ( uint n = 0; n < column_names.size() && result; n++ )
+  for ( int n = 0; n < column_names.size() && result; n++ )
   {
     query += QString( ",%1 %2" )
              .arg( QgsPgUtil::quotedIdentifier( column_names[n] ) )
@@ -387,7 +387,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_
         QString geometry( geo_temp );
         CPLFree( geo_temp );
 
-        for ( uint n = 0; n < column_types.size(); n++ )
+        for ( int n = 0; n < column_types.size(); n++ )
         {
           QString val;
 
diff --git a/src/plugins/spit/qgsshapefile.h b/src/plugins/spit/qgsshapefile.h
@@ -53,8 +53,8 @@ class QgsShapeFile : public QObject
     QString getTable();
     void setTable( QString new_table );
     void setDefaultTable();
-    std::vector <QString> column_names;
-    std::vector <QString> column_types;
+    QStringList column_names;
+    QStringList column_types;
     void setColumnNames( QStringList );
     bool scanGeometries();
 
diff --git a/src/plugins/spit/qgsspit.cpp b/src/plugins/spit/qgsspit.cpp
@@ -278,11 +278,11 @@ void QgsSpit::addFile()
 
 void QgsSpit::removeFile()
 {
-  std::vector <int> temp;
+  QVector<int> temp;
   for ( int n = 0; n < tblShapefiles->rowCount(); n++ )
     if ( tblShapefiles->isItemSelected( tblShapefiles->item( n, 0 ) ) )
     {
-      for ( std::vector<QgsShapeFile *>::iterator vit = fileList.begin(); vit != fileList.end(); vit++ )
+      for ( QVector<QgsShapeFile *>::iterator vit = fileList.begin(); vit != fileList.end(); vit++ )
       {
         if (( *vit ) ->getName() == tblShapefiles->item( n, 0 )->text() )
         {
@@ -531,7 +531,7 @@ void QgsSpit::import()
 
     int count = fileList.size(), successes = 0;
 
-    for ( std::vector<QgsShapeFile*>::size_type i = 0; i < fileList.size() ; i++ )
+    for ( QVector<QgsShapeFile*>::size_type i = 0; i < fileList.size() ; i++ )
     {
       QString error = tr( "Problem inserting features from file:" ) + "\n" +
                       tblShapefiles->item( i, ColFILENAME )->text();
@@ -557,14 +557,14 @@ void QgsSpit::import()
       }
 
       // duplicate field check
-      std::vector<QString> names_copy = fileList[ i ] ->column_names;
+      QStringList names_copy = fileList[ i ] ->column_names;
       names_copy.push_back( txtPrimaryKeyName->text() );
       names_copy.push_back( txtGeomName->text() );
 
       QString dupl = "";
-      std::sort( names_copy.begin(), names_copy.end() );
+      qSort( names_copy.begin(), names_copy.end() );
 
-      for ( std::vector<QString>::size_type k = 1; k < names_copy.size(); k++ )
+      for ( int k = 1; k < names_copy.size(); k++ )
       {
         QgsDebugMsg( QString( "Checking to see if %1 == %2" ).arg( names_copy[ k ] ).arg( names_copy[ k - 1 ] ) );
         if ( names_copy[ k ] == names_copy[ k - 1 ] )
diff --git a/src/plugins/spit/qgsspit.h b/src/plugins/spit/qgsspit.h
@@ -110,7 +110,7 @@ class QgsSpit : public QDialog, private Ui::QgsSpitBase
     QStringList schema_list;
     QStringList geometry_list;
     int total_features;
-    std::vector <QgsShapeFile *> fileList;
+    QVector<QgsShapeFile *> fileList;
     int defSrid;
     QString defGeom;
     int defaultSridValue;

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_`
`272`	`272`	`.arg( QgsPgUtil::quotedIdentifier( table_name ) )`
`273`	`273`	`.arg( QgsPgUtil::quotedIdentifier( primary_key ) );`
`274`	`274`
`275`		`- for ( uint n = 0; n < column_names.size() && result; n++ )`
	`275`	`+ for ( int n = 0; n < column_names.size() && result; n++ )`
`276`	`276`	`{`
`277`	`277`	`query += QString( ",%1 %2" )`
`278`	`278`	`.arg( QgsPgUtil::quotedIdentifier( column_names[n] ) )`
`@@ -387,7 +387,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_`
`387`	`387`	`QString geometry( geo_temp );`
`388`	`388`	`CPLFree( geo_temp );`
`389`	`389`
`390`		`- for ( uint n = 0; n < column_types.size(); n++ )`
	`390`	`+ for ( int n = 0; n < column_types.size(); n++ )`
`391`	`391`	`{`
`392`	`392`	`QString val;`
`393`	`393`
Original file line number	Diff line number	Diff line change
`@@ -278,11 +278,11 @@ void QgsSpit::addFile()`
`278`	`278`
`279`	`279`	`void QgsSpit::removeFile()`
`280`	`280`	`{`
`281`		`- std::vector <int> temp;`
	`281`	`+ QVector<int> temp;`
`282`	`282`	`for ( int n = 0; n < tblShapefiles->rowCount(); n++ )`
`283`	`283`	`if ( tblShapefiles->isItemSelected( tblShapefiles->item( n, 0 ) ) )`
`284`	`284`	`{`
`285`		`- for ( std::vector<QgsShapeFile *>::iterator vit = fileList.begin(); vit != fileList.end(); vit++ )`
	`285`	`+ for ( QVector<QgsShapeFile *>::iterator vit = fileList.begin(); vit != fileList.end(); vit++ )`
`286`	`286`	`{`
`287`	`287`	`if (( *vit ) ->getName() == tblShapefiles->item( n, 0 )->text() )`
`288`	`288`	`{`
`@@ -531,7 +531,7 @@ void QgsSpit::import()`
`531`	`531`
`532`	`532`	`int count = fileList.size(), successes = 0;`
`533`	`533`
`534`		`- for ( std::vector<QgsShapeFile*>::size_type i = 0; i < fileList.size() ; i++ )`
	`534`	`+ for ( QVector<QgsShapeFile*>::size_type i = 0; i < fileList.size() ; i++ )`
`535`	`535`	`{`
`536`	`536`	`QString error = tr( "Problem inserting features from file:" ) + "\n" +`
`537`	`537`	`tblShapefiles->item( i, ColFILENAME )->text();`
`@@ -557,14 +557,14 @@ void QgsSpit::import()`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`// duplicate field check`
`560`		`- std::vector<QString> names_copy = fileList[ i ] ->column_names;`
	`560`	`+ QStringList names_copy = fileList[ i ] ->column_names;`
`561`	`561`	`names_copy.push_back( txtPrimaryKeyName->text() );`
`562`	`562`	`names_copy.push_back( txtGeomName->text() );`
`563`	`563`
`564`	`564`	`QString dupl = "";`
`565`		`- std::sort( names_copy.begin(), names_copy.end() );`
	`565`	`+ qSort( names_copy.begin(), names_copy.end() );`
`566`	`566`
`567`		`- for ( std::vector<QString>::size_type k = 1; k < names_copy.size(); k++ )`
	`567`	`+ for ( int k = 1; k < names_copy.size(); k++ )`
`568`	`568`	`{`
`569`	`569`	`QgsDebugMsg( QString( "Checking to see if %1 == %2" ).arg( names_copy[ k ] ).arg( names_copy[ k - 1 ] ) );`
`570`	`570`	`if ( names_copy[ k ] == names_copy[ k - 1 ] )`