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
@@ -169,16 +169,16 @@ class TestMainWindow : public QMainWindow
|
||||
if (initFilePath.isEmpty()) initFilePath = QCoreApplication::applicationDirPath() + QLatin1String("/") + iniFileName;
|
||||
|
||||
if (!QFile::exists(initFilePath))
|
||||
FATAL_LOG(m_logger) << LOGFUNCTION << " MapIniFile location Failed";
|
||||
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile location Failed";
|
||||
else
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapIniFile found: " << initFilePath;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
|
||||
|
||||
SituationMap::MapSettings * mapSettings = new SituationMap::MapSettings(initFilePath, m_map);
|
||||
MapInitializer *mapInitializer = new MapInitializer(*m_map, *mapSettings, QLatin1String("PlanEditorTest"), m_map);
|
||||
|
||||
if (mapInitializer->hasErrors())
|
||||
{
|
||||
FATAL_LOG(m_logger) << LOGFUNCTION << " MapInitializer-filename='" << mapInitializer->filename()
|
||||
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapInitializer-filename='" << mapInitializer->filename()
|
||||
<< "'' has following errors: "
|
||||
<< " exists = " << mapInitializer->exists()
|
||||
<< " accessError = " << mapInitializer->accessError()
|
||||
@@ -264,8 +264,7 @@ class TestMainWindow : public QMainWindow
|
||||
SituationMap::Map * m_map;
|
||||
QPointer<PlanEditor::PlanEditor> m_planEdit;
|
||||
|
||||
SituationMap::LOGGER_T m_logger;
|
||||
|
||||
SituationMap::
|
||||
};
|
||||
|
||||
|
||||
@@ -290,7 +289,7 @@ int main (int argc, char* argv[])
|
||||
app.setOrganizationName( QLatin1String( "RME" ) );
|
||||
app.setApplicationName( QLatin1String( "Plan Editor Test Application" ) );
|
||||
|
||||
TRACE_LOG(app.baseLogger()) << LOGFUNCTION << " START";
|
||||
TRACE_LOG(app.baseLogger()) << Q_FUNC_INFO << " START";
|
||||
|
||||
if (argc < 2)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user