/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2016 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 "core.h"
#include "qtui.h"
+class InternalPeer;
+
MonolithicApplication::MonolithicApplication(int &argc, char **argv)
: QtUiApplication(argc, argv),
_internalInitDone(false)
{
_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);
+#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
+ Quassel::disableCrashHandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+
+ Quassel::setRunMode(Quassel::Monolithic);
}
bool MonolithicApplication::init()
{
- if (!Quassel::init()) // parse args
+ if (!QtUiApplication::init())
return false;
connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
- if (isOptionSet("port")) {
+ // If port is given, start core so it can listen to incoming connections
+ if (Quassel::isOptionSet("port")) {
startInternalCore();
}
- return QtUiApplication::init();
+ return 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 &)));
+ connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
+ connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState)));
}