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:
2785 files changed
+18754
-18316
No files matched your search
+1
-2
@@ -17,7 +17,6 @@ AssignGuezNasatPartDialog::AssignGuezNasatPartDialog(int exerciseId, QWidget *pa
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_ui(new Ui::AssignGuezNasatPartDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -95,7 +94,7 @@ void AssignGuezNasatPartDialog::retranslate()
|
||||
|
||||
bool AssignGuezNasatPartDialog::apply()
|
||||
{
|
||||
INFO_LOG(m_logger) << "AssignGuezNasatPartDialog::apply()";
|
||||
INFO_LOG() << "AssignGuezNasatPartDialog::apply()";
|
||||
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
|
||||
int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
|
||||
|
||||
|
||||
+6
-7
@@ -20,7 +20,6 @@ GuezNasatPartDialog::GuezNasatPartDialog(const QString &menuGroup, LtsSession::L
|
||||
, m_ui(new Ui::GuezNasatPartDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -46,7 +45,7 @@ bool GuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc>
|
||||
m_exmDtc = exmDtc;
|
||||
m_ppmDtc = ppmDtc;
|
||||
|
||||
INFO_LOG(m_logger) << "GuezNasatPartDialog::init";
|
||||
INFO_LOG() << "GuezNasatPartDialog::init";
|
||||
m_nasatAircraftParticipantModel = new GuezNasat::NasatAircraftParticipantModel(this);
|
||||
m_nasatAircraftParticipantModel->initModel(m_dtc, m_exmDtc, m_ppmDtc, ppmGuiCbxIfc, m_session);
|
||||
m_ui->widget->setModel(m_nasatAircraftParticipantModel);
|
||||
@@ -90,11 +89,11 @@ void GuezNasatPartDialog::retranslate()
|
||||
|
||||
void GuezNasatPartDialog::onNewAircraftPart()
|
||||
{
|
||||
INFO_LOG(m_logger) << "onNewAircraft";
|
||||
INFO_LOG() << "onNewAircraft";
|
||||
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
|
||||
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel))
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
|
||||
ERROR_LOG() << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
|
||||
delete assignGuezNasatPartDialog;
|
||||
return;
|
||||
}
|
||||
@@ -108,11 +107,11 @@ void GuezNasatPartDialog::onEditAircraftPart()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onEditAircraft";
|
||||
INFO_LOG() << "onEditAircraft";
|
||||
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
|
||||
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel, m_nasatAircraftParticipantModel->getRowData(curIdx.row())))
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
|
||||
ERROR_LOG() << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
|
||||
delete assignGuezNasatPartDialog;
|
||||
return;
|
||||
}
|
||||
@@ -131,7 +130,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onRemoveNewAircraft";
|
||||
INFO_LOG() << "onRemoveNewAircraft";
|
||||
|
||||
NasatAircraftParticipant req;
|
||||
req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
|
||||
|
||||
Reference in new issue
Block a user