X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fsqlitestorage.cpp;h=ad5b7f2ba8bd0a2704bb5b19daaa24e151ac55cf;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hp=2eae156865caa28021b72f287bb589c91a2b4927;hpb=767e5f04ab1aff5ea98e9d3bf67d8f22043bf90c;p=quassel.git

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 2eae1568..ad5b7f2b 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -34,11 +34,6 @@ SqliteStorage::SqliteStorage(QObject *parent)
 }
 
 
-SqliteStorage::~SqliteStorage()
-{
-}
-
-
 bool SqliteStorage::isAvailable() const
 {
     if (!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
@@ -692,7 +687,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info)
     }
     if (error) {
         unlock();
-        return NetworkId();
+        return {};
     }
 
     {
@@ -714,7 +709,7 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info)
     }
     unlock();
     if (error)
-        return NetworkId();
+        return {};
     else
         return networkId;
 }
@@ -1612,7 +1607,7 @@ Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMs
     QSqlDatabase db = logDb();
     db.transaction();
 
-    Message::Types result = Message::Types(0);
+    Message::Types result = Message::Types(nullptr);
     {
         QSqlQuery query(db);
         query.prepare(queryString("select_buffer_bufferactivity"));
@@ -2193,7 +2188,7 @@ bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount)
 
     switch (query.lastError().number()) {
     case 5: // SQLITE_BUSY         5   /* The database file is locked */
-        [[clang::fallthrough]];
+        // fallthrough
     case 6: // SQLITE_LOCKED       6   /* A table in the database is locked */
         if (retryCount < _maxRetryCount)
             return safeExec(query, retryCount + 1);
@@ -2209,8 +2204,7 @@ bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount)
 //  SqliteMigration
 // ========================================
 SqliteMigrationReader::SqliteMigrationReader()
-    : SqliteStorage(),
-    _maxId(0)
+    : SqliteStorage()
 {
 }