X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=fc5c0f7fe46f27c446f6a61a6424d94090a8a7e6;hb=42ce41212deabaf284cc496760cb901b9e3b4dc4;hp=7880e0caf70d5b700b53a8cbfb93048763e70ca6;hpb=7ee03b94132fcd5706e98db72de76c13cb977666;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 7880e0ca..fc5c0f7f 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -32,7 +32,6 @@ #include #include "client.h" #include "qtui.h" -#include "style.h" #elif defined BUILD_MONO #include @@ -40,7 +39,6 @@ #include "core.h" #include "coresession.h" #include "qtui.h" -#include "style.h" #else #error "Something is wrong - you need to #define a build mode!" @@ -95,7 +93,6 @@ int main(int argc, char **argv) { //Settings::init(); #ifndef BUILD_CORE - Style::init(); QtUi *gui = new QtUi(); Client::init(gui); gui->init(); @@ -116,29 +113,3 @@ int main(int argc, char **argv) { return exitCode; } - -#ifdef BUILD_QTUI -QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); } -void Client::disconnectFromLocalCore() {} - -#elif defined BUILD_MONO -QVariant Client::connectToLocalCore(QString user, QString passwd) { - // TODO catch exceptions - /* - QVariant reply = Core::connectLocalClient(user, passwd); - QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant))); - QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant))); - return reply; - */ - return QVariant(); -} - -void Client::disconnectFromLocalCore() { - /* - disconnect(Core::localSession(), 0, ClientProxy::instance(), 0); - disconnect(ClientProxy::instance(), 0, Core::localSession(), 0); - Core::disconnectLocalClient(); - */ -} - -#endif