suppress warning

qgis · Jul 10, 2024 · 017ccbd · 017ccbd
1 parent a30666d
commit 017ccbd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/python/core/auto_generated/auth/qgsauthconfigurationstoragedb.sip.in b/python/core/auto_generated/auth/qgsauthconfigurationstoragedb.sip.in
@@ -59,6 +59,9 @@ The URI should be in the format: \verbatim<DRIVER>://<USER>:<PASSWORD>@<HOST>:<P
 %End
 
 
+    ~QgsAuthConfigurationStorageDb();
+
+
     QSqlDatabase authDatabaseConnection() const;
 %Docstring
 Returns the database connection used by this storage.

diff --git a/src/core/auth/qgsauthconfigurationstoragedb.cpp b/src/core/auth/qgsauthconfigurationstoragedb.cpp
@@ -47,6 +47,18 @@ QgsAuthConfigurationStorageDb::QgsAuthConfigurationStorageDb( const QString &uri
 {
 }
 
+QgsAuthConfigurationStorageDb::~QgsAuthConfigurationStorageDb()
+{
+  QMutexLocker locker( &mMutex );
+
+  QMapIterator<QThread *, QMetaObject::Connection> iterator( mConnectedThreads );
+  while ( iterator.hasNext() )
+  {
+    iterator.next();
+    QThread::disconnect( iterator.value() );
+  }
+}
+
 QSqlDatabase QgsAuthConfigurationStorageDb::authDatabaseConnection() const
 {
   QSqlDatabase authdb;
@@ -100,7 +112,7 @@ QSqlDatabase QgsAuthConfigurationStorageDb::authDatabaseConnection() const
       {
         QMutexLocker locker( &mMutex );
         QSqlDatabase::removeDatabase( connectionName );
-        mConnectedThreads.remove( QThread::currentThread() );
+        mConnectedThreads.remove( QThread::currentThread() ); // NOLINT(clang-analyzer-core.CallAndMessage)
       }, Qt::DirectConnection );
 
       mConnectedThreads.insert( QThread::currentThread(), connection );

diff --git a/src/core/auth/qgsauthconfigurationstoragedb.h b/src/core/auth/qgsauthconfigurationstoragedb.h
@@ -66,6 +66,9 @@ class CORE_EXPORT QgsAuthConfigurationStorageDb : public QgsAuthConfigurationSto
     QgsAuthConfigurationStorageDb( const QString &uri );
 
 
+    ~QgsAuthConfigurationStorageDb() override;
+
+
     /**
      * Returns the database connection used by this storage.
      */
-Original file line number
+Diff line change
@@ Expand Up @@
         QgsAuthConfigurationStorageDb( const QString &uri );
+        ~QgsAuthConfigurationStorageDb() override;
         /**
          * Returns the database connection used by this storage.
          */
@@ Expand Down @@