Merge branch 'seezer'

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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index d958e7a..9dab54c 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -54,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();
 }
 
@@ -66,8 +66,7 @@ int main(int argc, char **argv) {
   // Logger logger;
 
   Global::registerMetaTypes();
-
-#include "../../version.inc"
+  Global::setupVersion();
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -80,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();
@@ -103,7 +102,7 @@ int main(int argc, char **argv) {
 
   // Check if a non-standard core port is requested
   QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
-  Global::SPUTDEV = args.contains("--sputdev"); // This enables various debug features for Sput. Do not touch.
+  Global::DEBUG = args.contains("--debug"); // This enables various debug features.
 
   Global::defaultPort = 4242;
   int idx;