X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;fp=src%2Fcore%2Fabstractsqlstorage.cpp;h=e80eb2cee43a0dc8f3a7c1863822506298b2b0c5;hp=f87ac1d6fb2c452394cbe1562225445c77a1233e;hb=8c6448c2e0048389fbac9e2e9daf22b5b050d5b6;hpb=696edd3dc076cf52edd8bece9055c2b3ec9086d0

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index f87ac1d6..e80eb2ce 100644
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -26,7 +26,6 @@
 #include <QSqlField>
 #include <QSqlQuery>
 
-#include "logmessage.h"
 #include "quassel.h"
 
 int AbstractSqlStorage::_nextConnectionId = 0;
@@ -99,12 +98,12 @@ void AbstractSqlStorage::addConnectionToPool()
 void AbstractSqlStorage::dbConnect(QSqlDatabase& db)
 {
     if (!db.open()) {
-        quWarning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread();
-        quWarning() << "-" << db.lastError().text();
+        qWarning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread();
+        qWarning() << "-" << db.lastError().text();
     }
     else {
         if (!initDbSession(db)) {
-            quWarning() << "Unable to initialize database" << displayName() << "for thread" << QThread::currentThread();
+            qWarning() << "Unable to initialize database" << displayName() << "for thread" << QThread::currentThread();
             db.close();
         }
     }
@@ -131,7 +130,7 @@ Storage::State AbstractSqlStorage::init(const QVariantMap& settings, const QProc
     }
 
     if (installedSchemaVersion() < schemaVersion()) {
-        quInfo() << qPrintable(tr("Installed database schema (version %1) is not up to date. Upgrading to "
+        qInfo() << qPrintable(tr("Installed database schema (version %1) is not up to date. Upgrading to "
                                   "version %2...  This may take a while for major upgrades.")
                                    .arg(installedSchemaVersion())
                                    .arg(schemaVersion()));
@@ -144,10 +143,10 @@ Storage::State AbstractSqlStorage::init(const QVariantMap& settings, const QProc
         }
         // Add a message when migration succeeds to avoid confusing folks by implying the schema upgrade failed if
         // later functionality does not work.
-        quInfo() << qPrintable(tr("Installed database schema successfully upgraded to version %1.").arg(schemaVersion()));
+        qInfo() << qPrintable(tr("Installed database schema successfully upgraded to version %1.").arg(schemaVersion()));
     }
 
-    quInfo() << qPrintable(displayName()) << "storage backend is ready. Schema version:" << installedSchemaVersion();
+    qInfo() << qPrintable(displayName()) << "storage backend is ready. Schema version:" << installedSchemaVersion();
     return IsReady;
 }