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
@@ -21,7 +21,6 @@ SessionHandler::SessionHandler(IDL::PartitionType partitionType,
|
||||
: m_partitionType(partitionType)
|
||||
, m_ddsConnectorSv(ddsConnectorSv)
|
||||
, m_ddsConnectorWs(ddsConnectorWs)
|
||||
, m_logger(getLogger("SessionHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -50,7 +49,7 @@ void SessionHandler::onCreateSession(const QString &partitionNameSv, const QStri
|
||||
const QString partitionName = partitionNameSv + QLatin1Char('-') + partitionNameWs;
|
||||
if (m_sessionMap.contains(partitionName))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got create session for " << partitionName << ", but is already created";
|
||||
WARNING_LOG() << "Got create session for " << partitionName << ", but is already created";
|
||||
return;
|
||||
}
|
||||
Session *session = new Session(partitionNameSv, partitionNameWs);
|
||||
@@ -59,12 +58,12 @@ void SessionHandler::onCreateSession(const QString &partitionNameSv, const QStri
|
||||
topicsToRouteToWs(),
|
||||
topicsToRouteToSv()))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not initialize session for " << partitionName << ", routing will not work...!";
|
||||
WARNING_LOG() << "Can not initialize session for " << partitionName << ", routing will not work...!";
|
||||
delete session;
|
||||
return;
|
||||
}
|
||||
m_sessionMap[partitionName] = session;
|
||||
INFO_LOG(m_logger) << "Successfully created session for " << partitionName;
|
||||
INFO_LOG() << "Successfully created session for " << partitionName;
|
||||
}
|
||||
|
||||
void SessionHandler::onDestroySession(const QString &partitionNameSv, const QString &partitionNameWs)
|
||||
@@ -73,14 +72,14 @@ void SessionHandler::onDestroySession(const QString &partitionNameSv, const QStr
|
||||
auto it = m_sessionMap.find(partitionName);
|
||||
if (it == m_sessionMap.end())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got destroy session for " << partitionName << ", but is not created (already destroyed?)";
|
||||
WARNING_LOG() << "Got destroy session for " << partitionName << ", but is not created (already destroyed?)";
|
||||
return;
|
||||
}
|
||||
Session *session = it.value();
|
||||
session->shutdown();
|
||||
delete session;
|
||||
m_sessionMap.erase(it);
|
||||
INFO_LOG(m_logger) << "Successfully destroyed session for " << partitionName;
|
||||
INFO_LOG() << "Successfully destroyed session for " << partitionName;
|
||||
}
|
||||
|
||||
bool SessionHandler::loadPlugins()
|
||||
@@ -108,7 +107,7 @@ bool SessionHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
|
||||
QStringLiteral("PDM"),
|
||||
});
|
||||
if (skipList.contains(pi.pluginName.toUpper()))
|
||||
DEBUG_LOG(m_logger) << "Skipping plugin " << pi.pluginName.toUpper() << " - is global";
|
||||
DEBUG_LOG() << "Skipping plugin " << pi.pluginName.toUpper() << " - is global";
|
||||
|
||||
m_topicTypePlugins.push_back(typePlugin);
|
||||
|
||||
|
||||
Reference in new issue
Block a user