/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-2018 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 "core.h"
#include "qtui.h"
-MonolithicApplication::MonolithicApplication(int &argc, char **argv) : QtUiApplication(argc, argv) {
- setRunMode(Monolithic);
- _internal = new CoreApplicationInternal();
+class InternalPeer;
+MonolithicApplication::MonolithicApplication(int &argc, char **argv)
+ : QtUiApplication(argc, argv)
+{
+#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() && _internal->init()) {
- return QtUiApplication::init();
- }
- return false;
+
+bool MonolithicApplication::init()
+{
+ if (!QtUiApplication::init())
+ return false;
+
+ connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+ return true;
+}
+
+
+MonolithicApplication::~MonolithicApplication()
+{
+ // Client needs to be destroyed first
+ Client::destroy();
+ _core.reset();
+ Quassel::destroy();
}
-MonolithicApplication::~MonolithicApplication() {
- // Client needs to be destroyed first
- Client::destroy();
- delete _internal;
+void MonolithicApplication::startInternalCore()
+{
+ if (!_core) {
+ _core.reset(new Core{}); // FIXME C++14: std::make_unique
+ Core::instance()->init();
+ }
+ connect(Client::coreConnection(), SIGNAL(connectToInternalCore(InternalPeer*)), Core::instance(), SLOT(setupInternalClientSession(InternalPeer*)));
+ connect(Core::instance(), SIGNAL(sessionState(Protocol::SessionState)), Client::coreConnection(), SLOT(internalSessionStateReceived(Protocol::SessionState)));
}