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

@@ -153,7 +153,7 @@ MESSAGE(STATUS "DEBUG BEFORE IF: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}")
IF(BUILD_RTI)
MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
PUBLIC
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QGraphicsView>
namespace LtsWidgets
@@ -10,7 +10,7 @@
#include <QGroupBox>
#include <QList>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
class QToolButton;
namespace LtsWidgets
@@ -7,7 +7,7 @@
#include <QWidget>
#include <QDoubleSpinBox>
#include <QSet>
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
class Ui_LtsAngleEdit;
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QDialog>
@@ -3,7 +3,7 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <LtsUtilsCore/lts_translatable_identifier.h>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "lts_notification_box.h"
#include "qevent.h"
@@ -7,7 +7,7 @@
#include <QWidget>
#include <QMouseEvent>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
#include <LtsUtilsCore/variant_operators.h>
#include <QDataStream>
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QComboBox>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "qcheckbox.h"
#include "qpushbutton.h"
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
#include <functional>
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QDate>
#include <QWidget>
@@ -486,13 +486,13 @@ void LtsDialog::showEvent(QShowEvent *event)
void LtsDialog::tryLockTopic()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_topicInfo.isValid())
return;
if (m_topicInfo.isLocked())
{
WARNING_LOG(m_logger) << LOGFUNCTION << " tried to lock with an already locked topic info, return";
WARNING_LOG() << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
return;
}
@@ -508,7 +508,7 @@ void LtsDialog::tryLockTopic()
bool bIsConnected = isSignalConnected(QMetaMethod::fromSignal(&LtsDialog::signalLockTopic));
DEBUG_LOG(m_logger) << LOGFUNCTION
DEBUG_LOG() << Q_FUNC_INFO
<< " signalLockTopic(): "
<< ", TopicName =" << m_topicInfo.topicName()
<< ", entity =" << m_topicInfo.entityId()
@@ -520,7 +520,7 @@ void LtsDialog::tryLockTopic()
m_topicInfo.setLocked();
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
@@ -535,14 +535,14 @@ void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
void LtsDialog::tryLockTopicNew()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
tryLockTopic();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< ", topicName='" << topicName << "'"
<< ", entityId=" << entityId;
@@ -550,7 +550,7 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
if (m_topicInfo.entityId() != entityId)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " topicName='" << topicName << "'"
DEBUG_LOG() << Q_FUNC_INFO << " topicName='" << topicName << "'"
<< " change from " << m_topicInfo.entityId() << " to " << entityId;
m_topicInfo.setLocked(false);
}
@@ -561,16 +561,16 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
m_topicInfo.setValid();
tryLockTopic();
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
TRACE_LOG() << Q_FUNC_INFO << " END"
<< ", topicName='" << topicName << "'"
<< ", entityId=" << entityId;
}
void LtsDialog::triggerTopicLock()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " !!trigger!!";
TRACE_LOG() << Q_FUNC_INFO << " START" << " !!trigger!!";
tryLockTopic();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "requirement_widget.h"
#include "lts_dialog_button_box.h"
@@ -412,8 +412,6 @@ protected:
LtsDialogButtonBox *m_buttonBox;
UiRequirementList *m_uiRequirements;
NGL::INGLLogger &m_logger;
};
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "lts_message_dialog.h"
#include <QWidget>
@@ -6,7 +6,7 @@
#include "lts_base.h"
#include "lts_drop_handler.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QString>
#include <QIcon>
@@ -5,7 +5,7 @@
#include <QObject>
#include <QLabel>
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
namespace LtsWidgets
{
@@ -3,7 +3,7 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QObject>
#include <QEvent>
@@ -7,7 +7,7 @@
#include <QDialog>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets
@@ -3,7 +3,7 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QObject>
@@ -6,7 +6,7 @@
#include <QGridLayout>
#include <QVector>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "lts_base.h"
class QWidget;
@@ -9,7 +9,7 @@
#include <QtCore/QPointF>
#include <QtCore/QPair>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
class LTSWIDGETS_EXPORT LtsHeightPlotWidget final : public QWidget
{
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_frameless_dialog.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace Ui
@@ -4,7 +4,7 @@
#include <QObject>
#include <QWidget>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets
{
@@ -1,6 +1,6 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include "lts_frameless_dialog.h"
#include <QObject>
@@ -3,7 +3,7 @@
#include <QDateTimeEdit>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets {
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QSet>
#include <QSpinBox>
@@ -1,7 +1,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
#include <QPainterPath>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_frameless_dialog.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace Ui {
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QGraphicsView>
class QRubberBand;
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
@@ -3,7 +3,7 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QObject>
#include <QPointer>
@@ -6,7 +6,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QSlider>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_frameless_dialog.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace Ui
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QSpinBox>
@@ -1,6 +1,6 @@
#pragma once
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
#include <QSplashScreen>
#include <QObject>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QSplitter>
#include <QList>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QSplitterHandle>
#include <QList>
@@ -5,7 +5,7 @@
#include <QObject>
#include <QTabBar>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets
{
@@ -7,7 +7,7 @@
#include <QObject>
#include "lts_abstract_sequence_widget.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
class QTabWidget;
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QTabWidget>
#include <QMap>
@@ -1,7 +1,7 @@
#pragma once
#include <QObject>
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
#include <QWidget>
@@ -4,7 +4,7 @@
#include <QObject>
#include <LtsWidgets/lts_widgets_export.h>
#include "ltswidgets_export.h"
#include <QMainWindow>
#include <QMap>
@@ -5,7 +5,7 @@
#include <QObject>
#include <QToolBar>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
namespace LtsWidgets
{
@@ -4,7 +4,7 @@
#pragma once
#include <QObject>
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
#include <QVector>
@@ -5,7 +5,7 @@
#include <QObject>
#include "lts_base.h"
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QToolBox>
@@ -1,6 +1,6 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QString>
@@ -3,7 +3,7 @@
#pragma once
#include "lts_widgets_export.h"
#include "ltswidgets_export.h"
#include <QWidget>
#include <QVector>