lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
+7 -7
View File
@@ -57,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() << "FiringExplosion::init()";
DEBUG_LOG(m_logger) << "FiringExplosion::init()";
if (!dtc || !ftc)
{
ERROR_LOG() << "FiringExplosion::init() Invalid shared_ptr!";
ERROR_LOG(m_logger) << "FiringExplosion::init() Invalid shared_ptr!";
return false;
}
@@ -72,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() << "Can't create SafetiConfirmationWidget";
ERROR_LOG(m_logger) << "Can't create SafetiConfirmationWidget";
return false;
}
m_ui->mainVertLayout->insertWidget(3, m_safetyConfirmationWidget);
@@ -180,7 +180,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
void FiringExplosion::onApply()
{
if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
ERROR_LOG() << "Apply failed";
ERROR_LOG(m_logger) << "Apply failed";
}
void FiringExplosion::onFire()
@@ -192,7 +192,7 @@ void FiringExplosion::onFire()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Fire);
if (!rc)
ERROR_LOG() << "Firing Explosion Order Execution failed";
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onInterrupt()
{
@@ -203,7 +203,7 @@ void FiringExplosion::onInterrupt()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Interrupt);
if (!rc)
ERROR_LOG() << "Firing Explosion Order Execution failed";
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onAbort()
@@ -328,7 +328,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
break;
default:
DEBUG_LOG() << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
+2
View File
@@ -46,6 +46,8 @@ public:
bool freeForm = false);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onOrderModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
void onManuallyExplosionReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
+5 -5
View File
@@ -27,7 +27,7 @@ FiringSmoke::FiringSmoke(QWidget *parent)
, m_firingClearanceCountDown(0)
, m_endOfFiringClearanceCountDown(0)
{
DEBUG_LOG() << "FiringSmoke::FiringSmoke()";
DEBUG_LOG(m_logger) << "FiringSmoke::FiringSmoke()";
m_ui->setupUi(this);
m_smokeState = new SmokeState(this);
@@ -49,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() << "FiringSmoke::init()";
DEBUG_LOG(m_logger) << "FiringSmoke::init()";
if (!dtc || !ftc)
{
ERROR_LOG() << "FiringSmoke::init() Invalid shared_ptr!";
ERROR_LOG(m_logger) << "FiringSmoke::init() Invalid shared_ptr!";
return false;
}
@@ -183,7 +183,7 @@ void FiringSmoke::onMeteoTimerTimeout()
void FiringSmoke::onApply()
{
if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
ERROR_LOG() << "Firing Smoke Apply failed";
ERROR_LOG(m_logger) << "Firing Smoke Apply failed";
}
@@ -281,7 +281,7 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
break;
default:
DEBUG_LOG() << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
DEBUG_LOG(m_logger) << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
+2
View File
@@ -46,6 +46,8 @@ public:
bool freeForm = false);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onOrderModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
void onManuallySmokeReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
+2 -2
View File
@@ -58,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() << "OperatingCondition::init()";
DEBUG_LOG(m_logger) << "OperatingCondition::init()";
if (!dtc || !ftc)
{
ERROR_LOG() << "OperatingCondition::init() Invalid shared_ptr!";
ERROR_LOG(m_logger) << "OperatingCondition::init() Invalid shared_ptr!";
return false;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
+1
View File
@@ -41,6 +41,7 @@ public:
bool init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &dtc,
const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onSendAmmunitionReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
void onSendReadinessReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
+2 -2
View File
@@ -28,11 +28,11 @@ OrderEdit::~OrderEdit()
bool OrderEdit::init(const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc, EffectShowManagement::OrderConfirmation_e order)
{
DEBUG_LOG() << "OrderEdit::init()";
DEBUG_LOG(m_logger) << "OrderEdit::init()";
if (!ftc)
{
ERROR_LOG() << "OrderEdit::init() Invalid shared_ptr!";
ERROR_LOG(m_logger) << "OrderEdit::init() Invalid shared_ptr!";
return false;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
+2
View File
@@ -33,6 +33,8 @@ public:
bool apply() override;
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool checkForAnswerUiRequirement() const;
void showOrder();
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
+3 -3
View File
@@ -124,7 +124,7 @@ bool OrderList::init(bool isEffectShow,
m_ui->widget->hideColumn(EffectShowClient::OrderModel::Volley);
m_ui->widget->hideColumn(EffectShowClient::OrderModel::ShotsInTotal);
}
DEBUG_LOG() << "esc Order is visible:" << m_sitMapGuiIfc->isEscOrderPositionVisible();
DEBUG_LOG(m_logger) << "esc Order is visible:" << m_sitMapGuiIfc->isEscOrderPositionVisible();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, m_sitMapGuiIfc->isEscOrderPositionVisible());
m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Show, m_isEffectShow);
@@ -174,7 +174,7 @@ void OrderList::onEditOrder()
const EffectShowClient::Order order = m_model->getRowData(row);
DEBUG_LOG() << "--- onEditOrder() ";
DEBUG_LOG(m_logger) << "--- onEditOrder() ";
if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut)
return;
bool fireReadinessEnable = true;
@@ -265,7 +265,7 @@ void OrderList::onRemoveEscOrderPosition()
m_sitMapGuiIfc->escOrderPosition_remove();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, false);
DEBUG_LOG() << "esc Order row selected:" << m_ui->widget->selectionModel()->selectedRows().size();
DEBUG_LOG(m_logger) << "esc Order row selected:" << m_ui->widget->selectionModel()->selectedRows().size();
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, m_ui->widget->selectionModel()->selectedRows().size() > 0);
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.h
+2
View File
@@ -41,6 +41,8 @@ public:
const std::shared_ptr<TrainingAreaBaseOC::Interface::Dtc> &dtcTabOC);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onSelectionChanged();
void onEditOrder();
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.h
+2
View File
@@ -51,6 +51,8 @@ private slots:
void onOwnPositionChanged(const TrainingAreaBaseOC::OwnPosition &data);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<EffectShowClient::Interface::Dtc> m_dtc;
std::shared_ptr<TrainingAreaBaseOC::Interface::Dtc> m_dtcTabOC;
TrainingAreaBaseOC::OwnPosition m_ownPosition;