X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fabstractsqlstorage.h;h=efd1ce396a75a1b95606537bc6acb73b9e11569a;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hp=9c371ff012e9d7ca1f23479fcc13148459d746f9;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 9c371ff0..efd1ce39 100644
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -37,21 +37,21 @@ class AbstractSqlStorage : public Storage
 
 public:
     AbstractSqlStorage(QObject *parent = nullptr);
-    virtual ~AbstractSqlStorage();
+    ~AbstractSqlStorage() override;
 
     virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
     virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
 
 public slots:
-    virtual State init(const QVariantMap &settings = QVariantMap(),
+    State init(const QVariantMap &settings = QVariantMap(),
                        const QProcessEnvironment &environment = {},
-                       bool loadFromEnvironment = false);
-    virtual bool setup(const QVariantMap &settings = QVariantMap(),
+                       bool loadFromEnvironment = false) override;
+    bool setup(const QVariantMap &settings = QVariantMap(),
                        const QProcessEnvironment &environment = {},
-                       bool loadFromEnvironment = false);
+                       bool loadFromEnvironment = false) override;
 
 protected:
-    inline virtual void sync() {};
+    inline void sync() override {};
 
     QSqlDatabase logDb();
 
@@ -112,7 +112,7 @@ private:
     void addConnectionToPool();
     void dbConnect(QSqlDatabase &db);
 
-    int _schemaVersion;
+    int _schemaVersion{0};
     bool _debug;
 
     static int _nextConnectionId;
@@ -142,7 +142,7 @@ class AbstractSqlStorage::Connection : public QObject
 
 public:
     Connection(const QString &name, QObject *parent = nullptr);
-    ~Connection();
+    ~Connection() override;
 
     inline QLatin1String name() const { return QLatin1String(_name); }
 
@@ -167,11 +167,10 @@ public:
     };
 
     struct SenderMO {
-        qint64 senderId;
+        qint64 senderId{0};
         QString sender;
         QString realname;
         QString avatarurl;
-        SenderMO() : senderId(0) {}
     };
 
     struct IdentityMO {
@@ -307,8 +306,7 @@ public:
         CoreState
     };
 
-    AbstractSqlMigrator();
-    virtual ~AbstractSqlMigrator() {}
+    virtual ~AbstractSqlMigrator() = default;
 
     static QString migrationObject(MigrationObject moType);
 
@@ -332,7 +330,7 @@ protected:
     virtual bool commit() = 0;
 
 private:
-    QSqlQuery *_query;
+    QSqlQuery *_query{nullptr};
 };
 
 
@@ -360,7 +358,7 @@ private:
 
     template<typename T> bool transferMo(MigrationObject moType, T &mo);
 
-    AbstractSqlMigrationWriter *_writer;
+    AbstractSqlMigrationWriter *_writer{nullptr};
 };