Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
@@ -25,7 +25,6 @@ AvmFtTests::AvmFtTests(QObject *parent)
  , m_testId(0)
  , m_mountingPointId(100)
  , m_bTestsSuccessful(true)
-  , m_logger(getLogger("FtTest"))
 {
  qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }
@@ -37,7 +36,7 @@ AvmFtTests::~AvmFtTests()
 // ------------------------------------------------------------------------------
 bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
 {
-  INFO_LOG(m_logger) << "init begin";
+  INFO_LOG() << "init begin";

  m_testId = testId;
  m_menuStructId = menuId;
@@ -48,14 +47,14 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
    return false;
  m_ddsConnector->initPublisherSubscriber();

-  DEBUG_LOG(m_logger) << "create ftc AVM";
+  DEBUG_LOG() << "create ftc AVM";
  m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG(m_logger) << "init ftc AVM";
+  DEBUG_LOG() << "init ftc AVM";
  bool bRet = m_ftc->enableAll();
-  DEBUG_LOG(m_logger) << "init end AVM - bRet = " << bRet;
+  DEBUG_LOG() << "init end AVM - bRet = " << bRet;

-  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
-  DEBUG_LOG(m_logger) << "Test Id = " << testId;
+  DEBUG_LOG() << "Domain Id = " << domainId;
+  DEBUG_LOG() << "Test Id = " << testId;

  return bRet;
 }
