client no longer depends on core... *sigh*
#include "quassel.h"
#include "signalproxy.h"
#include "quassel.h"
#include "signalproxy.h"
-//#ifdef BUILD_MONO
-#include "core.h"
-//#endif
-
ClientSyncer::ClientSyncer(QObject *parent)
: QObject(parent)
{
ClientSyncer::ClientSyncer(QObject *parent)
: QObject(parent)
{
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-
- //#ifdef BUILD_MONO
- connect(this, SIGNAL(connectToInternalCore(SignalProxy *)), Core::instance(), SLOT(setupInternalClientSession(SignalProxy *)));
- connect(Core::instance(), SIGNAL(sessionState(const QVariant &)), this, SLOT(internalSessionStateReceived(const QVariant &)));
- //#endif
}
ClientSyncer::~ClientSyncer() {
}
ClientSyncer::~ClientSyncer() {
#include "clientsyncer.h"
#include "coreconfigwizard.h"
#include "iconloader.h"
#include "clientsyncer.h"
#include "coreconfigwizard.h"
#include "iconloader.h"
+#include "monoapplication.h"
CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
: QDialog(parent)
CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
: QDialog(parent)
setWindowFlags(Qt::Sheet);
clientSyncer = new ClientSyncer(this);
setWindowFlags(Qt::Sheet);
clientSyncer = new ClientSyncer(this);
wizard = 0;
doingAutoConnect = false;
wizard = 0;
doingAutoConnect = false;
}
void CoreConnectDlg::on_useInternalCore_clicked() {
}
void CoreConnectDlg::on_useInternalCore_clicked() {
+ // FIXME: this needs to be a qobject_cast - therefore MonolithicApplication needs to be a proper QObject... :/
+ MonolithicApplication *monoApp = static_cast<MonolithicApplication *>(QApplication::instance());
+ if(monoApp) {
+ qDebug() << "starting core...";
+ monoApp->startInternalCore();
+ monoApp->connectClientSyncer(clientSyncer);
+ }
clientSyncer->useInternalCore();
startSync();
}
clientSyncer->useInternalCore();
startSync();
}
#include "monoapplication.h"
#include "coreapplication.h"
#include "client.h"
#include "monoapplication.h"
#include "coreapplication.h"
#include "client.h"
+#include "clientsyncer.h"
+#include "core.h"
-MonolithicApplication::MonolithicApplication(int &argc, char **argv) : QtUiApplication(argc, argv) {
+MonolithicApplication::MonolithicApplication(int &argc, char **argv)
+ : QtUiApplication(argc, argv)
+{
+ _internal = new CoreApplicationInternal(); // needed for parser options
- _internal = new CoreApplicationInternal();
-
}
bool MonolithicApplication::init() {
}
bool MonolithicApplication::init() {
- if(Quassel::init() && _internal->init()) {
return QtUiApplication::init();
}
return false;
return QtUiApplication::init();
}
return false;
MonolithicApplication::~MonolithicApplication() {
// Client needs to be destroyed first
Client::destroy();
MonolithicApplication::~MonolithicApplication() {
// Client needs to be destroyed first
Client::destroy();
+
+bool MonolithicApplication::startInternalCore() {
+ return _internal->init();
+}
+
+void MonolithicApplication::connectClientSyncer(ClientSyncer *syncer) {
+ Core *core = Core::instance();
+ connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
+ connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+}
#include "qtuiapplication.h"
#include "qtuiapplication.h"
class CoreApplicationInternal;
class MonolithicApplication : public QtUiApplication {
class CoreApplicationInternal;
class MonolithicApplication : public QtUiApplication {
+public:
+ MonolithicApplication(int &, char **);
+ ~MonolithicApplication();
- public:
- MonolithicApplication(int &, char **);
- ~MonolithicApplication();
+ bool init();
+ bool startInternalCore();
+ void connectClientSyncer(ClientSyncer *syncer);
- bool init();
-
- private:
- CoreApplicationInternal *_internal;
+private:
+ CoreApplicationInternal *_internal;