lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main_handler.cpp
+13 -14
View File
@@ -31,7 +31,6 @@ MainHandler::MainHandler(QObject *parent)
, m_licenceHandler(nullptr)
, m_serviceHandler(nullptr)
, m_websocketHandler(nullptr)
, m_logger(getLogger("MainHandler"))
{
QtSingleCoreApplication *sa = qobject_cast<QtSingleCoreApplication*>(QCoreApplication::instance());
Q_ASSERT(sa);
@@ -50,18 +49,18 @@ MainHandler::~MainHandler()
bool MainHandler::init(int domainId, const QString &licenceFile)
{
DEBUG_LOG(m_logger) << "Initializing MainHandler ...";
DEBUG_LOG() << "Initializing MainHandler ...";
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
bool bAllPartsInitialized = m_ddsHandler->init();
ERROR_LOG(m_logger) << "Searching for licence file: " << licenceFile;
ERROR_LOG() << "Searching for licence file: " << licenceFile;
QString licenceFileName = NGL::findFile(NGL::FileType::ConfigFile, licenceFile);
m_licenceHandler = std::make_shared<LicenceHandler>(m_ddsHandler, licenceFileName);
if (!m_licenceHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation LicenceHandler failed.";
ERROR_LOG() << "Initialisation LicenceHandler failed.";
return false;
}
@@ -79,15 +78,15 @@ bool MainHandler::init(int domainId, const QString &licenceFile)
m_websocketHandler = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
if (!m_websocketHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "MainHandler successfully initialized :)";
DEBUG_LOG() << "MainHandler successfully initialized :)";
}
else
{
ERROR_LOG(m_logger) << "MainHandler initialization failed";
ERROR_LOG() << "MainHandler initialization failed";
}
return bAllPartsInitialized;
@@ -102,7 +101,7 @@ bool MainHandler::readServices()
{
CodeGen::XmlReader xmlReader;
const QString xmlPath = NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml"));
DEBUG_LOG(m_logger) << "Using xml path " << xmlPath;
DEBUG_LOG() << "Using xml path " << xmlPath;
QDirIterator directoryIterator(xmlPath);
int serviceCount = 0;
@@ -132,7 +131,7 @@ bool MainHandler::readServices()
if (serviceName.isEmpty() || exeName.length() < 4 || groupNames.isEmpty())
{
INFO_LOG(m_logger) << currentFileName
INFO_LOG() << currentFileName
<< " does not include complete service information.";
}
else
@@ -145,7 +144,7 @@ bool MainHandler::readServices()
const int prioService = xmlReader.getPrio();
if (bDevMode)
{
WARNING_LOG(m_logger) << "Developer mode for service " << serviceName
WARNING_LOG() << "Developer mode for service " << serviceName
<< " activated - no automatic restart on crash!";
}
Service *newService = new Service(serviceName,
@@ -157,7 +156,7 @@ bool MainHandler::readServices()
prioService);
m_serviceHandler->addService(newService);
DEBUG_LOG(m_logger) << "Added new service \""
DEBUG_LOG() << "Added new service \""
<< serviceName
<< "\""
<< " prio=" << prioService;
@@ -166,7 +165,7 @@ bool MainHandler::readServices()
{
if (groupNameMapping.contains(groupName))
{
DEBUG_LOG(m_logger) << " --> Linking to group \""
DEBUG_LOG() << " --> Linking to group \""
<< groupName
<< "\"";
if (serviceName == QStringLiteral("ReportAnalyzer") && (groupName == QStringLiteral("ExercisePaused") || groupName == QStringLiteral("ExerciseAfterActionReview")))
@@ -175,7 +174,7 @@ bool MainHandler::readServices()
m_groupHandler->addServiceLink(newService->id(), groupNameMapping.value(groupName));
}
else
INFO_LOG(m_logger) << "Found unknown group name: " << groupName;
INFO_LOG() << "Found unknown group name: " << groupName;
}
++ serviceCount;
}
@@ -189,7 +188,7 @@ bool MainHandler::readServices()
if (serviceCount)
return true;
ERROR_LOG(m_logger) << "Could not find any valid service in directory " << xmlPath;
ERROR_LOG() << "Could not find any valid service in directory " << xmlPath;
return false;
}