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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index bac43084..57e6a907 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -18,146 +18,35 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QDateTime>
-#include <QString>
-#include <QTimer>
-#include <QTranslator>
-
-#include "global.h"
-#include "logger.h"
-#include "network.h"
-#include "settings.h"
-#include "cliparser.h"
-
-#if defined BUILD_CORE
-#include <QCoreApplication>
-#include <QDir>
-#include "core.h"
-#include "message.h"
+#include <cstdlib>
 
+#ifdef BUILD_CORE
+#  include "../core/coreapplication.h"
 #elif defined BUILD_QTUI
-#include <QApplication>
-#include "client.h"
-#include "qtui.h"
-
+#  include "qtuiapplication.h"
 #elif defined BUILD_MONO
-#include <QApplication>
-#include "client.h"
-#include "core.h"
-#include "coresession.h"
-#include "qtui.h"
+#  include "monoapplication.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
-#include <signal.h>
-
-//! Signal handler for graceful shutdown.
-void handle_signal(int sig) {
-  qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
-  QCoreApplication::quit();
-}
+#include "quassel.h"
 
 int main(int argc, char **argv) {
-  // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
-  signal(SIGTERM, handle_signal);
-  signal(SIGINT, handle_signal);
-
-  // Logger logger;
-
-  Global::registerMetaTypes();
-  Global::setupVersion();
-
-#if defined BUILD_CORE
-  Global::runMode = Global::CoreOnly;
-  QCoreApplication app(argc, argv);
-#elif defined BUILD_QTUI
-  Global::runMode = Global::ClientOnly;
-  QApplication app(argc, argv);
-#else
-  Global::runMode = Global::Monolithic;
-  QApplication app(argc, argv);
-#endif
-
-  Global::parser = CliParser(QCoreApplication::arguments());
-
-#ifndef BUILD_QTUI
-// put core-only arguments here
-  Global::parser.addOption("port",'p',"The port quasselcore will listen at",QString("4242"));
-  Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state");
-#endif // BUILD_QTUI
-#ifndef BUILD_CORE
-// put client-only arguments here
-  Global::parser.addSwitch("debugbufferswitches",0,"Enables debugging for bufferswitches");
-  Global::parser.addSwitch("debugmodel",0,"Enables debugging for models");
-#endif // BUILD_QTCORE
-// put shared client&core arguments here
-  Global::parser.addSwitch("debug",'d',"Enable debug output");
-  Global::parser.addSwitch("help",'h', "Display this help and exit");
-
-  if(!Global::parser.parse() || Global::parser.isSet("help")) {
-    Global::parser.usage();
-    return 1;
-  }
-
-  qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
-
-  // Set up i18n support
-  QLocale locale = QLocale::system();
 
-  QTranslator qtTranslator;
-  qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name()));
-  app.installTranslator(&qtTranslator);
+#  ifdef BUILD_CORE
+    CoreApplication app(argc, argv);
+#  elif BUILD_QTUI
+    QtUiApplication app(argc, argv);
+#  elif BUILD_MONO
+    MonolithicApplication app(argc, argv);
+#  endif
 
-  QTranslator quasselTranslator;
-  quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
-  app.installTranslator(&quasselTranslator);
-
-  Network::setDefaultCodecForServer("ISO-8859-1");
-  Network::setDefaultCodecForEncoding("UTF-8");
-  Network::setDefaultCodecForDecoding("ISO-8859-15");
-
-  QCoreApplication::setOrganizationDomain("quassel-irc.org");
-  QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel Project");
-
-#ifndef BUILD_QTUI
-  Core::instance();  // create and init the core
-#endif
-
-  //Settings::init();
-
-#ifndef BUILD_CORE
-  QtUi *gui = new QtUi();
-  Client::init(gui);
-  // init gui only after the event loop has started
-  QTimer::singleShot(0, gui, SLOT(init()));
-  //gui->init();
-#endif
-
-#ifndef BUILD_QTUI
-  if(!Global::parser.isSet("norestore")) {
-    Core::restoreState();
-  }
-#endif
-
-  int exitCode = app.exec();
-
-#ifndef BUILD_QTUI
-  Core::saveState();
-#endif
-
-#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_QTUI
-  Core::destroy();
-#endif
+# include "version.gen"
+  buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__));
+  app.setupBuildInfo(buildinfo);
 
-  return exitCode;
+  if(!app.init()) return EXIT_FAILURE;
+  return app.exec();
 }