sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8599 from m-kuhn/auth-manager-unique-ptr

Browse Source 
Use std::unique_ptr
This commit is contained in:
Matthias Kuhn 2018-12-04 12:09:03 +01:00 committed by GitHub
commit 774c890f9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/auth/qgsauthmanager.cpp
View File

@ -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::Initializer>( 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" ) );
}

2
src/core/auth/qgsauthmanager.h
View File

@ -848,7 +848,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
bool mAuthInit = false;
QString mAuthDbPath;
QCA::Initializer *mQcaInitializer = nullptr;
std::unique_ptr<QCA::Initializer> mQcaInitializer;
QHash<QString, QString> mConfigAuthMethods;
QHash<QString, QgsAuthMethod *> mAuthMethods;