X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=ad5b7f2ba8bd0a2704bb5b19daaa24e151ac55cf;hp=e0f8fd809d92292778976fbca6eb3aa9656556e4;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hpb=d1aa795013aaebe5ca57353d6077b0007b489832 diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index e0f8fd80..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")); @@ -2209,8 +2204,7 @@ bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) // SqliteMigration // ======================================== SqliteMigrationReader::SqliteMigrationReader() - : SqliteStorage(), - _maxId(0) + : SqliteStorage() { }