#include <QStringList>
#include "chatviewsettings.h"
-#include "cliparser.h"
#include "logmessage.h"
#include "mainwin.h"
#include "qtui.h"
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);
-
#if QT_VERSION >= 0x050600
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
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()));
-}
-
-
-void QtUiApplication::initUi()
-{
- QtUi::instance()->init();
+ QTimer::singleShot(0, this, [this]() {
+ QtUi::instance()->init();
+ connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
+ connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);
- // Needs to happen after UI init, so the MainWin quit handler is registered first
- Quassel::registerQuitHandler(quitHandler());
+ // Needs to happen after UI init, so the MainWin quit handler is registered first
+ Quassel::registerQuitHandler(quitHandler());
- resumeSessionIfPossible();
+ resumeSessionIfPossible();
+ });
}
// Wait until the Client instance is destroyed before quitting the event loop
return [this]() {
quInfo() << "Client shutting down...";
- connect(_client.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit()));
+ connect(_client.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
_client.release()->deleteLater();
};
}