followup 16ba01f for oracle & mssql

jef-n · jef-n · commit 1e2e4816a639 · 2013-06-03T00:32:03.000+02:00
diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h
@@ -43,7 +43,7 @@ class QgsVectorLayerUndoCommand : public QUndoCommand
     inline QgsGeometryCache *cache() { return mBuffer->L->cache(); }
 
     virtual int id() const { return -1; }
-    virtual bool mergeWith( QUndoCommand * ) { return -1; }
+    virtual bool mergeWith( QUndoCommand * ) { return false; }
 
   protected:
     QgsVectorLayerEditBuffer* mBuffer;
diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -735,8 +735,12 @@ void QgsMssqlGeomColumnTypeThread::run()
 {
   mStopped = false;
 
-  foreach ( QgsMssqlLayerProperty layerProperty, layerProperties )
+  for ( QList<QgsMssqlLayerProperty>::iterator it = layerProperties.begin(),
+        end = layerProperties.end();
+        it != end; ++it )
   {
+    QgsMssqlLayerProperty &layerProperty = *it;
+
     if ( !mStopped )
     {
       QString table;
diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp
@@ -40,7 +40,7 @@ QgsMssqlTableModel::~QgsMssqlTableModel()
 {
 }
 
-void QgsMssqlTableModel::addTableEntry( QgsMssqlLayerProperty layerProperty )
+void QgsMssqlTableModel::addTableEntry( const QgsMssqlLayerProperty &layerProperty )
 {
   QgsDebugMsg( QString( "%1.%2.%3 type=%4 srid=%5 pk=%6 sql=%7" )
                .arg( layerProperty.schemaName )
@@ -346,7 +346,7 @@ bool QgsMssqlTableModel::setData( const QModelIndex &idx, const QVariant &value,
   return true;
 }
 
-QString QgsMssqlTableModel::layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata )
+QString QgsMssqlTableModel::layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata )
 {
   if ( !index.isValid() )
     return QString::null;
diff --git a/src/providers/mssql/qgsmssqltablemodel.h b/src/providers/mssql/qgsmssqltablemodel.h
@@ -47,7 +47,7 @@ class QgsMssqlTableModel : public QStandardItemModel
     ~QgsMssqlTableModel();
 
     /**Adds entry for one database table to the model*/
-    void addTableEntry( QgsMssqlLayerProperty property );
+    void addTableEntry( const QgsMssqlLayerProperty &property );
 
     /**Sets an sql statement that belongs to a cell specified by a model index*/
     void setSql( const QModelIndex& index, const QString& sql );
@@ -74,7 +74,7 @@ class QgsMssqlTableModel : public QStandardItemModel
 
     bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole );
 
-    QString layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata );
+    QString layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata );
 
     static QIcon iconForWkbType( QGis::WkbType type );
 
diff --git a/src/providers/oracle/qgsoraclecolumntypethread.cpp b/src/providers/oracle/qgsoraclecolumntypethread.cpp
@@ -57,12 +57,15 @@ void QgsOracleColumnTypeThread::run()
     return;
   }
 
