clazy: Convert many old-style connects into function pointer based

[quassel.git] / src / qtui / qtuiapplication.cpp

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 3f03f09..cb4f91c 100644 (file)
--- 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,8 +34,6 @@
 QtUiApplication::QtUiApplication(int &argc, char **argv)
     : QApplication(argc, argv)
 {
-    Quassel::setDataDirPaths(Quassel::findDataDirPaths());
-
     connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
     connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);
 
@@ -53,11 +50,11 @@ void QtUiApplication::init()
         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);
 }