Use std::unique_ptr to get the DbConfig... temporary object deleted automatically

As suggested by @dvratil

Use std::unique_ptr to get the DbConfig... temporary object deleted automatically
As suggested by @dvratil
45404d85 · Antonio Larrosa Jimenez · Antonio Larrosa Jimenez · fa094b56 · 45404d85
Commit 45404d85 authored Jul 30, 2020 by Antonio Larrosa Jimenez Committed by Antonio Larrosa Jimenez Aug 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/server/storage/dbconfig.cpp src/server/storage/dbconfig.cpp +3 -4

No files found.
--- a/src/server/storage/dbconfig.cpp
+++ b/src/server/storage/dbconfig.cpp
@@ -53,11 +53,11 @@ QString DbConfig::defaultAvailableDatabaseBackend(QSettings &settings)
 {
    QString driverName = QStringLiteral(AKONADI_DATABASE_BACKEND);

-    DbConfig *dbConfigFallbackTest = nullptr;
+    std::unique_ptr<DbConfig> dbConfigFallbackTest;
    if (driverName == QLatin1String("QMYSQL")) {
-        dbConfigFallbackTest = new DbConfigMysql;
+        dbConfigFallbackTest.reset(new DbConfigMysql);
    } else if (driverName == QLatin1String("QPSQL")) {
-        dbConfigFallbackTest = new DbConfigPostgresql;
+        dbConfigFallbackTest.reset(new DbConfigPostgresql);
    }

    if (dbConfigFallbackTest && !dbConfigFallbackTest->isAvailable(settings)
@@ -65,7 +65,6 @@ QString DbConfig::defaultAvailableDatabaseBackend(QSettings &settings)
        qCWarning(AKONADISERVER_LOG) << driverName << " requirements not available. Falling back to using QSQLITE3.";
        driverName = QStringLiteral("QSQLITE3");
    }
-    delete dbConfigFallbackTest;

    return driverName;
 }