X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=dca70339e5f6a3687a5fabb1d7a60aa771d13bde;hb=c9ee7972b2c9b84e37f363befa05bf5fb04114af;hp=5fb3029afc71aa725168801fbd12a4228a68c148;hpb=2bcb925e42921b124efd19d1978ff19f44a09113;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 5fb3029a..dca70339 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; @@ -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::DEBUG = args.contains("--debug"); // This enables (maybe) various debug features. + Global::DEBUG = args.contains("--debug"); // This enables various debug features. Global::defaultPort = 4242; int idx;