X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=57e6a907fe57689624601c04d201efb739b6f04f;hp=51de3c46a566465bb7c4946003a13ad1a6c48f3b;hb=1eb21546673535f5707aa6346e8c749b928cd772;hpb=9a39bcb0e71d45140dc7f2390536cf4f7e13e9fe

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 51de3c46..57e6a907 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,102 +18,35 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
-#include "global.h"
-#include "settings.h"
-#include "quasselui.h"
-
-#if defined BUILD_CORE
-#include <QCoreApplication>
-#include "core.h"
-
-#elif defined BUILD_QTGUI
-#include <QApplication>
-#include "style.h"
-#include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include <cstdlib>
 
+#ifdef BUILD_CORE
+#  include "../core/coreapplication.h"
+#elif defined BUILD_QTUI
+#  include "qtuiapplication.h"
 #elif defined BUILD_MONO
-#include <QApplication>
-#include "core.h"
-#include "coreproxy.h"
-#include "style.h"
-#include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#  include "monoapplication.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
-int main(int argc, char **argv) {
-#if defined BUILD_CORE
-  Global::runMode = Global::CoreOnly;
-  QCoreApplication app(argc, argv);
-#elif defined BUILD_QTGUI
-  Global::runMode = Global::ClientOnly;
-  QApplication app(argc, argv);
-#else
-  Global::runMode = Global::Monolithic;
-  QApplication app(argc, argv);
-#endif
-  //AbstractUi *foo = new AbstractUi();
-  //foo->init();
-  QCoreApplication::setOrganizationDomain("quassel-irc.org");
-  QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
-
-  Global::quasselDir = QDir::homePath() + "/.quassel";
-#ifndef BUILD_QTGUI
-  Core::instance();  // create and init the core
-#endif
-
-  Settings::init();
-
-#ifndef BUILD_CORE
-  Style::init();
-  QtGui *gui = new QtGui();
-  Client::init(gui);
-  gui->init();
-//#else
-//  Core::instance(); // create and init the core object
-#endif
+#include "quassel.h"
 
-  int exitCode = app.exec();
-
-#ifndef BUILD_CORE
-  // the mainWin has to be deleted before the Core
-  // if not Quassel will crash on exit under certain conditions since the gui
-  // still wants to access clientdata
-  delete gui;
-  Client::destroy();
-#endif
-#ifndef BUILD_QTGUI
-  Core::destroy();
-#endif
-
-  return exitCode;
-}
+int main(int argc, char **argv) {
 
-#ifdef BUILD_QTGUI
-QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); }
-void Client::disconnectFromLocalCore() {}
-#elif defined BUILD_MONO
+#  ifdef BUILD_CORE
+    CoreApplication app(argc, argv);
+#  elif BUILD_QTUI
+    QtUiApplication app(argc, argv);
+#  elif BUILD_MONO
+    MonolithicApplication app(argc, argv);
+#  endif
 
-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;
-}
+# include "version.gen"
+  buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__));
+  app.setupBuildInfo(buildinfo);
 
-void Client::disconnectFromLocalCore() {
-  disconnect(Core::localSession(), 0, ClientProxy::instance(), 0);
-  disconnect(ClientProxy::instance(), 0, Core::localSession(), 0);
-  Core::disconnectLocalClient();
+  if(!app.init()) return EXIT_FAILURE;
+  return app.exec();
 }
-
-#endif