diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt index 41a0d20c9..8eca78e84 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt @@ -21,7 +21,6 @@ else() set(Qt6_Widgets "") endif() - SET(nglapplication_SRCS nglapplication.cpp nglapplication.h diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.cpp index 76bbaa872..5fbb4d19d 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.cpp @@ -1,21 +1,16 @@ - - #include "nglapplication.h" #include "ngl_signal_handler.inc" - NGLApplication::NGLApplication(int &argc, char **argv) : QApplication(argc, argv) -{ - +{ signal(SIGTERM, &signalHandler); #ifdef Q_OS_WIN installNativeEventFilter(new MyEventFilter); #endif } - bool NGLApplication::notify(QObject *o, QEvent *e) { bool bRet = false; diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.cpp index 8b3978617..411d1b882 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.cpp @@ -1,15 +1,9 @@ - - - #include "nglcoreapplication.h" - #include "ngl_signal_handler.inc" - NGLCoreApplication::NGLCoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv) -{ - +{ signal(SIGTERM, &signalHandler); #ifdef Q_OS_WIN installNativeEventFilter(new MyEventFilter); diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.h index 0654ec5d3..181f11c3b 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.h +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglcoreapplication.h @@ -1,5 +1,3 @@ - - #pragma once #include diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.cpp index 26c4b623b..f0cb20a42 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.cpp @@ -1,15 +1,9 @@ - - - #include "nglguiapplication.h" - #include "ngl_signal_handler.inc" - NGLGuiApplication::NGLGuiApplication(int &argc, char **argv) : QGuiApplication(argc, argv) -{ - +{ signal(SIGTERM, &signalHandler); #ifdef Q_OS_WIN installNativeEventFilter(new MyEventFilter); diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.h index d08c4bb7c..92a5e63b8 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.h +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglguiapplication.h @@ -1,5 +1,3 @@ - - #pragma once #include diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.cpp index 13cbb7298..e02a8e337 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.cpp @@ -1,9 +1,5 @@ - - - #include "nglloggerhandler.h" #include "ngl_qt_msg_handler.inc" - #include #include #include @@ -22,13 +18,11 @@ static QByteArray username() static void setEnvVars() { - const QString logPath = NGL::Settings::logPath(); qputenv("LOG4QT_LOGDIR", logPath.toLocal8Bit()); qputenv("LOG4QT_USER", username()); } - void LoggerHandler::createLogger(const QByteArray &baseName, const char *configFileName, bool quiet) { setEnvVars(); @@ -41,12 +35,10 @@ void LoggerHandler::createLogger(const QByteArray &baseName, const char *configF const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix; NGL::NGLLoggerBootstrap::createNGLRootLogger(QString::fromLatin1(configFileName), false, logOutputName, quiet); - - + qInstallMessageHandler(&qtMsgHandler); } - void LoggerHandler::createLogger(const QByteArray &baseName, int exerciseId, int additionalId, bool quiet) { setEnvVars(); @@ -64,25 +56,20 @@ void LoggerHandler::createLogger(const QByteArray &baseName, int exerciseId, int m_baseLoggerName = baseName + QByteArray(".main"); const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix; - NGL::NGLLoggerBootstrap::createNGLRootLogger(configFileName, false, logOutputName, quiet); - - + NGL::NGLLoggerBootstrap::createNGLRootLogger(configFileName, false, logOutputName, quiet); qInstallMessageHandler(&qtMsgHandler); } - NGL::INGLLogger &LoggerHandler::baseLogger() const { return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(m_baseLoggerName.data()); } - NGL::INGLLogger &LoggerHandler::logger(const char *loggerName) const { return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName); } - LoggerHandler *LoggerHandler::getLoggerHandler() { return dynamic_cast(QCoreApplication::instance()); diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsingleapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsingleapplication.h index eb9776981..1f83cd5ed 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsingleapplication.h +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsingleapplication.h @@ -1,5 +1,4 @@ - #pragma once #include diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.cpp index 424e3d020..9530bd3d3 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.cpp @@ -1,15 +1,9 @@ - - - #include "nglsinglecoreapplication.h" - #include "ngl_signal_handler.inc" - NGLSingleCoreApplication::NGLSingleCoreApplication(int &argc, char **argv) : QtSingleCoreApplication(argc, argv) -{ - +{ signal(SIGTERM, &signalHandler); #ifdef Q_OS_WIN installNativeEventFilter(new MyEventFilter); diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.h index 9ebea3d7d..491237374 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.h +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglsinglecoreapplication.h @@ -1,5 +1,3 @@ - - #pragma once #include