File 0006-Use-std-unique_ptr-to-get-the-DbConfig.-te... of Package akonadi-server

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Use-std-unique_ptr-to-get-the-DbConfig.-temporary-ob.patch of Package akonadi-server (Revision 627e0998e11786b9c333d5b5e60f7975)

Currently displaying revision 627e0998e11786b9c333d5b5e60f7975 , Show latest

From 91895176bcaffb4415cb4381c8db2d2ccd998703 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <antonio.larrosa@gmail.com>
Date: Thu, 30 Jul 2020 11:37:01 +0200
Subject: [PATCH 6/6] Use std::unique_ptr to get the DbConfig... temporary
 object deleted automatically

As suggested by @dvratil
---
 src/server/storage/dbconfig.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/server/storage/dbconfig.cpp b/src/server/storage/dbconfig.cpp
index 59aba66f4..a42e948cb 100644
--- 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;
 }
-- 
2.28.0

Places

File 0006-Use-std-unique_ptr-to-get-the-DbConfig.-temporary-ob.patch of Package akonadi-server (Revision 627e0998e11786b9c333d5b5e60f7975)

Places