[oracle] More code modernization

qgis · Apr 22, 2018 · 31faa11 · 31faa11
1 parent 8d1b435
commit 31faa11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/providers/oracle/qgsoraclecolumntypethread.cpp b/src/providers/oracle/qgsoraclecolumntypethread.cpp
@@ -21,7 +21,7 @@ email                : jef at norbit dot de
 
 #include <QMetaType>
 
-QgsOracleColumnTypeThread::QgsOracleColumnTypeThread( QString name, bool useEstimatedMetadata, bool allowGeometrylessTables )
+QgsOracleColumnTypeThread::QgsOracleColumnTypeThread( const QString &name, bool useEstimatedMetadata, bool allowGeometrylessTables )
   : QThread()
   , mName( name )
   , mUseEstimatedMetadata( useEstimatedMetadata )
@@ -70,9 +70,9 @@ void QgsOracleColumnTypeThread::run()
     {
       emit progress( i++, n );
       emit progressMessage( tr( "Scanning column %1.%2.%3…" )
-                            .arg( layerProperty.ownerName )
-                            .arg( layerProperty.tableName )
-                            .arg( layerProperty.geometryColName ) );
+                            .arg( layerProperty.ownerName,
+                                  layerProperty.tableName,
+                                  layerProperty.geometryColName ) );
       conn->retrieveLayerTypes( layerProperty, mUseEstimatedMetadata, QgsOracleConn::onlyExistingTypes( mName ) );
     }
 

diff --git a/src/providers/oracle/qgsoraclecolumntypethread.h b/src/providers/oracle/qgsoraclecolumntypethread.h
@@ -28,7 +28,7 @@ class QgsOracleColumnTypeThread : public QThread
 {
     Q_OBJECT
   public:
-    QgsOracleColumnTypeThread( QString connName,
+    QgsOracleColumnTypeThread( const QString &connName,
                                bool useEstimatedMetaData,
                                bool allowGeometrylessTables );
 
@@ -51,12 +51,12 @@ class QgsOracleColumnTypeThread : public QThread
     void stop();
 
   private:
-    QgsOracleColumnTypeThread() {}
+    QgsOracleColumnTypeThread() = default;
 
     QString mName;
-    bool mUseEstimatedMetadata;
-    bool mAllowGeometrylessTables;
-    bool mStopped;
+    bool mUseEstimatedMetadata = false;
+    bool mAllowGeometrylessTables = false;
+    bool mStopped = false;
     QVector<QgsOracleLayerProperty> mLayerProperties;
 };