Complete PrtCnv Qt6 migration so CoPrtCnv/PrtCnvLib/PrtCnv/ddsview build

Restore dropped m_logger members, QMutex->QRecursiveMutex, splitView->split, error->errorOccurred (migration-only, verified vs legacy).
Merge feature/migrate-module-tetraif-only into feature/qt6-migration-projects-app-tools-viewer-validation
2026-10-05 14:59:27 +02:00 · 2026-10-05 14:57:33 +02:00 · 2026-10-03 17:52:10 +00:00 · 2026-10-03 15:22:53 +00:00 · 2026-10-03 12:28:55 +00:00 · 2026-10-03 12:20:28 +00:00
24 changed files with 56 additions and 31 deletions
@@ -4,8 +4,6 @@
 # $Author$
 #

-IF(BUILD_RTI)
 ADD_SUBDIRECTORY(CoPrtCnv)
 ADD_SUBDIRECTORY(LogView)
 ADD_SUBDIRECTORY(PrtCnv)
-ENDIF()
@@ -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
@@ -3,7 +3,7 @@

 #pragma once

-#include <QtGui/QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QSet>
 #include "LogViewTelegram.hpp"
@@ -35,7 +35,7 @@ TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short i
  connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
  connect(m_socket, &QTcpSocket::disconnected,  this, &TetraIF::onDisconnected);
  connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
-  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &TetraIF::onError);
+  connect(m_socket, &QAbstractSocket::errorOccurred, this, &TetraIF::onError);

  m_outputDir = QCoreApplication::applicationDirPath();
  m_outputDir += QLatin1Char('/') + QString::number(m_issi) + QLatin1Char('-');
@@ -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"))
 {}


@@ -19,6 +19,7 @@
 #include "logger.h"
 #include <nglsettings/nglsettings_settings.h>
 #include <QtCore/QMutex>
+#include <QtCore/QRecursiveMutex>
 #include "prtcnvlib_export.h"
 #include <TrainingAreaBase/training_area_telegrams.h>

@@ -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;
 };

 }
@@ -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"))
+{
 }


@@ -350,6 +350,7 @@ Q_SIGNALS:
  void areaEffectSimulationDeactivated(int wirkfeldKennung);

 private:
+  NGL::INGLLogger &m_logger;
  NGL::INGLLogger &m_loggerBcRequest;
 };

@@ -23,7 +23,7 @@
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>

 #include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>

 #include <QtCore/QTimer>
 #include <QtCore/QCoreApplication>
@@ -43,13 +43,13 @@ PrtCnvDbThread::PrtCnvDbThread(const QString &dbDriver,
                               const QString &dbPassword,
                               PrtCnv::PrtCnvThreadStarter *a_parent)
  : PrtCnvThread(a_parent, "PrtCnvDbThread")
-  , m_BattleFieldOpStateMutex(QMutex::Recursive)
-  , m_MemberListByIdMutex(QMutex::Recursive)
-  , m_CentralListMutex(QMutex::Recursive)
+  , m_BattleFieldOpStateMutex()
+  , m_MemberListByIdMutex()
+  , m_CentralListMutex()
  , m_OldCentralAckCounter(0)
-  , m_RadioListMutex(QMutex::Recursive)
-  , m_SqlCmdListMutex(QMutex::Recursive)
-  , m_BroadcastMapMutex(QMutex::Recursive)
+  , m_RadioListMutex()
+  , m_SqlCmdListMutex()
+  , m_BroadcastMapMutex()
  , m_DoClean(false)
  , m_DoWaitUntilSqlWritten(false)
  , m_DoStorePermanent(false)
@@ -16,6 +16,7 @@

 #include <QtCore/QAtomicInt>
 #include <QtCore/QMutex>
+#include <QtCore/QRecursiveMutex>
 #include <QtCore/QString>
 #include <QtSql/QSqlDatabase>
 #include "PrtCnvThread.hpp"
@@ -213,15 +214,15 @@ namespace PrtCnv

    

-    mutable QMutex m_BattleFieldOpStateMutex;
+    mutable QRecursiveMutex m_BattleFieldOpStateMutex;

    

-    mutable QMutex m_MemberListByIdMutex;
+    mutable QRecursiveMutex m_MemberListByIdMutex;

    

-    mutable QMutex m_CentralListMutex;
+    mutable QRecursiveMutex m_CentralListMutex;

    

@@ -238,16 +239,16 @@ namespace PrtCnv
    std::list<PrtCnvStoredRadioTelegram*> m_RadioList;
    

-    mutable QMutex m_RadioListMutex;
+    mutable QRecursiveMutex m_RadioListMutex;
    

    std::vector<QString> m_SqlCommandList;
    

