X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=9dab54c5e4adba6bd48d364bada5b96a84690f6e;hp=378d8fe8d41f815cf4821d185ed53a0ca75e5b6a;hb=bf01681e9e6108517bfa997422b84e04b801a40a;hpb=dd2b40bf10da0309a72a9b2e8f49af752646fd92 diff --git a/src/common/main.cpp b/src/common/main.cpp index 378d8fe8..9dab54c5 100644 --- 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(); @@ -93,7 +92,7 @@ int main(int argc, char **argv) { quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name())); app.installTranslator(&quasselTranslator); - Network::setDefaultCodecForServer("UTF-8"); + Network::setDefaultCodecForServer("ISO-8859-1"); Network::setDefaultCodecForEncoding("UTF-8"); Network::setDefaultCodecForDecoding("ISO-8859-15"); @@ -103,6 +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::DEBUG = args.contains("--debug"); // This enables various debug features. Global::defaultPort = 4242; int idx;