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
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <Common/ProjectConfig/project_defines.h>
|
||||
#include <LtsSession/ltssessiondatadds_export.h>
|
||||
#include "ltssessiondatadds_export.h"
|
||||
|
||||
|
||||
namespace DataPluginBase { class Interface; }
|
||||
@@ -123,7 +123,7 @@ public:
|
||||
if ( bEnableAll && !member->enableAll())
|
||||
{
|
||||
member = nullptr;
|
||||
ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -138,7 +138,7 @@ public:
|
||||
{
|
||||
dtc = nullptr;
|
||||
ftc = nullptr;
|
||||
ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -176,7 +176,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -198,7 +198,7 @@ public:
|
||||
}
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!"
|
||||
<< ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(S).name() << " failed!"
|
||||
<< ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -238,7 +238,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString();
|
||||
DEBUG_LOG() << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString();
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
val.reset();
|
||||
DEBUG_LOG(m_logger) << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!"
|
||||
DEBUG_LOG() << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!"
|
||||
<< ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this;
|
||||
return false;
|
||||
}
|
||||
@@ -285,7 +285,6 @@ protected:
|
||||
QMap<QString, std::shared_ptr<GuiPluginBase::Interface>> m_initializeThesePlugins;
|
||||
Fetcher *m_fetcher;
|
||||
QStringList m_qosFileList;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -306,7 +305,6 @@ public:
|
||||
bool m_errors;
|
||||
QString m_caller;
|
||||
QString m_whatWillNotWork;
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_optional;
|
||||
QString m_resultType;
|
||||
QString m_getterFunctionType;
|
||||
@@ -337,11 +335,11 @@ public:
|
||||
|
||||
if (m_optional)
|
||||
{
|
||||
INFO_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork));
|
||||
INFO_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork));
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required"));
|
||||
ERROR_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required"));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user