/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-2013 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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"
#include "coreapplication.h"
#include "client.h"
-#include "clientsyncer.h"
#include "core.h"
#include "qtui.h"
+class InternalPeer;
+
MonolithicApplication::MonolithicApplication(int &argc, char **argv)
- : QtUiApplication(argc, argv)
+ : QtUiApplication(argc, argv),
+ _internalInitDone(false)
{
- _internal = new CoreApplicationInternal(); // needed for parser options
- setRunMode(Monolithic);
+ _internal = new CoreApplicationInternal(); // needed for parser options
+#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+ disableCrashhandler();
+#endif /* HAVE_KDE || Q_OS_MAC */
+ setRunMode(Quassel::Monolithic);
}
-bool MonolithicApplication::init() {
- connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
- if(QtUiApplication::init()) {
- return true;
- }
- return false;
-}
-MonolithicApplication::~MonolithicApplication() {
- // Client needs to be destroyed first
- Client::destroy();
- delete _internal;
+bool MonolithicApplication::init()
+{
+ if (!Quassel::init()) // parse args
+ return false;
+
+ connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+ // FIXME what's this for?
+ if (isOptionSet("port")) {
+ startInternalCore();
+ }
+
+ return QtUiApplication::init();
}
-void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
- connect(syncer, SIGNAL(startInternalCore()), this, SLOT(startInternalCore()));
+
+MonolithicApplication::~MonolithicApplication()
+{
+ // Client needs to be destroyed first
+ Client::destroy();
+ delete _internal;
}
-void MonolithicApplication::startInternalCore() {
- _internal->init();
- Core *core = Core::instance();
- ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());
- connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
- connect(core, SIGNAL(sessionState(const QVariant &)), syncer, 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(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
+ connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState)));
}