From dd9b4f77791be9f864d368f1539f8c10a299b6cc Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <elpaso@itopen.it>
Date: Tue, 29 Oct 2019 08:00:43 +0100
Subject: [PATCH] Address PR comments

---
 .../providers/ogr/qgsgeopackageproviderconnection.cpp     | 4 ++--
 src/providers/postgres/qgspostgresproviderconnection.cpp  | 8 ++++----
 .../spatialite/qgsspatialiteproviderconnection.cpp        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp b/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
index 3a99458dadd..8d66138a19e 100644
--- a/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
+++ b/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
@@ -23,8 +23,8 @@
 // List of GPKG quoted system and dummy tables names to be excluded from the tables listing
 static const QStringList excludedTableNames { { QStringLiteral( "\"ogr_empty_table\"" ) } };
 
-QgsGeoPackageProviderConnection::QgsGeoPackageProviderConnection( const QString &name ):
-  QgsAbstractDatabaseProviderConnection( name )
+QgsGeoPackageProviderConnection::QgsGeoPackageProviderConnection( const QString &name )
+  : QgsAbstractDatabaseProviderConnection( name )
 {
   setDefaultCapabilities();
   QgsSettings settings;
diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
index 018a043bf32..5bc337d0829 100644
--- a/src/providers/postgres/qgspostgresproviderconnection.cpp
+++ b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -26,11 +26,11 @@ extern "C"
 #include <libpq-fe.h>
 }
 
-QgsPostgresProviderConnection::QgsPostgresProviderConnection( const QString &name ):
-  QgsAbstractDatabaseProviderConnection( name )
+QgsPostgresProviderConnection::QgsPostgresProviderConnection( const QString &name )
+  : QgsAbstractDatabaseProviderConnection( name )
 {
   // Remove the sql and table empty parts
-  static const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*)raw" };
+  const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*)raw" };
   setUri( QgsPostgresConn::connUri( name ).uri().replace( removePartsRe, QString() ) );
   setDefaultCapabilities();
 }
@@ -118,7 +118,7 @@ QString QgsPostgresProviderConnection::tableUri( const QString &schema, const QS
   dsUri.setSchema( schema );
   if ( tableInfo.flags().testFlag( QgsAbstractDatabaseProviderConnection::TableFlag::Raster ) )
   {
-    static const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=("[^"]+"\.?)*\s*)raw" };
+    const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=("[^"]+"\.?)*\s*)raw" };
     if ( tableInfo.geometryColumn().isEmpty() )
     {
       throw QgsProviderConnectionException( QObject::tr( "Raster table '%1' in schema '%2' has no geometry column." )
diff --git a/src/providers/spatialite/qgsspatialiteproviderconnection.cpp b/src/providers/spatialite/qgsspatialiteproviderconnection.cpp
index 054bb00d03b..a193b68bfde 100644
--- a/src/providers/spatialite/qgsspatialiteproviderconnection.cpp
+++ b/src/providers/spatialite/qgsspatialiteproviderconnection.cpp
@@ -22,8 +22,8 @@
 #include "qgsproviderregistry.h"
 
 
-QgsSpatiaLiteProviderConnection::QgsSpatiaLiteProviderConnection( const QString &name ):
-  QgsAbstractDatabaseProviderConnection( name )
+QgsSpatiaLiteProviderConnection::QgsSpatiaLiteProviderConnection( const QString &name )
+  : QgsAbstractDatabaseProviderConnection( name )
 {
   setDefaultCapabilities();
   // TODO: QGIS 4: move into QgsSettings::Section::Providers group
@@ -39,7 +39,7 @@ QgsSpatiaLiteProviderConnection::QgsSpatiaLiteProviderConnection( const QString
 QgsSpatiaLiteProviderConnection::QgsSpatiaLiteProviderConnection( const QString &uri, const QVariantMap &configuration ):
   QgsAbstractDatabaseProviderConnection( uri, configuration )
 {
-  static const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*|\([^\)]+\))raw" };
+  const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*|\([^\)]+\))raw" };
   // Cleanup the URI in case it contains other information other than the file path
   setUri( QString( uri ).replace( removePartsRe, QString() ) );
   setDefaultCapabilities();