X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=60df4c5b94c3a367dd8a4808acee58f8f799b716;hp=e63c4d221d1e795b7341aea7f79f154f3ae1d712;hb=1d9dfeff6b2531ff99e0d12669b3a1dae393e768;hpb=17331c42de77ff91ce297354f9ba9eed6ecb4256 diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index e63c4d22..60df4c5b 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -21,7 +21,6 @@ #include "monoapplication.h" #include "coreapplication.h" #include "client.h" -#include "clientsyncer.h" #include "core.h" #include "qtui.h" @@ -30,6 +29,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **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); } @@ -42,7 +44,6 @@ bool MonolithicApplication::init() { _internalInitDone = true; } - connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *))); return QtUiApplication::init(); } @@ -52,16 +53,12 @@ MonolithicApplication::~MonolithicApplication() { delete _internal; } -void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) { - connect(syncer, SIGNAL(startInternalCore(ClientSyncer *)), this, SLOT(startInternalCore(ClientSyncer *))); -} - -void MonolithicApplication::startInternalCore(ClientSyncer *syncer) { +void MonolithicApplication::startInternalCore() { if(!_internalInitDone) { _internal->init(); _internalInitDone = true; } Core *core = Core::instance(); - connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); - connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &))); + //connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); + //connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &))); }