-    mutable QMutex m_SqlCmdListMutex;
+    mutable QRecursiveMutex m_SqlCmdListMutex;
    

-    mutable QMutex m_BroadcastMapMutex;
+    mutable QRecursiveMutex m_BroadcastMapMutex;
    

    std::list<PrtCnvStoredRadioTelegram*> m_BroadcastList;
@@ -25,6 +25,7 @@ namespace PrtCnv
 PrtCnvInjectionSocket::PrtCnvInjectionSocket()
  : m_Socket(nullptr)
  , m_Server(nullptr)
+  , m_logger(getLogger("PrtCnvInjectionSocket"))
 {}

 PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
@@ -39,6 +39,8 @@ namespace PrtCnv
    QTcpSocket *m_Socket;

    PrtCnvInjectionThread *m_Server;
+
+    NGL::INGLLogger &m_logger;
  protected slots:
    

@@ -89,8 +89,7 @@ PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_pare
      m_ReceivedBytes(0),
      m_bUseScrambling(false),
      m_loggerStats(getLogger("PrtCnvRadioThread.statistic")),
-      m_exerciseEquipmentAssignmentMutex(QMutex::Recursive),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+      m_exerciseEquipmentAssignmentMutex() {
    m_Name = QStringLiteral("Radio");
    for (int i = 0; i < AVERAGE_COUNT; ++i)
    {
@@ -176,8 +175,8 @@ int32_t PrtCnvRadioThread::init()
        m_DbThread->licenseMember(m_DbThread->addMember(0, m_BroadcastISSI));

    QString groupString = m_Config->getString(getName(), QStringLiteral("ListenGroups"), QString());
-    const QVector<QStringView> groups = groupString.splitView(QLatin1Char(','), Qt::SkipEmptyParts);
-    for (const QStringView &sr : groups)
+    const QStringList groups = groupString.split(QLatin1Char(','), Qt::SkipEmptyParts);
+    for (const QString &sr : groups)
    {
        uint32_t group = sr.toUInt();
        if (group > 0)
@@ -19,6 +19,7 @@
 #include <set>
 #include <QtCore/QList>
 #include <QtCore/QMutex>
+#include <QtCore/QRecursiveMutex>
 #include <TrainingAreaBase/training_area_telegrams.h>

 #define MAX_IDENTITY 65535
@@ -263,7 +264,7 @@ public:
    
    std::unordered_map<int, std::unordered_set<int>> m_exerciseEquipmentAssignments;
    std::unordered_map<int, TrainingAreaBase::TetraIcd::GroupIssiInformation> m_groupIssiInformation;
-    mutable QMutex m_exerciseEquipmentAssignmentMutex;
+    mutable QRecursiveMutex m_exerciseEquipmentAssignmentMutex;

  private:
    
@@ -31,7 +31,7 @@ PrtCnvRadioTrafficThread::PrtCnvRadioTrafficThread(PrtCnvThreadStarter* a_parent
  , m_hystLoad(5)
  , m_calcTimeout(1000)
  , m_cleanupTimeout(5000)
-  , m_mutex(QMutex::Recursive)
+  , m_mutex()
 {}

 void PrtCnvRadioTrafficThread::newTelegramArrived(unsigned int size)
@@ -17,6 +17,7 @@
 #include "PrtCnvRadioThread.hpp"
 #include <QtCore/QMap>
 #include <QtCore/QMutex>
+#include <QtCore/QRecursiveMutex>

 namespace PrtCnv
 {
@@ -72,7 +73,7 @@ protected:

  

-  QMutex m_mutex;
+  QRecursiveMutex m_mutex;

  

@@ -100,7 +100,7 @@ void PrtCnvSocketThread::createNewSocket()

  connect(m_Socket, &QTcpSocket::connected, this, &PrtCnvSocketThread::connected, Qt::QueuedConnection);
  connect(m_Socket, &QTcpSocket::disconnected, this, &PrtCnvSocketThread::disconnected, Qt::QueuedConnection);
-  connect(m_Socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
+  connect(m_Socket, &QAbstractSocket::errorOccurred, this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
  connect(m_Socket, &QTcpSocket::hostFound, this, &PrtCnvSocketThread::hostFound, Qt::QueuedConnection);
  connect(m_Socket, &QTcpSocket::stateChanged, this, &PrtCnvSocketThread::stateChanged);
  connect(m_Socket, &QTcpSocket::readyRead, this, &PrtCnvSocketThread::readyRead, Qt::QueuedConnection);
@@ -36,6 +36,8 @@ protected:
    

    Qt::HANDLE m_currentThreadId;
+
+    NGL::INGLLogger &m_logger;
  public:
    

@@ -33,6 +33,7 @@ PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_Thre
  , m_Application(a_mainApp)
  , m_Id(a_id)
  , m_settings(new NGL::Settings(configFileName))
+  , m_logger(getLogger("PrtCnvThreadStarter"))
 {
  DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
 }
@@ -41,6 +41,8 @@ protected:
    

    NGL::Settings *m_settings;
+
+    NGL::INGLLogger &m_logger;
  public:
    

@@ -30,7 +30,7 @@ bool TTWorker::init()
 {
  connect(m_socket, &QTcpSocket::disconnected,
          this, &TTWorker::deleteLater);
-  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
+  connect(m_socket, &QAbstractSocket::errorOccurred,
          this, &TTWorker::onSocketError);
  connect(m_socket, &QTcpSocket::readyRead,
          this, &TTWorker::onReadyRead);
@@ -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)
@@ -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 <embedded> 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"
Author	SHA1	Message	Date
berrux-dev	985aa9787b	Complete PrtCnv Qt6 migration so CoPrtCnv/PrtCnvLib/PrtCnv/ddsview build Restore dropped m_logger members, QMutex->QRecursiveMutex, splitView->split, error->errorOccurred (migration-only, verified vs legacy).	2026-10-05 14:59:27 +02:00
berrux-dev	ed81fccb1d	Merge feature/migrate-module-tetraif-only into feature/qt6-migration-projects-app-tools-viewer-validation Resolves 0 textual conflicts; unions new_docker_build.sh (TetraIF GROUP6 CoPrtCnv/PrtCnvLib/PrtCnv + ddsview; t* re-activated per build) and keeps qledline convergent fix; validates BUILD_RTI=ON BUILD_GRANTLEE=ON.	2026-10-05 14:57:33 +02:00
torstenandCopilot	7b090a26ca	Fix QLedLine QHBoxLayout::setMargin() deprecation for Qt6 - Removed redundant setMargin(0) call (setContentsMargins already used) - QHBoxLayout::setMargin() removed in Qt6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-10-03 17:52:10 +00:00
torstenandCopilot	1bcc7e4855	TetraIF Qt6 migration: Fix build errors for CoPrtCnv, PrtCnv, and LogView Code fixes: - PrtCnvApplication.hpp: Add missing m_logger member variable, change QMutex to QRecursiveMutex (Qt6 deprecated QMutex::Recursive) - PrtCnvApplication.cpp: Fix constructor initialization for m_logger, remove QMutex::Recursive initialization - PrtCnvBroadcastMgr.hpp: Add missing m_logger member declaration - PrtCnvBroadcastMgr.cpp: Fix constructor initialization order for m_logger and m_loggerBcRequest - PrtCnvCentralThread.cpp: Fix include path from LtsUtils/dds_bitarray.h to LtsUtilsCore/dds_bitarray.h - LogViewTelegramEditModel.hpp: Fix QAbstractTableModel include from QtGui to QtCore (Qt6 API change) - TetraIF/CMakeLists.txt: Remove IF(BUILD_RTI) wrapper to match Qt5 behavior (no conditional wrapper) - CoPrtCnv/CMakeLists.txt: Remove redundant find_package(Qt6) calls in else branch Build script updates: - new_docker_build.sh: Add CoPrtCnv, PrtCnvLib, PrtCnv to GROUP6_TARGETS - new_docker_build.sh: Comment out tDataSampleGenerator and tDataSampleReceiver (pre-existing RTI DDS API errors unrelated to TetraIF migration) Test files: - Remove test_tetraif_coprtcnv.cpp, test_tetraif_prtcnv.cpp, test_tetraif_logview.cpp These tests included generated export headers (coprtcnv_export.h) not available at test compile time Validation: - Docker build completed successfully with BUILD_RTI=ON BUILD_GRANTLEE=ON - All TetraIF components (CoPrtCnv, PrtCnvLib, PrtCnv, LogViewer) build successfully Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-10-03 15:22:53 +00:00
torstenandCopilot	ab1cf60643	Add TetraIF targets to GROUP6 and create compilation tests - Add CoPrtCnv, PrtCnvLib, PrtCnv to GROUP6_TARGETS in new_docker_build.sh - Clean up redundant find_package(Qt6) in CoPrtCnv/CMakeLists.txt - Add CTest compilation tests for CoPrtCnv, LogView, and PrtCnv headers - Tests verify Qt6/C++17 compatibility of TetraIF module headers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-10-03 12:28:55 +00:00
torsten	3f8a7eccfd	Adds rti evaluation licence	2026-10-03 12:20:28 +00:00