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>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -3,7 +3,7 @@
#pragma once
#include <LtsWidgets/lts_frameless_dialog.h>
#include "zwmsmsdl_export.h"
#include "ppmcommon_export.h"
#include <QMap>
#include <memory>
@@ -2,7 +2,7 @@
#pragma once
#include <Common/ppmcommon_export.h>
#include "ppmcommon_export.h"
class QTreeView;
@@ -2,7 +2,7 @@
#pragma once
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <QString>
#include <QRegularExpression>
@@ -2,7 +2,7 @@
#pragma once
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Services/ParticipantManagement/ppm.hpp>
#include <Services/ParticipantManagement/ppm_dtc.h>
#include <Services/ParticipantManagement/ppm_ftc.h>
@@ -35,7 +35,6 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
, m_ppmGuiCbxIfc(nullptr)
, m_session(session)
, m_ui(new Ui::ParticipantEditItemWidgetBase)
, m_logger(getLogger("ParticipantEditItemWidgetBase"))
{
m_ui->setupUi(this);
setWindowTitle(tr("Edit Participant"));
@@ -107,7 +106,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asb,
const bool addItem)
{
DEBUG_LOG(m_logger) << "init addItem=" << addItem
DEBUG_LOG() << "init addItem=" << addItem
<< " m_bEditMode=" << m_bEditMode;
if (!dtc || !ppmGuiCbxIfc)
return false;
@@ -122,7 +121,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
slotRetranslate();
if (addItem)
{
DEBUG_LOG(m_logger) << "setDesignatorData()";
DEBUG_LOG() << "setDesignatorData()";
setDesignatorData();
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(s_lastTypeClassUsed));
const int idx = m_ui->cbType->findData(s_lastTypeUsed);
@@ -132,7 +131,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
else if (m_bEditMode)
{
DEBUG_LOG(m_logger) << "setData()";
DEBUG_LOG() << "setData()";
setData();
}
return true;
@@ -224,7 +223,7 @@ void ParticipantEditItemWidgetBase::onSymbolConfig()
void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
{
TRACE_LOG(m_logger) << LOGFUNCTION << ", Changing symbol to " << sidc;
TRACE_LOG() << Q_FUNC_INFO << ", Changing symbol to " << sidc;
if (!m_asbfc || sidc == m_sidc)
return;
@@ -251,7 +250,7 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
}
else
{
ERROR_LOG(m_logger) << LOGFUNCTION << " sidc is not encoded, sidc = '" << sidc << "'";
ERROR_LOG() << Q_FUNC_INFO << " sidc is not encoded, sidc = '" << sidc << "'";
m_ui->pbSymbolConfig->setEnabled(false);
}
@@ -261,7 +260,7 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
m_symbolConfig = nullptr;
}
DEBUG_LOG(m_logger) << "Changing symbol to " << sidc << " is in progress";
DEBUG_LOG() << "Changing symbol to " << sidc << " is in progress";
}
ParticipantManagement::TypeClass ParticipantEditItemWidgetBase::typeClassIdFromTypeId(int typeId) const
@@ -84,8 +84,6 @@ protected:
QSet<int> m_disabledTypeIds;
Ui::ParticipantEditItemWidgetBase *m_ui;
LOGGER_T m_logger;
};
}
@@ -360,7 +360,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
if (!isUnitType(parentItem->participant.typeId()))
return false;
DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
DEBUG_LOG() << "can drop on " << row << ", " << column << ", parent: "
<< parent.row() << "," << parent.column() << ", " << parent.isValid()
<< ", action: " << action;
@@ -389,7 +389,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
if (idSource != 0 && isParentOf(parentItem, idSource))
{
DEBUG_LOG(m_logger) << "isParentOf() for idSource: " << idSource << " is true - no drop";
DEBUG_LOG() << "isParentOf() for idSource: " << idSource << " is true - no drop";
return false;
}
}
@@ -802,7 +802,7 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
auto it = tmap.constFind(childId);
if (it == tmap.constEnd())
{
WARNING_LOG(m_logger) << "Can not find participant with id " << childId << " - ignoring";
WARNING_LOG() << "Can not find participant with id " << childId << " - ignoring";
continue;
}
const ParticipantData &data = it.value();
@@ -827,11 +827,11 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
childItem->participant = data;
childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
DEBUG_LOG() << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
<< ") to parent " << parent << " at pos " << insertPos;
if ( data.id() == 0 && data.hierarchyNumber() == 0)
{
WARNING_LOG(m_logger) << "avoid endless loop in recursion";
WARNING_LOG() << "avoid endless loop in recursion";
return;
}
insertRow(insertPos, parentIdx, childItem);
@@ -1086,7 +1086,7 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
childItem->participant = m_dtc->convertParticipantToParticipantData(data);
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
DEBUG_LOG() << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
<< ") to parent " << ctiParent << " at pos " << insertPos;
insertRow(insertPos, indexFromItem(ctiParent), childItem);
tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);
@@ -5,7 +5,7 @@
#include "participant_icon_model_base.h"
#include <ParticipantManagement/logger.h>
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <nglwidgets/ngltreeitem.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
@@ -277,8 +277,6 @@ private:
SortData m_sortData;
ParticipantEditModel *m_sourceModel{nullptr};
NGL::INGLLogger &m_logger;
};
}
@@ -76,7 +76,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
{
AdvancedSymbology::SymbolDataToRender symDataToRender(symbol);
symDataToRender.role = m_partyRole;
DEBUG_LOG(m_logger) << "Rendering symbol '" << symbol << "' for item " << item;
DEBUG_LOG() << "Rendering symbol '" << symbol << "' for item " << item;
if (m_partyColor.isValid())
{
symDataToRender.fillColor = m_partyColor;
@@ -93,7 +93,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
AdvancedSymbology::SymbolResult *symResPtr = symRes.data();
if (!symResPtr)
{
WARNING_LOG(m_logger) << "Can not render symbol for sidc '" << symbol << "'";
WARNING_LOG() << "Can not render symbol for sidc '" << symbol << "'";
return;
}
@@ -139,11 +139,11 @@ void ParticipantIconModelBase::symbolRendered(AdvancedSymbology::SymbolResult *s
const QIcon icon(QPixmap::fromImage(symResData.result->symbolImage().image()));
for (NGLTreeItem *item : symResData.treeItems)
{
DEBUG_LOG(m_logger) << "Symbol for " << item << " ready";
DEBUG_LOG() << "Symbol for " << item << " ready";
if (!updateIcon(QModelIndex(), item, icon))
WARNING_LOG(m_logger) << "updateIcon failed for item " << item;
WARNING_LOG() << "updateIcon failed for item " << item;
}
m_symbolResultMapping.erase(it);
@@ -3,7 +3,7 @@
#pragma once
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <nglwidgets/ngltreemodel.h>
@@ -71,8 +71,6 @@ protected:
QHash<AdvancedSymbology::SymbolResult *, SymbolResultData> m_symbolResultMapping;
AdvancedSymbology::Role m_partyRole;
QColor m_partyColor;
NGL::INGLLogger &m_logger;
};
}
@@ -2,7 +2,7 @@
#pragma once
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <LtsWidgets/lts_frameless_dialog.h>
#include <QMap>
#include <memory>
@@ -6,7 +6,7 @@
#include <memory>
#include <LtsDataView/lts_data_view.h>
#include <Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <Lts/Plugins/ParticipantManagement/Gui/Common/ppmcommon_export.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>