X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;h=db2cd9b8a431e05bb87f15fbf60625b3ec843661;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hp=7f5d115fd3cdf7e323ea3055a5be6cb15cfdcec2;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index 7f5d115f..db2cd9b8 100644
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -31,8 +31,7 @@
 
 int AbstractSqlStorage::_nextConnectionId = 0;
 AbstractSqlStorage::AbstractSqlStorage(QObject *parent)
-    : Storage(parent),
-    _schemaVersion(0)
+    : Storage(parent)
 {
 }
 
@@ -78,9 +77,9 @@ void AbstractSqlStorage::addConnectionToPool()
 
     Connection *connection = new Connection(QLatin1String(QString("quassel_%1_con_%2").arg(driverName()).arg(connectionId).toLatin1()));
     connection->moveToThread(currentThread);
-    connect(this, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
-    connect(currentThread, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
-    connect(connection, SIGNAL(destroyed()), this, SLOT(connectionDestroyed()));
+    connect(this, &QObject::destroyed, connection, &QObject::deleteLater);
+    connect(currentThread, &QObject::destroyed, connection, &QObject::deleteLater);
+    connect(connection, &QObject::destroyed, this, &AbstractSqlStorage::connectionDestroyed);
     _connectionPool[currentThread] = connection;
 
     QSqlDatabase db = QSqlDatabase::addDatabase(driverName(), connection->name());
@@ -401,11 +400,6 @@ AbstractSqlStorage::Connection::~Connection()
 // ========================================
 //  AbstractSqlMigrator
 // ========================================
-AbstractSqlMigrator::AbstractSqlMigrator()
-    : _query(nullptr)
-{
-}
-
 
 void AbstractSqlMigrator::newQuery(const QString &query, QSqlDatabase db)
 {
@@ -489,8 +483,7 @@ void AbstractSqlMigrator::dumpStatus()
 //  AbstractSqlMigrationReader
 // ========================================
 AbstractSqlMigrationReader::AbstractSqlMigrationReader()
-    : AbstractSqlMigrator(),
-    _writer(nullptr)
+    : AbstractSqlMigrator()
 {
 }