X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=f51f6b2caf04e2bc83f37ab0a3c1be8aff85057d;hp=102c9d44cbf8546ec718015a76f06a221998b50a;hb=6f534b8338f9e6cba5bfe7e8183d3a688075f428;hpb=cf28e7152c5d940aec586be1b29fbf8ddc99f087

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 102c9d44..f51f6b2c 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC 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  *
@@ -18,12 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "global.h"
-#include "identity.h"
-#include "settings.h"
+#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>
@@ -50,7 +55,7 @@
 
 //! Signal handler for graceful shutdown.
 void handle_signal(int sig) {
-  qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii());
+  qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
   QCoreApplication::quit();
 }
 
@@ -59,7 +64,10 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
+  // Logger logger;
+
   Global::registerMetaTypes();
+  Global::setupVersion();
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -72,6 +80,27 @@ int main(int argc, char **argv) {
   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
+#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();
 
@@ -83,20 +112,14 @@ int main(int argc, char **argv) {
   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");
 
-  // Check if a non-standard core port is requested
-  QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
-
-  Global::defaultPort = 4242;
-  int idx;
-  if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) {
-    int port = args[idx+1].toInt();
-    if(port >= 1024 && port < 65536) Global::defaultPort = port;
-  }
-
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -106,11 +129,13 @@ int main(int argc, char **argv) {
 #ifndef BUILD_CORE
   QtUi *gui = new QtUi();
   Client::init(gui);
-  gui->init();
+  // init gui only after the event loop has started
+  QTimer::singleShot(0, gui, SLOT(init()));
+  //gui->init();
 #endif
 
 #ifndef BUILD_QTUI
-  if(args.contains("--norestore")) {
+  if(!Global::parser.isSet("norestore")) {
     Core::restoreState();
   }
 #endif