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
@@ -24,7 +24,6 @@ MvsDialog::MvsDialog(const QString &menuGroup, LtsSession::LtsSession *session,
  , m_requestHelper(new LtsUtils::RequestHelper(this))
  , m_avmDtc(nullptr)
  , m_avmFtc(nullptr)
-  , m_logger(getLogger("MvsDialog"))
 {
  m_ui->setupUi(this);
  setOnlineHelpFilename(QStringLiteral("Situation-Configuration_Video_Teams"));
@@ -59,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr<AudioVideoManagement::Interface::Dtc>
  {
    delete m_model;
    m_model = nullptr;
-    ERROR_LOG(m_logger) << "Could not init model";
+    ERROR_LOG() << "Could not init model";
    return false;
  }

@@ -179,14 +178,14 @@ void MvsDialog::onExportButtonClicked()

  int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
  if (fileId > 0)
-    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
+    DEBUG_LOG() << "Saved file with id = " << fileId;
  else
-    ERROR_LOG(m_logger) << "Could not save file in library ";
+    ERROR_LOG() << "Could not save file in library ";
 }

 void MvsDialog::onImportButtonClicked()
 {
-  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
+  DEBUG_LOG() << " onImportButtonClicked() ";

  QByteArray content;
  int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog));
@@ -212,7 +211,7 @@ void MvsDialog::onImportButtonClicked()
          return m_avmFtc->videoTeamModifyRequest(request, this);
        });
      }
-      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
+      INFO_LOG() << "--- onImportButtonClicked() ";
    }
  }
 }
@@ -83,7 +83,5 @@ private:
  std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
  std::shared_ptr<AudioVideoManagement::Interface::Ftc> m_avmFtc;
  std::shared_ptr<FileManagement::ForeignGuiInterface>  m_flmGui;
-  LOGGER_T m_logger;
-
 }; 
 } 
@@ -42,7 +42,6 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<Audio
  , m_exerciseId(exerciseId)
  , m_id(id)
  , m_avmDtc(avmDtc)
-  , m_logger(getLogger("EditVideoTeamDialog"))
 {
  Q_ASSERT(m_id >= 0);
  m_ui->setupUi(this);
@@ -64,7 +64,5 @@ private:
  std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
  QMap<QString, int32_t> m_takenTeams;
  QMap<QString, int32_t> m_teamsToIndex;
-
-  LOGGER_T m_logger;
 }; 
 } 
@@ -18,7 +18,6 @@ MvsModel::MvsModel(QObject *parent)
  tr("Stream Name")
 }, parent)
 , m_exerciseId(-1)
-, m_logger(getLogger("MvsModel"))
 {}

 QVariant MvsModel::data(const QModelIndex &index, int role) const
@@ -78,7 +77,7 @@ QByteArray MvsModel::modelToJson()

  for (int row = 0; row < rowCount(); row++)
  {
-    DEBUG_LOG(m_logger) << "row =" << ": " << row;
+    DEBUG_LOG() << "row =" << ": " << row;
    QJsonObject inner;
    const VideoTeam &config     = m_vecData.at(row);
    inner[QStringLiteral("id")] =         config.id();
@@ -119,7 +118,7 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
    config.exerciseId(m_exerciseId);
    config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());

-    INFO_LOG(m_logger) << "insertRow: " << config.name()
+    INFO_LOG() << "insertRow: " << config.name()
                       << " VideoTeamId=" << config.id();
    result.append(std::move(config));
  }
@@ -39,8 +39,6 @@ private:
  int32_t m_exerciseId;

  QMap<int32_t, AudioVideoManagement::VideoTeam> m_videoTeams;
-
-  LOGGER_T m_logger;
 }; 
 } 

@@ -22,7 +22,6 @@ MvsVideoTeamDialog::MvsVideoTeamDialog(QWidget *parent)
  , m_ftc(nullptr)
  , m_flmGui(nullptr)
  , m_requestHelper(new LtsUtils::RequestHelper(this))
-  , m_logger(getLogger("MvsVideoTeamDialog"))
 {
  m_ui->setupUi(this);

@@ -170,7 +169,7 @@ void MvsVideoTeamDialog::setData()
 bool MvsVideoTeamDialog::apply()
 {
  VideoReceiverModifyActiveRequest req;
-  DEBUG_LOG(m_logger) << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
+  DEBUG_LOG() << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
  QMap<int, QButtonGroup *> ::const_iterator itBg;
  for (itBg = m_videoTeamButtonGroup.constBegin(); itBg != m_videoTeamButtonGroup.constEnd(); ++itBg)
  {
@@ -178,9 +177,9 @@ bool MvsVideoTeamDialog::apply()
    int mainStructureElementId = itBg.value()->checkedId();
    int oldActiveId = m_dtc->getActiveVideoReceiver(teamId);

-    DEBUG_LOG(m_logger) << "Team id = " << teamId;
-    DEBUG_LOG(m_logger) << "Main structure element id = " << mainStructureElementId;
-    DEBUG_LOG(m_logger) << "Old active video receiver = " << oldActiveId;
+    DEBUG_LOG() << "Team id = " << teamId;
+    DEBUG_LOG() << "Main structure element id = " << mainStructureElementId;
+    DEBUG_LOG() << "Old active video receiver = " << oldActiveId;

    if (itBg.value()->checkedId() == 0)  
    {
@@ -200,7 +199,7 @@ bool MvsVideoTeamDialog::apply()
      req.isActive(true);
      req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
    }
-    DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key()
+    DEBUG_LOG() << "itBg.key=" << itBg.key()
                        << " mainStructureElementId=" << mainStructureElementId
                        << " teamId=" << teamId
                        << " id=" << req.id()
@@ -87,7 +87,5 @@ private:
  QHash<QPair<int, int>, int> m_receiverIds;

  QVector <int> mainStructureElementIds;
-  LOGGER_T m_logger;
-
 };
 }