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 @@ FiringExplosion::FiringExplosion(QWidget *parent)
, m_session(nullptr)
, m_safetyConfirmationWidget(nullptr)
, m_ui(new Ui::FiringExplosion)
, m_logger(getLogger("FiringExplosion"))
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_idOrder(0)
, m_idEffectShow(0)
@@ -58,11 +57,11 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc,
LtsSession::LtsSession *session, bool freeForm)
{
DEBUG_LOG(m_logger) << "FiringExplosion::init()";
DEBUG_LOG() << "FiringExplosion::init()";
if (!dtc || !ftc)
{
ERROR_LOG(m_logger) << "FiringExplosion::init() Invalid shared_ptr!";
ERROR_LOG() << "FiringExplosion::init() Invalid shared_ptr!";
return false;
}
@@ -73,7 +72,7 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
m_safetyConfirmationWidget = new SafetyConfirmationWidget(this);
if (!m_safetyConfirmationWidget->init(m_ftc))
{
ERROR_LOG(m_logger) << "Can't create SafetiConfirmationWidget";
ERROR_LOG() << "Can't create SafetiConfirmationWidget";
return false;
}
m_ui->mainVertLayout->insertWidget(3, m_safetyConfirmationWidget);
@@ -181,7 +180,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
void FiringExplosion::onApply()
{
if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
ERROR_LOG(m_logger) << "Apply failed";
ERROR_LOG() << "Apply failed";
}
void FiringExplosion::onFire()
@@ -193,7 +192,7 @@ void FiringExplosion::onFire()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Fire);
if (!rc)
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
ERROR_LOG() << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onInterrupt()
{
@@ -204,7 +203,7 @@ void FiringExplosion::onInterrupt()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Interrupt);
if (!rc)
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
ERROR_LOG() << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onAbort()
@@ -329,7 +328,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
break;
default:
DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
DEBUG_LOG() << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);
@@ -74,7 +74,6 @@ private:
SafetyConfirmationWidget *m_safetyConfirmationWidget;
Ui::FiringExplosion *m_ui;
NGL::INGLLogger &m_logger;
LtsUtils::RequestHelper *m_requestHelper;
EffectShowClient::FiringExplosionEntity m_oldEntity;
@@ -26,9 +26,8 @@ FiringSmoke::FiringSmoke(QWidget *parent)
, m_idOrder(0)
, m_firingClearanceCountDown(0)
, m_endOfFiringClearanceCountDown(0)
, m_logger(getLogger("FiringSmoke"))
{
DEBUG_LOG(m_logger) << "FiringSmoke::FiringSmoke()";
DEBUG_LOG() << "FiringSmoke::FiringSmoke()";
m_ui->setupUi(this);
m_smokeState = new SmokeState(this);
@@ -50,11 +49,11 @@ bool FiringSmoke::init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &
const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc,
LtsSession::LtsSession *session, bool freeForm)
{
DEBUG_LOG(m_logger) << "FiringSmoke::init()";
DEBUG_LOG() << "FiringSmoke::init()";
if (!dtc || !ftc)
{
ERROR_LOG(m_logger) << "FiringSmoke::init() Invalid shared_ptr!";
ERROR_LOG() << "FiringSmoke::init() Invalid shared_ptr!";
return false;
}
@@ -184,7 +183,7 @@ void FiringSmoke::onMeteoTimerTimeout()
void FiringSmoke::onApply()
{
if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
ERROR_LOG(m_logger) << "Firing Smoke Apply failed";
ERROR_LOG() << "Firing Smoke Apply failed";
}
@@ -282,7 +281,7 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
break;
default:
DEBUG_LOG(m_logger) << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
DEBUG_LOG() << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);
@@ -84,9 +84,7 @@ private:
EffectShowClient::SafetyConfirmation_e m_safetyConfirmation;
int m_idOrder;
qint64 m_firingClearanceCountDown;
qint64 m_endOfFiringClearanceCountDown;
NGL::INGLLogger &m_logger;
qint64 m_endOfFiringClearanceCountDown;
};
}
@@ -28,7 +28,6 @@ OperatingCondition::OperatingCondition(QWidget *parent)
, m_safetyConfirmationWidget(nullptr)
, m_ui(new Ui::OperatingCondition)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("OperatingCondition"))
{
m_ui->setupUi(this);
m_smokeState = new EffectShowClient::SmokeState(this);
@@ -59,11 +58,11 @@ OperatingCondition::~OperatingCondition()
bool OperatingCondition::init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &dtc,
const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc)
{
DEBUG_LOG(m_logger) << "OperatingCondition::init()";
DEBUG_LOG() << "OperatingCondition::init()";
if (!dtc || !ftc)
{
ERROR_LOG(m_logger) << "OperatingCondition::init() Invalid shared_ptr!";
ERROR_LOG() << "OperatingCondition::init() Invalid shared_ptr!";
return false;
}
@@ -91,7 +91,6 @@ private:
LtsUtils::RequestHelper *m_requestHelper;
BatteryVoltage_t m_batteryVoltage;
NGL::INGLLogger &m_logger;
};
}
@@ -17,7 +17,6 @@ OrderEdit::OrderEdit(const Order &order, bool fireReadinessAvailable, QWidget *p
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_order(order)
, m_fireReadinessAvailable(fireReadinessAvailable)
, m_logger(getLogger("OrderEdit"))
{
m_ui->setupUi(this);
}
@@ -29,11 +28,11 @@ OrderEdit::~OrderEdit()
bool OrderEdit::init(const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc, EffectShowManagement::OrderConfirmation_e order)
{
DEBUG_LOG(m_logger) << "OrderEdit::init()";
DEBUG_LOG() << "OrderEdit::init()";
if (!ftc)
{
ERROR_LOG(m_logger) << "OrderEdit::init() Invalid shared_ptr!";
ERROR_LOG() << "OrderEdit::init() Invalid shared_ptr!";
return false;
}
@@ -47,7 +47,6 @@ private:
bool m_fireReadinessAvailable;
EffectShowManagement::OrderConfirmation_e_def m_forcedState;
QHash<int, QString> m_orderList;
NGL::INGLLogger &m_logger;
};
}
@@ -27,7 +27,6 @@ OrderList::OrderList(const QString &menuGroup, LtsSession::LtsSession *session,
, m_session(session)
, m_ui(new Ui::OrderList)
, m_isEffectShow(false)
, m_logger(getLogger("OrderList"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -125,7 +124,7 @@ bool OrderList::init(bool isEffectShow,
m_ui->widget->hideColumn(EffectShowClient::OrderModel::Volley);
m_ui->widget->hideColumn(EffectShowClient::OrderModel::ShotsInTotal);
}
DEBUG_LOG(m_logger) << "esc Order is visible:" << m_sitMapGuiIfc->isEscOrderPositionVisible();
DEBUG_LOG() << "esc Order is visible:" << m_sitMapGuiIfc->isEscOrderPositionVisible();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, m_sitMapGuiIfc->isEscOrderPositionVisible());
m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Show, m_isEffectShow);
@@ -175,7 +174,7 @@ void OrderList::onEditOrder()
const EffectShowClient::Order order = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onEditOrder() ";
DEBUG_LOG() << "--- onEditOrder() ";
if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut)
return;
bool fireReadinessEnable = true;
@@ -266,7 +265,7 @@ void OrderList::onRemoveEscOrderPosition()
m_sitMapGuiIfc->escOrderPosition_remove();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, false);
DEBUG_LOG(m_logger) << "esc Order row selected:" << m_ui->widget->selectionModel()->selectedRows().size();
DEBUG_LOG() << "esc Order row selected:" << m_ui->widget->selectionModel()->selectedRows().size();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, m_ui->widget->selectionModel()->selectedRows().size() > 0);
@@ -62,8 +62,6 @@ private:
Ui::OrderList *m_ui;
bool m_isEffectShow;
LOGGER_T m_logger;
};
}
@@ -29,7 +29,6 @@ OrderModel::OrderModel(QObject *parent)
tr("Shots In Total")
},
parent)
, m_logger(getLogger("OrderModel"))
{}
@@ -56,7 +56,6 @@ private:
TrainingAreaBaseOC::OwnPosition m_ownPosition;
friend class OrderProxyModel;
bool m_isEffectShow = true;
LOGGER_T m_logger;
};
class OrderProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel