modernize: Prefer default member init over ctor init

[quassel.git] / src / core / abstractsqlstorage.cpp

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index 89169ee..10c0f50 100644 (file)
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -19,9 +19,6 @@
  ***************************************************************************/
 
 #include "abstractsqlstorage.h"
-#include "quassel.h"
-
-#include "logger.h"
 
 #include <QMutexLocker>
 #include <QSqlDriver>
@@ -29,10 +26,12 @@
 #include <QSqlField>
 #include <QSqlQuery>
 
+#include "logmessage.h"
+#include "quassel.h"
+
 int AbstractSqlStorage::_nextConnectionId = 0;
 AbstractSqlStorage::AbstractSqlStorage(QObject *parent)
-    : Storage(parent),
-    _schemaVersion(0)
+    : Storage(parent)
 {
 }
 
@@ -43,7 +42,7 @@ AbstractSqlStorage::~AbstractSqlStorage()
     QHash<QThread *, Connection *>::iterator conIter;
     for (conIter = _connectionPool.begin(); conIter != _connectionPool.end(); ++conIter) {
         QSqlDatabase::removeDatabase(conIter.value()->name());
-        disconnect(conIter.value(), 0, this, 0);
+        disconnect(conIter.value(), nullptr, this, nullptr);
     }
 }
 
@@ -402,7 +401,6 @@ AbstractSqlStorage::Connection::~Connection()
 //  AbstractSqlMigrator
 // ========================================
 AbstractSqlMigrator::AbstractSqlMigrator()
-    : _query(0)
 {
 }
 
@@ -418,7 +416,7 @@ void AbstractSqlMigrator::newQuery(const QString &query, QSqlDatabase db)
 void AbstractSqlMigrator::resetQuery()
 {
     delete _query;
-    _query = 0;
+    _query = nullptr;
 }
 
 
@@ -489,8 +487,7 @@ void AbstractSqlMigrator::dumpStatus()
 //  AbstractSqlMigrationReader
 // ========================================
 AbstractSqlMigrationReader::AbstractSqlMigrationReader()
-    : AbstractSqlMigrator(),
-    _writer(0)
+    : AbstractSqlMigrator()
 {
 }
 
@@ -574,7 +571,7 @@ void AbstractSqlMigrationReader::abortMigration(const QString &errorMsg)
 
     rollback();
     _writer->rollback();
-    _writer = 0;
+    _writer = nullptr;
 }
 
 
@@ -585,10 +582,10 @@ bool AbstractSqlMigrationReader::finalizeMigration()
 
     commit();
     if (!_writer->commit()) {
-        _writer = 0;
+        _writer = nullptr;
         return false;
     }
-    _writer = 0;
+    _writer = nullptr;
     return true;
 }