X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=2592242cef23a62a0f95ec306005eeefc7576e60;hp=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 5ed2611d..2592242c 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -25,42 +25,48 @@ #include "qtui.h" MonolithicApplication::MonolithicApplication(int &argc, char **argv) - : QtUiApplication(argc, argv), + : QtUiApplication(argc, argv), _internalInitDone(false) { - _internal = new CoreApplicationInternal(); // needed for parser options + _internal = new CoreApplicationInternal(); // needed for parser options #if defined(HAVE_KDE) || defined(Q_OS_MAC) - disableCrashhandler(); + disableCrashhandler(); #endif /* HAVE_KDE || Q_OS_MAC */ - setRunMode(Quassel::Monolithic); + setRunMode(Quassel::Monolithic); } -bool MonolithicApplication::init() { - if(!Quassel::init()) // parse args - return false; - connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore())); +bool MonolithicApplication::init() +{ + if (!Quassel::init()) // parse args + return false; + + connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore())); - if(isOptionSet("port")) { - startInternalCore(); - } + if (isOptionSet("port")) { + startInternalCore(); + } - return QtUiApplication::init(); + return QtUiApplication::init(); } -MonolithicApplication::~MonolithicApplication() { - // Client needs to be destroyed first - Client::destroy(); - delete _internal; + +MonolithicApplication::~MonolithicApplication() +{ + // Client needs to be destroyed first + Client::destroy(); + delete _internal; } -void MonolithicApplication::startInternalCore() { - if(!_internalInitDone) { - _internal->init(); - _internalInitDone = true; - } - Core *core = Core::instance(); - CoreConnection *connection = Client::coreConnection(); - connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); - connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &))); + +void MonolithicApplication::startInternalCore() +{ + if (!_internalInitDone) { + _internal->init(); + _internalInitDone = true; + } + Core *core = Core::instance(); + CoreConnection *connection = Client::coreConnection(); + connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); + connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &))); }