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

@@ -17,7 +17,6 @@ EffectShowActorList::EffectShowActorList(QWidget *parent)
, m_effectShowModel(nullptr)
, m_session(nullptr)
, m_ui(new Ui::EffectShowActorList)
, m_logger(getLogger("EffectShowActorList"))
{
m_ui->setupUi(this);
@@ -40,9 +40,6 @@ private:
EffectShowModel *m_effectShowModel;
LtsSession::LtsSession *m_session;
Ui::EffectShowActorList *m_ui;
LOGGER_T m_logger;
};
}
@@ -132,7 +132,6 @@ EffectShowActorModel::EffectShowActorModel(EffectShowModel *effectShowModel, QOb
parent)
, m_dtc(nullptr)
, m_effectShowModel(effectShowModel)
, m_logger(getLogger("EffectShowActorModel"))
{
}
@@ -98,8 +98,6 @@ private:
QHash<int, Core::GeoPosition2D> m_ppmPositions;
EffectShowModel *m_effectShowModel;
LOGGER_T m_logger;
friend class EffectShowActorProxyModel;
};
@@ -28,7 +28,6 @@ EffectShowActorRelocationEdit::EffectShowActorRelocationEdit(QWidget *parent)
, m_session(nullptr)
, m_ui(new Ui::EffectShowActorRelocationEdit)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("EffectShowActorRelocationEdit"))
{
m_ui->setupUi(this);
}
@@ -96,11 +95,11 @@ bool EffectShowActorRelocationEdit::init(LtsSession::LtsSession *session,
EffectShowModel *model,
int rowToCopy)
{
DEBUG_LOG(m_logger) << "EffectShowActorRelocationEdit::init()";
DEBUG_LOG() << "EffectShowActorRelocationEdit::init()";
if (!session)
{
ERROR_LOG(m_logger) << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
ERROR_LOG() << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
return false;
}
@@ -63,7 +63,6 @@ private:
LtsSession::LtsSession *m_session;
Ui::EffectShowActorRelocationEdit *m_ui;
LtsUtils::RequestHelper *m_requestHelper;
NGL::INGLLogger &m_logger;
};
}
@@ -20,7 +20,6 @@ EffectShowActorRelocationList::EffectShowActorRelocationList(const QString &menu
, m_session(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::EffectShowActorRelocationList)
, m_logger(getLogger("EffectShowActorRelocationList"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -93,7 +92,7 @@ void EffectShowActorRelocationList::onSelectionChanged()
void EffectShowActorRelocationList::onAddEffectShowActorRelocation()
{
DEBUG_LOG(m_logger) << "--- onAddEffectShowActorRelocation() ";
DEBUG_LOG() << "--- onAddEffectShowActorRelocation() ";
EffectShowActorRelocationEdit *dialog = new EffectShowActorRelocationEdit(this);
if (m_ui->widget->currentIndex().row() >= 0)
dialog->init(m_session, m_effectShowModel, m_ui->widget->currentIndex().row());
@@ -58,8 +58,6 @@ private:
LtsUtils::RequestHelper *m_requestHelper{nullptr};
Ui::EffectShowActorRelocationList *m_ui{nullptr};
LOGGER_T m_logger;
};
}
@@ -24,7 +24,6 @@ EffectShowActorRelocationModel::EffectShowActorRelocationModel(EffectShowModel *
parent)
, m_dtc(nullptr)
, m_effectShowModel(effectShowModel)
, m_logger(getLogger("EffectShowActorRelocationModel"))
{}
@@ -43,9 +43,6 @@ private:
EffectShowModel *m_effectShowModel;
friend class EffectShowActorRelocationProxyModel;
LOGGER_T m_logger;
};
@@ -22,7 +22,6 @@ EffectShowEdit::EffectShowEdit(const EffectShow &effectShow, QWidget *parent)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_effectShow(effectShow)
, m_ui(new Ui::EffectShowEdit)
, m_logger(getLogger("EffectShowEdit"))
{
m_ui->setupUi(this);
}
@@ -55,12 +54,12 @@ bool EffectShowEdit::init(LtsSession::LtsSession *session,
if (!session->getForeignGuiInterface(m_esmActorCbx))
return false;
DEBUG_LOG(m_logger) << "EffectShowEdit::init()";
DEBUG_LOG() << "EffectShowEdit::init()";
m_model = model;
AreaEffectSimulation::AesItem aesItem;
bool foundItem = m_aesDtc->aesItemFromId(m_effectShow.idAreaEffectSimulation(), aesItem);
DEBUG_LOG(m_logger) << ", found :" << foundItem
DEBUG_LOG() << ", found :" << foundItem
<< ", idAreaEffectSimulation :" << m_effectShow.idAreaEffectSimulation()
<< ", aesItem.id() :" << aesItem.id()
<< ", esmParticipantId: " << m_effectShow.esmParticipantId();
@@ -175,7 +174,7 @@ void EffectShowEdit::updateActorComboBox(const Core::GeoPosition &coordGeo)
bool ok;
int esmParticipantId = m_ui->cbEffectShowActor->currentData().toInt(&ok);
DEBUG_LOG(m_logger) << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
DEBUG_LOG() << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
<< ", currentText: " << m_ui->cbEffectShowActor->currentText()
<< ", esmParticipantId: " << esmParticipantId
<< ", ok: " << ok;
@@ -66,7 +66,6 @@ private:
bool m_isSmoke{false};
Ui::EffectShowEdit *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -22,7 +22,6 @@ EffectShowList::EffectShowList(const QString &menuGroup, QWidget *parent)
, m_session(nullptr)
, m_ui(new Ui::EffectShowList)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("EffectShowList"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -118,7 +117,7 @@ void EffectShowList::onEditEffectShow()
EffectShowManagement::EffectShow effectShow = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onEffectShow() "
DEBUG_LOG() << "--- onEffectShow() "
<< " id: " << effectShow.id()
<< " position: " << effectShow.position();
@@ -61,8 +61,6 @@ private:
Ui::EffectShowList *m_ui;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
};
}
@@ -40,7 +40,6 @@ EffectShowModel::EffectShowModel(QObject *parent)
, m_effectShowActorProxyModel(nullptr)
, m_effectShowActorModel(nullptr)
, m_effectShowActorRelocationModel(nullptr)
, m_logger(getLogger("EffectShowModel"))
{}
EffectShowModel::~EffectShowModel()
@@ -298,7 +297,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
if (vehicleStatus.operational())
{
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
<< vehicleStatus.esmParticipantId() << " is operational.";
return true;
}
@@ -306,7 +305,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
if (!m_effectShowVehicleLastTimeOperational.contains(equipmentNum))
{
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
<< vehicleStatus.esmParticipantId() << " has not reported operational at any time.";
return false;
}
@@ -314,10 +313,10 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
bool bRet = QDateTime().addMSecs(m_effectShowVehicleLastTimeOperational[equipmentNum]).date() == QDate::currentDate();
if (bRet)
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
<< vehicleStatus.esmParticipantId() << " is not operational, but has reported operational today.";
else
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
<< vehicleStatus.esmParticipantId() << " is not operational and has not reported operational today.";
return bRet;
}
@@ -116,8 +116,6 @@ private:
EffectShowActorRelocationModel *m_effectShowActorRelocationModel;
friend class EffectShowProxyModel;
LOGGER_T m_logger;
};
class EffectShowProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel