diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/CMakeLists.txt index 3bf6cd9b0..2440f9340 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/TetraIF/CMakeLists.txt @@ -4,8 +4,6 @@ # $Author$ # -IF(BUILD_RTI) ADD_SUBDIRECTORY(CoPrtCnv) ADD_SUBDIRECTORY(LogView) ADD_SUBDIRECTORY(PrtCnv) -ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt index e2ce6a765..60762794e 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(Qt6 COMPONENTS Core QUIET) if (Qt6_FOUND) set(_QT_CORE_TARGET Qt6::Core) else() - find_package(Qt6 COMPONENTS Core QUIET) set(_QT_CORE_TARGET Qt6::Core) endif() NGL_TARGET_LINK_LIBRARIES(CoPrtCnv diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEditModel.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEditModel.hpp index 153585623..ce650385c 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEditModel.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEditModel.hpp @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include "LogViewTelegram.hpp" diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp index 52f4d3fd5..b5025e0d4 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp @@ -53,7 +53,7 @@ static std::string threadIdToString(PrtCnvApplication::E_ThreadId id) PrtCnvApplication::PrtCnvApplication() : m_Config(nullptr) , m_exerciseId(0) - , m_accessMutex(QMutex::Recursive) + , m_logger(getLogger("PrtCnvApplication")) {} diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.hpp index 40a0ab6c0..9b214bbf6 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.hpp @@ -19,6 +19,7 @@ #include "logger.h" #include #include +#include #include "prtcnvlib_export.h" #include @@ -165,7 +166,7 @@ protected: - mutable QMutex m_accessMutex; + mutable QRecursiveMutex m_accessMutex; QString m_dbDriver; QString m_dbHostName; @@ -173,6 +174,8 @@ protected: QString m_dbSchemaName; QString m_dbUserName; QString m_dbPassword; + + NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp index 170e34e2d..07832bb3a 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp @@ -35,8 +35,9 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0) , m_IsFullLoad(false) , m_FinishedBroadcastIndex(0) , m_FirstBroadcastIndexOfBc1(0) - , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")) + , m_logger(getLogger("PrtCnvBroadcastMgr")) +{ } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.hpp index 414d32b77..6d346aab9 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.hpp @@ -350,6 +350,7 @@ Q_SIGNALS: void areaEffectSimulationDeactivated(int wirkfeldKennung); private: + NGL::INGLLogger &m_logger; NGL::INGLLogger &m_loggerBcRequest; }; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp index 70e602c0d..15ec28de2 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index 7fd50af5d..c94431042 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -962,6 +962,9 @@ GROUP6_TARGETS=( LicenceEditor localDomainFinder LogViewer + CoPrtCnv + PrtCnvLib + PrtCnv ) # Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets) diff --git a/qt6-after/qt6-migrated-legatus/rti_license.dat b/qt6-after/qt6-migrated-legatus/rti_license.dat index e69de29bb..1caa9168c 100644 --- a/qt6-after/qt6-migrated-legatus/rti_license.dat +++ b/qt6-after/qt6-migrated-legatus/rti_license.dat @@ -0,0 +1,10 @@ +#----------------------------------------------------------------- +# Issued to: Test on Wed Sep 23 17:48:43 2026 +# Contact: Moi Meme Phone: ... +# email: berrux@outlook.de +# Do NOT edit this file. +SERVER ffffffff 1700 +FEATURE RTIPRO RTI 4. 20-nov-2026 0 F8031B976E72D17E8B03 "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTISECURITY RTI 5. 20-nov-2026 0 B6F179F2381FC5CAE4DF "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTIRWT RTI 6. 20-nov-2026 0 EE2FBD16BE636F7CAD9E "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTICDS RTI 6. 20-nov-2026 0 15B75FC1054D5E39A55D "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"