@@ -63,7 +62,7 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
 // ------------------------------------------------------------------------------
 void AvmFtTests::startTest()
 {
-  INFO_LOG(m_logger) << "startTest";
+  INFO_LOG() << "startTest";
  if (m_testId <= 1)
    QTimer::singleShot(0, this, &AvmFtTests::tryCreate);
  else if (m_testId == 2)
@@ -75,7 +74,7 @@ void AvmFtTests::startTest()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryCreate()
 {
-  INFO_LOG(m_logger) << "trying to send createMenuStructRequest";
+  INFO_LOG() << "trying to send createMenuStructRequest";

  m_menuStructId = -2;
  ModifyMenuStructRequest request;
@@ -102,7 +101,7 @@ void AvmFtTests::tryCreate()

  if (!m_ftc->modifyMenuStructRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting create data";
+    ERROR_LOG() << "Error requesting create data";
    failExit();
  }
 }
@@ -110,7 +109,7 @@ void AvmFtTests::tryCreate()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryModify()
 {
-  INFO_LOG(m_logger) << "trying to send modify request for menuStructId = " << m_menuStructId;
+  INFO_LOG() << "trying to send modify request for menuStructId = " << m_menuStructId;
  ModifyMenuStructRequest request;
  request.id(m_menuStructId);
  request.name("TestGlobalMenuModify");
@@ -135,7 +134,7 @@ void AvmFtTests::tryModify()

  if (!m_ftc->modifyMenuStructRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting modify data";
+    ERROR_LOG() << "Error requesting modify data";
    failExit();
  }
 }
@@ -143,13 +142,13 @@ void AvmFtTests::tryModify()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryDelete()
 {
-  INFO_LOG(m_logger) << "trying to send delete request for menuStructId = " << m_menuStructId;
+  INFO_LOG() << "trying to send delete request for menuStructId = " << m_menuStructId;
  RemoveMenuStructRequest request;
  request.id(m_menuStructId);

  if (!m_ftc->removeMenuStructRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting delete data";
+    ERROR_LOG() << "Error requesting delete data";
    failExit();
  }
 }
@@ -168,15 +167,15 @@ void AvmFtTests::createMenuStructReply(const Core::FunctionReplyObject &replyObj
 {
  if (replyObject.error())
  {
-    ERROR_LOG(m_logger) << "Got onCreateMenuStructReply error: " << replyObject();
+    ERROR_LOG() << "Got onCreateMenuStructReply error: " << replyObject();
    failExit();
    return;
  }
-  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
+  INFO_LOG() << "Got createReply with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();
  m_menuStructId = replyObject.id();

-  DEBUG_LOG(m_logger) << "m_testId = " << m_testId;
+  DEBUG_LOG() << "m_testId = " << m_testId;

  if(m_testId == 0)
    QTimer::singleShot(0, this, &AvmFtTests::tryModify);
@@ -189,11 +188,11 @@ void AvmFtTests::modifyMenuStructReply(const Core::FunctionReplyObject &replyObj
 {
  if (replyObject.error())
  {
-    ERROR_LOG(m_logger) << "Got onModifyMenuStructReply error: " << replyObject();
+    ERROR_LOG() << "Got onModifyMenuStructReply error: " << replyObject();
    failExit();
    return;
  }
-  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();
  if(m_testId == 0)
    QTimer::singleShot(0, this, &AvmFtTests::tryDelete);
@@ -206,11 +205,11 @@ void AvmFtTests::onRemoveMenuStructReply(const Core::FunctionReplyObject &replyO
 {
  if (replyObject.error())
  {
-    ERROR_LOG(m_logger) << "Got onRemoveMenuStructReply error: " << replyObject();
+    ERROR_LOG() << "Got onRemoveMenuStructReply error: " << replyObject();
    failExit();
    return;
  }
-  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
+  INFO_LOG() << "Got removeReply with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();
  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -64,8 +64,6 @@ private:
  int              m_testId;
  int              m_mountingPointId;
  bool             m_bTestsSuccessful;
-  NGL::INGLLogger &m_logger;
-
 };

 } // namespace AudioVideoManagement
@@ -72,7 +72,6 @@ private:
  bool                                                    m_removeReplyReceived{false};
  QVector<int>                                            m_tvcConfigIds;
  QVector<int>                                            m_cnrConfigIds;
-  NGL::INGLLogger                                        &m_logger;
 };

 } // namespace AudioVideoManagement
@@ -27,7 +27,6 @@ MvsTests::MvsTests(QObject *parent)
  , m_radioStationId(200)
  , m_exerciseId(0)
  , m_bTestsSuccessful(true)
-  , m_logger(getLogger("Test"))
 {
  qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }
@@ -39,7 +38,7 @@ MvsTests::~MvsTests()
 //----------------------------------------------------------------------------------
 bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int stationId, int exerciseId)
 {
-  INFO_LOG(m_logger) << "init begin";
+  INFO_LOG() << "init begin";

  m_testId = testId;
  m_teamId = teamId;
@@ -53,18 +52,18 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
    return false;
  m_ddsConnector->initPublisherSubscriber();

-  DEBUG_LOG(m_logger) << "create ftc MVS";
+  DEBUG_LOG() << "create ftc MVS";
  m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG(m_logger) << "init ftc MVS";
+  DEBUG_LOG() << "init ftc MVS";
  bool bRet = m_ftc->enableAll();
-  DEBUG_LOG(m_logger) << "init end MVS - bRet = " << bRet;
+  DEBUG_LOG() << "init end MVS - bRet = " << bRet;

-  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
-  DEBUG_LOG(m_logger) << "Team Id = " << teamId;
-  DEBUG_LOG(m_logger) << "Test Id = " << testId;
-  DEBUG_LOG(m_logger) << "Receiver Id = " << receiverId;
-  DEBUG_LOG(m_logger) << "Radio Station Id = " << stationId;
-  DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
+  DEBUG_LOG() << "Domain Id = " << domainId;
+  DEBUG_LOG() << "Team Id = " << teamId;
+  DEBUG_LOG() << "Test Id = " << testId;
+  DEBUG_LOG() << "Receiver Id = " << receiverId;
+  DEBUG_LOG() << "Radio Station Id = " << stationId;
+  DEBUG_LOG() << "Exercise Id = " << exerciseId;

  return bRet;
 }
@@ -72,7 +71,7 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
 //----------------------------------------------------------------------------------
 void MvsTests::startTest()
 {
-  INFO_LOG(m_logger) << "startTest";
+  INFO_LOG() << "startTest";
  switch (m_testId)
  {
 //  case 1:
@@ -100,18 +99,18 @@ void MvsTests::startTest()
    tryModifyAvsVideoReceiver();
    break;
  default:
-    ERROR_LOG(m_logger) << "Unknown test case !";
+    ERROR_LOG() << "Unknown test case !";
    failExit();
    break;
  }
-  INFO_LOG(m_logger) << "*********  endTest  **************";
+  INFO_LOG() << "*********  endTest  **************";
  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }

 //----------------------------------------------------------------------------------
 //void MvsTests::tryCreateVideoTeam()
 //{
-//  INFO_LOG(m_logger) << "trying to send createRequest VideoTeam";
+//  INFO_LOG() << "trying to send createRequest VideoTeam";
 //  VideoTeamModifyRequest request;

 //  request.id(0);
@@ -126,7 +125,7 @@ void MvsTests::startTest()

 //  if (!m_ftc->videoTeamModifyRequest(request, this))
 //  {
-//    INFO_LOG(m_logger) << "Error requesting create data, as expected";
+//    INFO_LOG() << "Error requesting create data, as expected";
 //    successExit();
 //  }

@@ -151,7 +150,7 @@ void MvsTests::tryModifyVideoTeam()

  if (!m_ftc->videoTeamModifyRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting modify data";
+    ERROR_LOG() << "Error requesting modify data";
    failExit();
  }

@@ -167,7 +166,7 @@ void MvsTests::tryModifyVideoTeam()

 //  if (!m_ftc->videoTeamRemoveRequest(request, this))
 //  {
-//    ERROR_LOG(m_logger) << "Error requesting remove data";
+//    ERROR_LOG() << "Error requesting remove data";
 //    failExit();
 //  }

@@ -177,7 +176,7 @@ void MvsTests::tryModifyVideoTeam()
 //----------------------------------------------------------------------------------
 void MvsTests::tryCreateVideoReceiver()
 {
-  INFO_LOG(m_logger) << "trying to send createRequest VideoReceiver";
+  INFO_LOG() << "trying to send createRequest VideoReceiver";
  VideoReceiverModifyRequest request;

  request.id(0);
@@ -190,7 +189,7 @@ void MvsTests::tryCreateVideoReceiver()

  if (!m_ftc->videoReceiverModifyRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting create data";
+    ERROR_LOG() << "Error requesting create data";
    failExit();
  }

@@ -212,7 +211,7 @@ void MvsTests::tryModifyVideoReceiver()

  if (!m_ftc->videoReceiverModifyRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting modify data";
+    ERROR_LOG() << "Error requesting modify data";
    failExit();
  }

@@ -230,7 +229,7 @@ void MvsTests::tryModifyAvsVideoReceiver()

  if (!m_ftc->videoReceiverModifyAvsRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting modify AVS data";
+    ERROR_LOG() << "Error requesting modify AVS data";
    failExit();
  }

@@ -247,7 +246,7 @@ void MvsTests::tryModifyActiveVideoReceiver()

  if (!m_ftc->videoReceiverModifyActiveRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting modify active data";
+    ERROR_LOG() << "Error requesting modify active data";
    failExit();
  }

@@ -264,7 +263,7 @@ void MvsTests::tryDeleteVideoReceiver()

  if (!m_ftc->videoReceiverRemoveRequest(request, this))
  {
-    ERROR_LOG(m_logger) << "Error requesting remove data";
+    ERROR_LOG() << "Error requesting remove data";
    failExit();
  }

@@ -275,7 +274,7 @@ void MvsTests::tryDeleteVideoReceiver()
 //----------------------------------------------------------------------------------
 void MvsTests::failExit()
 {
-  ERROR_LOG(m_logger) << "FAIL EXIT !";
+  ERROR_LOG() << "FAIL EXIT !";
  m_bTestsSuccessful = false;
  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -283,7 +282,7 @@ void MvsTests::failExit()
 //----------------------------------------------------------------------------------
 void MvsTests::successExit()
 {
-  INFO_LOG(m_logger) << "SUCCES EXIT !";
+  INFO_LOG() << "SUCCES EXIT !";
  m_bTestsSuccessful = true;
  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -292,14 +291,14 @@ void MvsTests::successExit()
 //----------------------------------------------------------------------------------
 void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG(m_logger) << "END (onVideoTeamModifyReply)";
+  DEBUG_LOG() << "END (onVideoTeamModifyReply)";
  if (replyObject.error())
  {
-    ERROR_LOG(m_logger) << "Got onVideoTeamModifyReply error: " << replyObject();
+    ERROR_LOG() << "Got onVideoTeamModifyReply error: " << replyObject();
    QTimer::singleShot(0, qApp, SLOT(quit()));
    return;
  }
-  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
+  INFO_LOG() << "Got Reply with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();

  m_teamId = replyObject.id();
@@ -310,14 +309,14 @@ void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObje
 //----------------------------------------------------------------------------------
 void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG(m_logger) << "END (onVideoReceiverModifyReply)";
+  DEBUG_LOG() << "END (onVideoReceiverModifyReply)";
  if (replyObject.error())
  {
-    ERROR_LOG(m_logger) << "Got onVideoReceiverModifyReply error: " << replyObject();
+    ERROR_LOG() << "Got onVideoReceiverModifyReply error: " << replyObject();
    QTimer::singleShot(0, qApp, SLOT(quit()));
    return;
  }
-  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
+  INFO_LOG() << "Got Reply with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();

  m_receiverId = replyObject.id();
@@ -328,7 +327,7 @@ void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &reply
 // ------------------------------------------------------------------------------
 void MvsTests::onError(const QString &reason)
 {
-  ERROR_LOG(m_logger) << "Got Reply error: " << reason;
+  ERROR_LOG() << "Got Reply error: " << reason;
  failExit();
 }

@@ -340,7 +339,7 @@ void MvsTests::onReply(const Core::FunctionReplyObject &replyObject)
    onError(replyObject.translated());
    return;
  }
-  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
+  INFO_LOG() << "Got Reply with id " << replyObject.id()
                     << " and errorString " << replyObject.translated();
 //  QTimer::singleShot(0, qApp, SLOT(quit()));
 }