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 <Viewer/LtsDataView/abstract_display_widget.h>
#include <Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
#include <Lts/Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
namespace Ui
{
@@ -20,13 +20,12 @@ MarkerManagementApplyFilter::MarkerManagementApplyFilter(LtsSession::LtsSession
, m_fltParticipantIfc(fltParticipantIfc)
, m_fltAesIfc(fltAesIfc)
, m_fltBuildingComponentIfc(fltBuildingComponenIfc)
, m_logger(getLogger("MarkerManagementApplyFilter"))
{
std::shared_ptr<SituationMap::ForeignGuiInterface> spSitMapGuiIfc;
m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(spSitMapGuiIfc);
if (!spSitMapGuiIfc)
{
ERROR_LOG(m_logger) << "No spSitMapGuiIfc";
ERROR_LOG() << "No spSitMapGuiIfc";
return;
}
m_sitMapGuiIfc = spSitMapGuiIfc;
@@ -47,7 +46,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
obj[QStringLiteral("SymbolAppearanceJson")] = symbolAppearanceSettings->settingsToJson();
}
else
WARNING_LOG(m_logger) << "cannot get filter as SymApp filter ifc is missing";
WARNING_LOG() << "cannot get filter as SymApp filter ifc is missing";
}
@@ -60,7 +59,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
obj[QStringLiteral("AesFilterJson")] = aesDisplayFilter->filterToJson();
}
else
WARNING_LOG(m_logger) << "cannot get filter as aes filter ifc is missing";
WARNING_LOG() << "cannot get filter as aes filter ifc is missing";
}
@@ -73,7 +72,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
obj[QStringLiteral("BuildingComponentSettingsJson")] = buildingComponentSettings->bldCmpSettingsToJson();
}
else
WARNING_LOG(m_logger) << "cannot get filter as BldgCmpnt filter ifc is missing";
WARNING_LOG() << "cannot get filter as BldgCmpnt filter ifc is missing";
}
return obj;
@@ -89,14 +88,14 @@ bool MarkerManagementApplyFilter::applyFilter(const QByteArray &filterContent)
{
if (filterContent.isEmpty())
{
ERROR_LOG(m_logger) << "filterContent is empty";
ERROR_LOG() << "filterContent is empty";
return false;
}
QJsonParseError parserError;
const QJsonDocument jDoc(QJsonDocument::fromJson(filterContent, &parserError));
if (parserError.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
ERROR_LOG() << "Error parsing json document: " << parserError.errorString();
return false;
}
return applyFilter(jDoc.object());
@@ -111,7 +110,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
{
const QJsonObject innerObj = filterContent[QStringLiteral("AesFilterJson")].toObject();
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content AesFilterJson is empty";
ERROR_LOG() << "inner content AesFilterJson is empty";
else
aesFilter.content(QJsonDocument(innerObj).toJson().constData());
}
@@ -124,7 +123,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
{
QJsonObject innerObj = filterContent[QStringLiteral("SymbolAppearanceJson")].toObject();
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content SymbolAppearanceJson is empty";
ERROR_LOG() << "inner content SymbolAppearanceJson is empty";
else
symbolAppearance.content(QJsonDocument(innerObj).toJson().constData());
}
@@ -137,7 +136,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
{
QJsonObject innerObj = filterContent[QStringLiteral("BuildingComponentSettingsJson")].toObject();
if (innerObj.isEmpty())
ERROR_LOG(m_logger) << "inner content BuildingComponentSettingsJson is empty";
ERROR_LOG() << "inner content BuildingComponentSettingsJson is empty";
else
buildingComponentFilter.content(QJsonDocument(innerObj).toJson().constData());
}
@@ -188,7 +187,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
appearanceSettings->setSettingsFromData(symbolAppearance);
} else
WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
@@ -207,7 +206,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
buildingComponentSettings->setBldCmpSettingsFromData(buildingComponentFilter);
}
else
WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
return true;
}
@@ -1,6 +1,6 @@
#pragma once
#include <MarkerManagement/logger.h>
#include <Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
#include <Lts/Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
@@ -37,7 +37,6 @@ private:
std::weak_ptr<FilterManagement::ForeignAesGuiInterface> m_fltAesIfc;
std::weak_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> m_fltBuildingComponentIfc;
std::weak_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
LOGGER_T m_logger;
};
}
@@ -28,7 +28,6 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
tr("File Id"),
tr("Image")},
parent)
, m_logger(getLogger("MarkerManagementDialogModel"))
{}
@@ -93,7 +92,7 @@ void MarkerManagementDialogModel::loadPreview(int fileContentId, int rowId)
QByteArray byteArray;
if (m_flmGui->loadContent(fileContentId, byteArray, true) && byteArray.size() > 0)
{
DEBUG_LOG(m_logger) << "m_previews.insert fileContentId=" << fileContentId
DEBUG_LOG() << "m_previews.insert fileContentId=" << fileContentId
<< " size Preview=" << byteArray.size();
QString str = QStringLiteral("<html><center><img src='data:image/png;base64,%1'></center></html>").arg(QString::fromLatin1(byteArray.toBase64()));
m_previews.insert(fileContentId, str);
@@ -5,7 +5,7 @@
#include <MarkerManagement/mrk_dtc.h>
#include <MarkerManagement/logger.h>
#include <Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
#include <Lts/Plugins/MarkerManagement/Gui/Common/mrkcommon_export.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
@@ -67,8 +67,6 @@ private:
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
int m_timezoneHoursOffset {0};
bool m_ignoreTimezone {false};
LOGGER_T m_logger;
friend class MarkerSortFilterProxyModel;
};