Modernize connection pool code

nyalldawson · nyalldawson · commit 615823653cfb · 2018-03-16T12:33:34.000+11:00
diff --git a/src/core/qgsconnectionpool.h b/src/core/qgsconnectionpool.h
@@ -18,6 +18,7 @@
 
 #define SIP_NO_FILE
 
+#include "qgis.h"
 #include <QCoreApplication>
 #include <QMap>
 #include <QMutex>
@@ -34,7 +35,7 @@
 
 /**
  * \ingroup core
- * Template that stores data related to one server.
+ * Template that stores data related to a connection to a single server or datasource.
  *
  * It is assumed that following functions exist:
  * - void qgsConnectionPool_ConnectionCreate(QString name, T& c)  ... create a new connection
@@ -74,7 +75,7 @@ class QgsConnectionPoolGroup
 
     ~QgsConnectionPoolGroup()
     {
-      Q_FOREACH ( Item item, conns )
+      for ( const Item &item : qgis::as_const( conns ) )
       {
         qgsConnectionPool_ConnectionDestroy( item.c );
       }
@@ -180,12 +181,12 @@ class QgsConnectionPoolGroup
     void invalidateConnections()
     {
       connMutex.lock();
-      Q_FOREACH ( Item i, conns )
+      for ( const Item &i : qgis::as_const( conns ) )
       {
         qgsConnectionPool_ConnectionDestroy( i.c );
       }
       conns.clear();
-      Q_FOREACH ( T c, acquiredConns )
+      for ( T c : qgis::as_const( acquiredConns ) )
         qgsConnectionPool_InvalidateConnection( c );
       connMutex.unlock();
     }
@@ -269,7 +270,7 @@ class QgsConnectionPool
     virtual ~QgsConnectionPool()
     {
       mMutex.lock();
-      Q_FOREACH ( T_Group *group, mGroups )
+      for ( T_Group *group : qgis::as_const( mGroups ) )
       {
         delete group;
       }
diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h
@@ -65,8 +65,16 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup<QgsOgr
   public:
     explicit QgsOgrConnPoolGroup( const QString &name )
       : QgsConnectionPoolGroup<QgsOgrConn*>( name )
-      , mRefCount( 0 )
-    { initTimer( this ); }
+    {
+      initTimer( this );
+    }
+
+    //! QgsOgrConnPoolGroup cannot be copied
+    QgsOgrConnPoolGroup( const QgsOgrConnPoolGroup &other ) = delete;
+
+    //! QgsOgrConnPoolGroup cannot be copied
+    QgsOgrConnPoolGroup &operator=( const QgsOgrConnPoolGroup &other ) = delete;
+
     void ref() { ++mRefCount; }
     bool unref()
     {
@@ -79,11 +87,8 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup<QgsOgr
     void startExpirationTimer() { expirationTimer->start(); }
     void stopExpirationTimer() { expirationTimer->stop(); }
 
-  protected:
-    Q_DISABLE_COPY( QgsOgrConnPoolGroup )
-
   private:
-    int mRefCount;
+    int mRefCount = 0;
 
 };
 
@@ -110,6 +115,12 @@ class QgsOgrConnPool : public QgsConnectionPool<QgsOgrConn *, QgsOgrConnPoolGrou
     //
     static void cleanupInstance();
 
+    //! QgsOgrConnPool cannot be copied
+    QgsOgrConnPool( const QgsOgrConnPool &other ) = delete;
+
+    //! QgsOgrConnPool cannot be copied
+    QgsOgrConnPool &operator=( const QgsOgrConnPool &other ) = delete;
+
     /**
      * \brief Increases the reference count on the connection pool for the specified connection.
      * \param connInfo The connection string.
@@ -151,9 +162,6 @@ class QgsOgrConnPool : public QgsConnectionPool<QgsOgrConn *, QgsOgrConnPoolGrou
       mMutex.unlock();
     }
 
-  protected:
-    Q_DISABLE_COPY( QgsOgrConnPool )
-
   private:
     QgsOgrConnPool();
     ~QgsOgrConnPool() override;

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`#define SIP_NO_FILE`
`20`	`20`
	`21`	`+#include "qgis.h"`
`21`	`22`	`#include <QCoreApplication>`
`22`	`23`	`#include <QMap>`
`23`	`24`	`#include <QMutex>`
`@@ -34,7 +35,7 @@`
`34`	`35`
`35`	`36`	`/**`
`36`	`37`	`* \ingroup core`
`37`		`- * Template that stores data related to one server.`
	`38`	`+ * Template that stores data related to a connection to a single server or datasource.`
`38`	`39`	`*`
`39`	`40`	`* It is assumed that following functions exist:`
`40`	`41`	`* - void qgsConnectionPool_ConnectionCreate(QString name, T& c) ... create a new connection`
`@@ -74,7 +75,7 @@ class QgsConnectionPoolGroup`
`74`	`75`
`75`	`76`	`~QgsConnectionPoolGroup()`
`76`	`77`	`{`
`77`		`- Q_FOREACH ( Item item, conns )`
	`78`	`+ for ( const Item &item : qgis::as_const( conns ) )`
`78`	`79`	`{`
`79`	`80`	`qgsConnectionPool_ConnectionDestroy( item.c );`
`80`	`81`	`}`
`@@ -180,12 +181,12 @@ class QgsConnectionPoolGroup`
`180`	`181`	`void invalidateConnections()`
`181`	`182`	`{`
`182`	`183`	`connMutex.lock();`
`183`		`- Q_FOREACH ( Item i, conns )`
	`184`	`+ for ( const Item &i : qgis::as_const( conns ) )`
`184`	`185`	`{`
`185`	`186`	`qgsConnectionPool_ConnectionDestroy( i.c );`
`186`	`187`	`}`
`187`	`188`	`conns.clear();`
`188`		`- Q_FOREACH ( T c, acquiredConns )`
	`189`	`+ for ( T c : qgis::as_const( acquiredConns ) )`
`189`	`190`	`qgsConnectionPool_InvalidateConnection( c );`
`190`	`191`	`connMutex.unlock();`
`191`	`192`	`}`
`@@ -269,7 +270,7 @@ class QgsConnectionPool`
`269`	`270`	`virtual ~QgsConnectionPool()`
`270`	`271`	`{`
`271`	`272`	`mMutex.lock();`
`272`		`- Q_FOREACH ( T_Group *group, mGroups )`
	`273`	`+ for ( T_Group *group : qgis::as_const( mGroups ) )`
`273`	`274`	`{`
`274`	`275`	`delete group;`
`275`	`276`	`}`