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
@@ -14,7 +14,6 @@ CloseAesList::CloseAesList(LtsSession::LtsSession *session, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_model(new AesListModel(session, this))
|
||||
, m_ui(new Ui::CloseAesList)
|
||||
, m_logger(getLogger("CloseAesList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->aesList->setModel(m_model);
|
||||
|
||||
-3
@@ -34,9 +34,6 @@ private:
|
||||
AesListModel *m_model;
|
||||
|
||||
Ui::CloseAesList *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -19,7 +19,6 @@ AesListModel::AesListModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
}
|
||||
, parent)
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("AesListModel"))
|
||||
{
|
||||
|
||||
m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc);
|
||||
|
||||
-2
@@ -42,7 +42,5 @@ private:
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -20,13 +20,12 @@ SelfTest::SelfTest(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_escDtc(nullptr)
|
||||
, m_ui(new Ui::SelfTest)
|
||||
, m_logger(getLogger("SelfTestDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
if ( m_session->getDtc<TrainingAreaBaseOC::DataInterface>(m_tabocDtc))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "load tab settings";
|
||||
WARNING_LOG() << "load tab settings";
|
||||
connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::technicalStateSfmChanged,
|
||||
this, &SelfTest::onSfmStatusChanged);
|
||||
|
||||
|
||||
@@ -56,9 +56,6 @@ private:
|
||||
std::shared_ptr<EffectShowClient::Interface::Dtc> m_escDtc;
|
||||
|
||||
Ui::SelfTest *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user