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
+7
-7
@@ -27,13 +27,13 @@ DataManager::DataManager(MainHandler *mainHandler)
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handleErrorMessage(const OcBaseDownload::WebSocketInterface::Messages::ErrorMessage::ErrorData &errData)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
|
||||
ERROR_LOG() << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
|
||||
DEBUG_LOG() << "Got ServicePortsInformation from websocket";
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
@@ -44,7 +44,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "Got Ports Information in neither BASE nor PDF download mode";
|
||||
WARNING_LOG() << "Got Ports Information in neither BASE nor PDF download mode";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handlePdfListMessage(const Messages::PdfListMessage::PdfListData &pdfListData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got PDF list from websocket";
|
||||
DEBUG_LOG() << "Got PDF list from websocket";
|
||||
m_mainHandler->handlerPdfDownload()->handlePdfListData(pdfListData);
|
||||
}
|
||||
|
||||
@@ -64,19 +64,19 @@ void DataManager::setCurrentDownload(CurrentDownload currentDownload)
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to PDF";
|
||||
DEBUG_LOG() << "Setting current download mode to PDF";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload(false);
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList();
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload();
|
||||
break;
|
||||
case CurrentDownload::BASE:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to BASE";
|
||||
DEBUG_LOG() << "Setting current download mode to BASE";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload();
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList(false);
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload(false);
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to NOTHING";
|
||||
DEBUG_LOG() << "Setting current download mode to NOTHING";
|
||||
m_mainHandler->dds()->fts()->enableAll();
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user