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

@@ -52,7 +52,7 @@ SET(PlanEditor_SRCS
SOURCE_GROUP(PlanEditor FILES ${PlanEditor_SRCS})
NGL_ADD_LIBRARY(WS planEditor SHARED ${PlanEditor_SRCS} ${db_SNDS} )
NGL_ADD_LIBRARY2(WS planEditor SHARED ${PlanEditor_SRCS} ${db_SNDS} )
NGL_TARGET_LINK_LIBRARIES(planEditor
PRIVATE
@@ -169,16 +169,16 @@ class TestMainWindow : public QMainWindow
if (initFilePath.isEmpty()) initFilePath = QCoreApplication::applicationDirPath() + QLatin1String("/") + iniFileName;
if (!QFile::exists(initFilePath))
FATAL_LOG(m_logger) << LOGFUNCTION << " MapIniFile location Failed";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile location Failed";
else
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapIniFile found: " << initFilePath;
DEBUG_LOG() << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
SituationMap::MapSettings * mapSettings = new SituationMap::MapSettings(initFilePath, m_map);
MapInitializer *mapInitializer = new MapInitializer(*m_map, *mapSettings, QLatin1String("PlanEditorTest"), m_map);
if (mapInitializer->hasErrors())
{
FATAL_LOG(m_logger) << LOGFUNCTION << " MapInitializer-filename='" << mapInitializer->filename()
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapInitializer-filename='" << mapInitializer->filename()
<< "'' has following errors: "
<< " exists = " << mapInitializer->exists()
<< " accessError = " << mapInitializer->accessError()
@@ -264,8 +264,7 @@ class TestMainWindow : public QMainWindow
SituationMap::Map * m_map;
QPointer<PlanEditor::PlanEditor> m_planEdit;
SituationMap::LOGGER_T m_logger;
SituationMap::
};
@@ -290,7 +289,7 @@ int main (int argc, char* argv[])
app.setOrganizationName( QLatin1String( "RME" ) );
app.setApplicationName( QLatin1String( "Plan Editor Test Application" ) );
TRACE_LOG(app.baseLogger()) << LOGFUNCTION << " START";
TRACE_LOG(app.baseLogger()) << Q_FUNC_INFO << " START";
if (argc < 2)
{
@@ -216,8 +216,6 @@ public:
, m_ppTeamColor(-1)
, m_ppTeamDColor(-1)
, m_ppTextModifier()
, m_logger(getLogger("AttributeDialogManager"))
{
m_colorDialog -> setOptions(QColorDialog::ColorDialogOptions({QColorDialog::ShowAlphaChannel, QColorDialog::DontUseNativeDialog}));
@@ -263,7 +261,7 @@ public:
if (partyColors.size() > customColorCount)
{
WARNING_LOG(m_logger) << LOGFUNCTION << " To much party colors ("
WARNING_LOG() << Q_FUNC_INFO << " To much party colors ("
<< partyColors.size()
<< ") color dialog custom colors are limited to "
<< customColorCount
@@ -380,21 +378,21 @@ AttributeDialogManager::AttributeDialogManager(PlanEditor
, const PlanEditorSession &session)
: QObject(planEditor), m_internal(new AttributeDialogManager::InternalData(planEditor, map, geoModel, session, this))
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " END";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " END";
}
AttributeDialogManager::~AttributeDialogManager()
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START";
delete m_internal; m_internal = nullptr;
}
void AttributeDialogManager::onOpenDialog(const SituationMap::GeometryModel::Node &node)
{
DEBUG_LOG(m_internal->m_logger) << LOGFUNCTION << " START, node.connectedId() = " << node.connectedId();
DEBUG_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START, node.connectedId() = " << node.connectedId();
if (!node.isValid())
{
@@ -413,7 +411,7 @@ void AttributeDialogManager::onOpenDialog(const SituationMap::GeometryModel::Nod
SituationMap::GeometryModel::PrimitiveType primitiveType = m_internal->m_geoModel->getType(node);
DEBUG_LOG(m_internal->m_logger) << LOGFUNCTION << " primitiveType = " << static_cast<int>(primitiveType)
DEBUG_LOG(m_internal->m_logger) << Q_FUNC_INFO << " primitiveType = " << static_cast<int>(primitiveType)
<< " , m_dlgSymbolModify=" << m_internal->m_dlgSymbolModify
<< " , m_dlgSymbolXML=" << m_internal->m_dlgSymbolXML;
@@ -604,7 +602,7 @@ void AttributeDialogManager::onResetWidgets()
AdvancedSymbology::Gui::SymbolModificationDialog *AttributeDialogManager::InternalData::buildSymbolModifyDialog(QWidget *parent, bool isParticipant)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START "
TRACE_LOG() << Q_FUNC_INFO << " START "
<< ", isParticipant=" << isParticipant
<< ", this=" << this;
@@ -643,7 +641,7 @@ static void colorizeButton(QAbstractButton *button, const QColor color)
SymbologyXML::SymbolDialog *AttributeDialogManager::InternalData::buildSymbolXMLDialog(QWidget *parent)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << ", this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " START " << ", this=" << this;
SymbologyXML::SymbolDialog *dlg = new SymbologyXML::SymbolDialog(m_map->symbolDictionary(),m_geoModel,true,parent);
if(dlg)
@@ -1108,7 +1106,7 @@ LtsWidgets::LtsDialog *AttributeDialogManager::InternalData::buildTextAttrBox(QW
LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBox(QWidget *parent)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
Dialog *dlg = new Dialog(parent);
dlg->setObjectName(QLatin1String("PlanEditor::ParticipantData"));
@@ -1336,7 +1334,7 @@ LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBo
m_self->onCloseDialog();
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
return dlg;
}
@@ -1899,7 +1897,7 @@ void AttributeDialogManager::addStyleAttributes(const SituationMap::GeometryMode
void AttributeDialogManager::getStyleAttributes(const SituationMap::GeometryModel::Node &node)
{
TRACE_LOG(m_internal->m_logger) << LOGFUNCTION << " START "
TRACE_LOG(m_internal->m_logger) << Q_FUNC_INFO << " START "
<< ", m_dlgSymbolModify= " << m_internal->m_dlgSymbolModify
<< ", m_dlgSymbolXML= " << m_internal->m_dlgSymbolXML;
onResetWidgets();
@@ -8,7 +8,7 @@
#include <QtCore/QString>
#include "plan_editor_export.h"
#include "planeditor_export.h"
namespace PlanEditor
@@ -117,7 +117,6 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
, m_previewGeoModelRenderer(nullptr)
, m_uidList()
, m_rubberband(nullptr)
, m_logger(getLogger("PlanEditor-GeometryPlacer"))
{
@@ -159,7 +158,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
if (m_uidList.isEmpty())
{
WARNING_LOG(m_logger) << LOGFUNCTION << "Object list of GeometryPlacer is empty.";
WARNING_LOG() << Q_FUNC_INFO << "Object list of GeometryPlacer is empty.";
return;
}
@@ -168,7 +167,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
ERROR_LOG(m_logger) << LOGFUNCTION << "Can't determine bounding box of selected features";
ERROR_LOG() << Q_FUNC_INFO << "Can't determine bounding box of selected features";
#ifdef LTS_DEBUG
@@ -5,7 +5,7 @@
#include <NGLLogger/INGLLogger.h>
#include "plan_editor_export.h"
#include "planeditor_export.h"
#define ENDLOG() "";
@@ -137,7 +137,7 @@ public:
if (lineNo > 1)
{
if (!parseLine(stripLeadingAndTrailingQuotes(line)))
ERROR_LOG(m_logger) << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
ERROR_LOG() << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
}
}
file.close();
@@ -186,9 +186,9 @@ public:
}
#endif
}
else ERROR_LOG(m_logger) << "Open file for reading failed: " << file.fileName() << ENDLOG();
else ERROR_LOG() << "Open file for reading failed: " << file.fileName() << ENDLOG();
}
else ERROR_LOG(m_logger) << "File doesn't exist: " << file.fileName() << ENDLOG();
else ERROR_LOG() << "File doesn't exist: " << file.fileName() << ENDLOG();
}
~Internal()
@@ -16,7 +16,7 @@
#include <functional>
#include <memory>
#include "plan_editor_export.h"
#include "planeditor_export.h"
class QListWidgetItem;
class QTreeWidget;
@@ -244,7 +244,6 @@ public:
, m_currentBboxRubberband(nullptr)
, m_saveFunction()
, m_rbBackupNodeCoordinates()
, m_logger(getLogger("PlanEditor"))
{
this->initLogicalLayernameAndRenderer(QStringLiteral("PlanEditorLayer"), me);
@@ -309,12 +308,12 @@ public:
if (m_geoModel == nullptr)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Creating Geometry Model failed.";
ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model failed.";
return;
}
if (m_geoModelRenderer == nullptr)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Creating Geometry Model Renderer failed.";
ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model Renderer failed.";
return;
}
@@ -25,7 +25,6 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
, m_geometryModel(geometryModel)
, m_map(map)
, m_rubberband(nullptr)
, m_logger(getLogger("PlanEditor-SelectionWorker"))
{
switch (mode)
@@ -48,7 +47,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLineSelect);
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
}
else ERROR_LOG(m_logger) << LOGFUNCTION << "Creating rubberband for line selection failed.";
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for line selection failed.";
} break;
case SelectionMode::Lasso :
@@ -66,7 +65,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLassoSelect);
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
}
else ERROR_LOG(m_logger) << LOGFUNCTION << "Creating rubberband for lasso selection failed.";
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for lasso selection failed.";
} break;
case SelectionMode::Rectangle :
@@ -83,7 +82,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onRectSelect);
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
}
else ERROR_LOG(m_logger) << LOGFUNCTION << "Creating rubberband for rectangle selection failed.";
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for rectangle selection failed.";
} break;
case SelectionMode::Picking :
@@ -210,7 +210,7 @@ public:
};
SymbolFavouritesDom() : QDomDocument(QLatin1String(m_rootNodeName) + QLatin1String("Document")), m_logger(getLogger("SymbolFavourites"))
SymbolFavouritesDom() : QDomDocument(QLatin1String(m_rootNodeName) + QLatin1String("Document"))
{
if (!m_initStaticDone) initStatic();
QDomElement root = createElement(QLatin1String(m_rootNodeName));
@@ -391,7 +391,7 @@ public:
if (!setContent(xml, &errorMsg, &errorLine, &errorColumn))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
setContent(backup);
return false;
}
@@ -412,7 +412,7 @@ public:
if (!setContent(device, &errorMsg, &errorLine, &errorColumn))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
setContent(backup);
return false;
}
@@ -645,7 +645,7 @@ IncludeOperator::IncludeOperator(SymbolFavouritesDom &mainFavourites, const Symb
const SymbolFavouritesDom *toIncludeDom = dynamic_cast<const SymbolFavouritesDom *>(&toInclude);
if (toIncludeDom)
traverse(*toIncludeDom);
else ERROR_LOG(mainFavourites.m_logger) << LOGFUNCTION << " Type mismatch: SymbolFavourites toInclude have wrong type.";
else ERROR_LOG(mainFavourites.m_logger) << Q_FUNC_INFO << " Type mismatch: SymbolFavourites toInclude have wrong type.";
}