This should fix a bug resulting in a crash, when a IrcUser object was not destroyed...

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 7880e0c..f562dd4 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "global.h"
 #include "settings.h"
 #include <QString>
 #include <QTranslator>
@@ -32,7 +33,6 @@
 #include <QApplication>
 #include "client.h"
 #include "qtui.h"
-#include "style.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
@@ -40,7 +40,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!"
@@ -87,7 +86,6 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel IRC Development Team");
 
-  Global::quasselDir = QDir::homePath() + "/.quassel";
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -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