X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=67bee8e1ca20bb20b4c60f64b6569c5db90cfd2a;hp=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hb=4a5065255e652dd0c301bac0db41b7afb777ef49;hpb=0f87a72d470196f5781053927d9b91e52cc363f2 diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 5ed2611d..67bee8e1 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "monoapplication.h" @@ -24,43 +24,52 @@ #include "core.h" #include "qtui.h" +class InternalConnection; + 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(); - } + // FIXME what's this for? + 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(InternalConnection*)), core, SLOT(setupInternalClientSession(InternalConnection*))); + connect(core, SIGNAL(sessionState(QVariant)), connection, SLOT(internalSessionStateReceived(QVariant))); }