From f6164509e5eae4d68d636f72862e9e7b2f7c4e75 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 4 Dec 2018 10:24:57 +0100 Subject: [PATCH] Use std::unique_ptr --- src/core/auth/qgsauthmanager.cpp | 4 +--- src/core/auth/qgsauthmanager.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp index d359b0c92f1..c9fdac7b4fd 100644 --- a/src/core/auth/qgsauthmanager.cpp +++ b/src/core/auth/qgsauthmanager.cpp @@ -175,7 +175,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas mAuthInit = true; QgsDebugMsg( QStringLiteral( "Initializing QCA..." ) ); - mQcaInitializer = new QCA::Initializer( QCA::Practical, 256 ); + mQcaInitializer = qgis::make_unique( QCA::Practical, 256 ); QgsDebugMsg( QStringLiteral( "QCA initialized." ) ); QCA::scanForPlugins(); @@ -2974,8 +2974,6 @@ QgsAuthManager::~QgsAuthManager() mMutex = nullptr; delete mScheduledDbEraseTimer; mScheduledDbEraseTimer = nullptr; - delete mQcaInitializer; - mQcaInitializer = nullptr; QSqlDatabase::removeDatabase( QStringLiteral( "authentication.configs" ) ); } diff --git a/src/core/auth/qgsauthmanager.h b/src/core/auth/qgsauthmanager.h index 91e1579b2ae..a016a8de132 100644 --- a/src/core/auth/qgsauthmanager.h +++ b/src/core/auth/qgsauthmanager.h @@ -848,7 +848,7 @@ class CORE_EXPORT QgsAuthManager : public QObject bool mAuthInit = false; QString mAuthDbPath; - QCA::Initializer *mQcaInitializer = nullptr; + std::unique_ptr mQcaInitializer; QHash mConfigAuthMethods; QHash mAuthMethods;