-  int i = 0;
-  foreach ( QgsOracleLayerProperty layerProperty, layerProperties )
+  int i = 0, n = layerProperties.size();
+  for ( QVector<QgsOracleLayerProperty>::iterator it = layerProperties.begin(),
+        end = layerProperties.end();
+        it != end; ++it )
   {
+    QgsOracleLayerProperty &layerProperty = *it;
     if ( !mStopped )
     {
-      emit progress( i++, layerProperties.size() );
+      emit progress( i++, n );
       emit progressMessage( tr( "Scanning column %1.%2.%3..." )
                             .arg( layerProperty.ownerName )
                             .arg( layerProperty.tableName )
diff --git a/src/providers/oracle/qgsoracleconn.h b/src/providers/oracle/qgsoracleconn.h
@@ -45,9 +45,9 @@ struct QgsOracleLayerProperty
   QStringList          pkCols;
   QString              sql;
 
-  int size() { Q_ASSERT( types.size() == srids.size() ); return types.size(); }
+  int size() const { Q_ASSERT( types.size() == srids.size() ); return types.size(); }
 
-  QgsOracleLayerProperty at( int i )
+  QgsOracleLayerProperty at( int i ) const
   {
     QgsOracleLayerProperty property;
 
@@ -66,7 +66,7 @@ struct QgsOracleLayerProperty
   }
 
 #if QGISDEBUG
-  QString toString()
+  QString toString() const
   {
     QString typeString;
     foreach ( QGis::WkbType type, types )
diff --git a/src/providers/oracle/qgsoracletablemodel.cpp b/src/providers/oracle/qgsoracletablemodel.cpp
@@ -39,7 +39,7 @@ QgsOracleTableModel::~QgsOracleTableModel()
 {
 }
 
-void QgsOracleTableModel::addTableEntry( QgsOracleLayerProperty layerProperty )
+void QgsOracleTableModel::addTableEntry( const QgsOracleLayerProperty &layerProperty )
 {
   QgsDebugMsg( layerProperty.toString() );
 
@@ -261,7 +261,7 @@ bool QgsOracleTableModel::setData( const QModelIndex &idx, const QVariant &value
   return true;
 }
 
-QString QgsOracleTableModel::layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata )
+QString QgsOracleTableModel::layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata )
 {
   if ( !index.isValid() )
   {
diff --git a/src/providers/oracle/qgsoracletablemodel.h b/src/providers/oracle/qgsoracletablemodel.h
@@ -34,7 +34,7 @@ class QgsOracleTableModel : public QStandardItemModel
     ~QgsOracleTableModel();
 
     /**Adds entry for one database table to the model*/
-    void addTableEntry( QgsOracleLayerProperty property );
+    void addTableEntry( const QgsOracleLayerProperty &property );
 
     /**Sets an sql statement that belongs to a cell specified by a model index*/
     void setSql( const QModelIndex& index, const QString& sql );
@@ -57,7 +57,7 @@ class QgsOracleTableModel : public QStandardItemModel
 
     bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole );
 
-    QString layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata );
+    QString layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata );
 
     static QIcon iconForWkbType( QGis::WkbType type );
 
diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui
@@ -1865,7 +1865,7 @@
                    </widget>
                   </item>
                   <item row="3" column="0" colspan="2">
-                   <layout class="QHBoxLayout" name="horizontalLayout_3">
+                   <layout class="QHBoxLayout" name="horizontalLayout_8">
                     <item>
                      <widget class="QLabel" name="mWFSUrlLabel">
                       <property name="text">

Original file line number	Diff line number	Diff line change
`@@ -735,8 +735,12 @@ void QgsMssqlGeomColumnTypeThread::run()`
`735`	`735`	`{`
`736`	`736`	`mStopped = false;`
`737`	`737`
`738`		`- foreach ( QgsMssqlLayerProperty layerProperty, layerProperties )`
	`738`	`+ for ( QList<QgsMssqlLayerProperty>::iterator it = layerProperties.begin(),`
	`739`	`+ end = layerProperties.end();`
	`740`	`+ it != end; ++it )`
`739`	`741`	`{`
	`742`	`+ QgsMssqlLayerProperty &layerProperty = *it;`
	`743`	`+`
`740`	`744`	`if ( !mStopped )`
`741`	`745`	`{`
`742`	`746`	`QString table;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ QgsMssqlTableModel::~QgsMssqlTableModel()`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`
`43`		`-void QgsMssqlTableModel::addTableEntry( QgsMssqlLayerProperty layerProperty )`
	`43`	`+void QgsMssqlTableModel::addTableEntry( const QgsMssqlLayerProperty &layerProperty )`
`44`	`44`	`{`
`45`	`45`	`QgsDebugMsg( QString( "%1.%2.%3 type=%4 srid=%5 pk=%6 sql=%7" )`
`46`	`46`	`.arg( layerProperty.schemaName )`
`@@ -346,7 +346,7 @@ bool QgsMssqlTableModel::setData( const QModelIndex &idx, const QVariant &value,`
`346`	`346`	`return true;`
`347`	`347`	`}`
`348`	`348`
`349`		`-QString QgsMssqlTableModel::layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata )`
	`349`	`+QString QgsMssqlTableModel::layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata )`
`350`	`350`	`{`
`351`	`351`	`if ( !index.isValid() )`
`352`	`352`	`return QString::null;`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,15 @@ void QgsOracleColumnTypeThread::run()`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`
`60`		`- int i = 0;`
`61`		`- foreach ( QgsOracleLayerProperty layerProperty, layerProperties )`
	`60`	`+ int i = 0, n = layerProperties.size();`
	`61`	`+ for ( QVector<QgsOracleLayerProperty>::iterator it = layerProperties.begin(),`
	`62`	`+ end = layerProperties.end();`
	`63`	`+ it != end; ++it )`
`62`	`64`	`{`
	`65`	`+ QgsOracleLayerProperty &layerProperty = *it;`
`63`	`66`	`if ( !mStopped )`
`64`	`67`	`{`
`65`		`- emit progress( i++, layerProperties.size() );`
	`68`	`+ emit progress( i++, n );`
`66`	`69`	`emit progressMessage( tr( "Scanning column %1.%2.%3..." )`
`67`	`70`	`.arg( layerProperty.ownerName )`
`68`	`71`	`.arg( layerProperty.tableName )`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ struct QgsOracleLayerProperty`
`45`	`45`	`QStringList pkCols;`
`46`	`46`	`QString sql;`
`47`	`47`
`48`		`- int size() { Q_ASSERT( types.size() == srids.size() ); return types.size(); }`
	`48`	`+ int size() const { Q_ASSERT( types.size() == srids.size() ); return types.size(); }`
`49`	`49`
`50`		`- QgsOracleLayerProperty at( int i )`
	`50`	`+ QgsOracleLayerProperty at( int i ) const`
`51`	`51`	`{`
`52`	`52`	`QgsOracleLayerProperty property;`
`53`	`53`
`@@ -66,7 +66,7 @@ struct QgsOracleLayerProperty`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`#if QGISDEBUG`
`69`		`- QString toString()`
	`69`	`+ QString toString() const`
`70`	`70`	`{`
`71`	`71`	`QString typeString;`
`72`	`72`	`foreach ( QGis::WkbType type, types )`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ QgsOracleTableModel::~QgsOracleTableModel()`
`39`	`39`	`{`
`40`	`40`	`}`
`41`	`41`
`42`		`-void QgsOracleTableModel::addTableEntry( QgsOracleLayerProperty layerProperty )`
	`42`	`+void QgsOracleTableModel::addTableEntry( const QgsOracleLayerProperty &layerProperty )`
`43`	`43`	`{`
`44`	`44`	`QgsDebugMsg( layerProperty.toString() );`
`45`	`45`
`@@ -261,7 +261,7 @@ bool QgsOracleTableModel::setData( const QModelIndex &idx, const QVariant &value`
`261`	`261`	`return true;`
`262`	`262`	`}`
`263`	`263`
`264`		`-QString QgsOracleTableModel::layerURI( const QModelIndex &index, QString connInfo, bool useEstimatedMetadata )`
	`264`	`+QString QgsOracleTableModel::layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata )`
`265`	`265`	`{`
`266`	`266`	`if ( !index.isValid() )`
`267`	`267`	`{`