Merge branch 'seezer'

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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 6b39f5f..9dab54c 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -24,6 +24,8 @@
 #include <QTranslator>
 
 #include "global.h"
+#include "logger.h"
+#include "network.h"
 #include "settings.h"
 
 #if defined BUILD_CORE
@@ -52,7 +54,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();
 }
 
@@ -61,9 +63,10 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
-  Global::registerMetaTypes();
+  // Logger logger;
 
-#include "../../version.inc"
+  Global::registerMetaTypes();
+  Global::setupVersion();
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -76,7 +79,7 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
-  qsrand(QDateTime::currentDateTime().toTime_t());
+  qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   // Set up i18n support
   QLocale locale = QLocale::system();
@@ -89,12 +92,17 @@ 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::DEBUG = args.contains("--debug"); // This enables various debug features.
 
   Global::defaultPort = 4242;
   int idx;