Replace QSharedPointer with std::shared_ptr in QgsHanaConnectionPool

qgis · Dec 7, 2020 · e171007 · e171007
1 parent 749f700
commit e171007
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/providers/hana/qgshanaconnectionpool.cpp b/src/providers/hana/qgshanaconnectionpool.cpp
@@ -26,15 +26,15 @@ QgsHanaConnectionPoolGroup::QgsHanaConnectionPoolGroup( const QString &name )
 }
 
 QBasicMutex QgsHanaConnectionPool::sMutex;
-QSharedPointer<QgsHanaConnectionPool> QgsHanaConnectionPool::sInstance;
+std::shared_ptr<QgsHanaConnectionPool> QgsHanaConnectionPool::sInstance;
 
 QgsHanaConnection *QgsHanaConnectionPool::getConnection( const QString &connInfo )
 {
-  QSharedPointer<QgsConnectionPool> instance;
+  std::shared_ptr<QgsConnectionPool> instance;
   {
     QMutexLocker lock( &sMutex );
     if ( !sInstance )
-      sInstance = QSharedPointer<QgsHanaConnectionPool>( new QgsHanaConnectionPool() );
+      sInstance = std::shared_ptr<QgsHanaConnectionPool>( new QgsHanaConnectionPool() );
     instance = sInstance;
   }
   return instance->acquireConnection( connInfo );
@@ -53,7 +53,7 @@ void QgsHanaConnectionPool::cleanupInstance()
 {
   QMutexLocker lock( &sMutex );
   if ( sInstance )
-    sInstance.clear();
+    sInstance.reset();
 }
 
 QgsHanaConnectionPool::QgsHanaConnectionPool()

diff --git a/src/providers/hana/qgshanaconnectionpool.h b/src/providers/hana/qgshanaconnectionpool.h
@@ -20,8 +20,8 @@
 #include "qgshanaconnection.h"
 #include "qgsconnectionpool.h"
 
+#include <memory>
 #include <QMutex>
-#include <QSharedPointer>
 
 inline QString qgsConnectionPool_ConnectionToName( QgsHanaConnection *c )
 {
@@ -85,7 +85,7 @@ class QgsHanaConnectionPool
 
   private:
     static QBasicMutex sMutex;
-    static QSharedPointer<QgsHanaConnectionPool> sInstance;
+    static std::shared_ptr<QgsHanaConnectionPool> sInstance;
 };
 
 class QgsHanaConnectionRef