From 62489ed642aab24477638831649941f2f1497abb Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 26 Dec 2018 22:32:21 +0100 Subject: [PATCH] Move global level strings into scope of main --- src/main.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 922bcc6..fdb600c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,21 +10,6 @@ #include #include "logging.h" -const char* logConfigFileName = "logging.conf"; - -const char* logConfigDefault = -"* GLOBAL:\n" -" FORMAT = \"[%level] %datetime{%Y-%M-%d %H:%m:%s}: %msg\"\n" -" FILENAME = \"AdvancedSettings.log\"\n" -" ENABLED = true\n" -" TO_FILE = true\n" -" TO_STANDARD_OUTPUT = true\n" -" MAX_LOG_FILE_SIZE = 2097152 ## 2MB\n" -"* TRACE:\n" -" ENABLED = false\n" -"* DEBUG:\n" -" ENABLED = false\n"; - INITIALIZE_EASYLOGGINGPP void myQtMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -141,6 +126,21 @@ enum ReturnErrorCode { int main(int argc, char *argv[]) { + const char* logConfigFileName = "logging.conf"; + + const char* logConfigDefault = + "* GLOBAL:\n" + " FORMAT = \"[%level] %datetime{%Y-%M-%d %H:%m:%s}: %msg\"\n" + " FILENAME = \"AdvancedSettings.log\"\n" + " ENABLED = true\n" + " TO_FILE = true\n" + " TO_STANDARD_OUTPUT = true\n" + " MAX_LOG_FILE_SIZE = 2097152 ## 2MB\n" + "* TRACE:\n" + " ENABLED = false\n" + "* DEBUG:\n" + " ENABLED = false\n"; + const bool desktop_mode = argument::CheckCommandLineArgument(argc, argv, argument::DESKTOP_MODE); const bool no_sound = argument::CheckCommandLineArgument(argc, argv, argument::NO_SOUND); const bool no_manifest = argument::CheckCommandLineArgument(argc, argv, argument::NO_MANIFEST);