X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=cb4f91c81b0e1a8aabd8f2e5e17ffa5fd94c35e8;hp=74be5b499f2deaba3617eb498d47e388cc1694a4;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 74be5b49..cb4f91c8 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -25,7 +25,6 @@
 #include <QStringList>
 
 #include "chatviewsettings.h"
-#include "cliparser.h"
 #include "logmessage.h"
 #include "mainwin.h"
 #include "qtui.h"
@@ -35,9 +34,6 @@
 QtUiApplication::QtUiApplication(int &argc, char **argv)
     : QApplication(argc, argv)
 {
-    Quassel::setDataDirPaths(Quassel::findDataDirPaths());
-    Quassel::setRunMode(Quassel::ClientOnly);
-
     connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
     connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);
 
@@ -49,20 +45,16 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
 
 void QtUiApplication::init()
 {
-    if (!Quassel::init()) {
-        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
-    }
-
     // Settings upgrade/downgrade handling
     if (!migrateSettings()) {
         throw ExitException{EXIT_FAILURE, tr("Could not load or upgrade client settings!")};
     }
 
-    _client.reset(new Client(std::unique_ptr<QtUi>(new QtUi())));  // TODO C++14: std::make_unique
+    _client = std::make_unique<Client>(std::make_unique<QtUi>());
 
     // Init UI only after the event loop has started
     // TODO Qt5: Make this a lambda
-    QTimer::singleShot(0, this, SLOT(initUi()));
+    QTimer::singleShot(0, this, &QtUiApplication::initUi);
 }