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/group.cpp
+15 -16
View File
@@ -40,9 +40,8 @@ Group::Group(const std::shared_ptr<DdsHandler> &ddsHandler,
, m_groupId(s_idCounter++)
, m_groupData(groupData)
, m_completeCoreTimeout(0)
, m_logger(getLogger("Group"))
{
INFO_LOG(m_logger) << "Group "
INFO_LOG() << "Group "
<< m_scheme->groupType
<< " for partition "
<< groupData
@@ -78,7 +77,7 @@ void Group::init()
bool Group::setRunningState(Core::RunningState newState)
{
INFO_LOG(m_logger) << "Setting RunningState of group "
INFO_LOG() << "Setting RunningState of group "
<< m_scheme->groupType
<< " in exercisePartition "
<< m_groupData.exercisePartitionId()
@@ -110,10 +109,10 @@ void Group::startCore()
{
if (m_scheme->groupType != Core::ServiceGroupType::Core)
{
ERROR_LOG(m_logger) << "startCore() was invoked on a non Core Group object";
ERROR_LOG() << "startCore() was invoked on a non Core Group object";
return;
}
DEBUG_LOG(m_logger) << "Starting Core";
DEBUG_LOG() << "Starting Core";
// make sure all services are there
init();
@@ -125,7 +124,7 @@ void Group::startCore()
{
if ( proc->prio() == m_actPrio)
{
DEBUG_LOG(m_logger) << "startCore proc->start() "
DEBUG_LOG() << "startCore proc->start() "
<< proc->serviceName()
<< " prio=" << proc->prio()
<< " m_actPrio=" <<m_actPrio;
@@ -156,7 +155,7 @@ int Group::getNextPrio(QList <int> &prioList)
void Group::start()
{
QList <int> prioList;
DEBUG_LOG(m_logger) << "Group::start() m_actPrio=" << m_actPrio
DEBUG_LOG() << "Group::start() m_actPrio=" << m_actPrio
<< " groupId=" << m_groupId;
// make sure all services are there
init();
@@ -165,7 +164,7 @@ void Group::start()
{
if ( !prioList.contains(proc->prio()))
{
DEBUG_LOG(m_logger) << "prioList.append " << proc->prio()
DEBUG_LOG() << "prioList.append " << proc->prio()
<< " m_actPrio=" << m_actPrio
<< " groupId=" << m_groupId;
prioList.append(proc->prio());
@@ -181,7 +180,7 @@ void Group::start()
{
if ( m_actPrio == proc->prio())
{
DEBUG_LOG(m_logger) << "Group::start(): proc->start() "
DEBUG_LOG() << "Group::start(): proc->start() "
<< proc->serviceName()
<< " prio=" << proc->prio()
<< " m_actPrio=" << m_actPrio
@@ -281,7 +280,7 @@ void Group::onNewServiceInfo()
m_groupData.replayPartitionId(),
serviceIds);
TRACE_LOG(m_logger) << "Publishing new GroupInformation: " << info;
TRACE_LOG() << "Publishing new GroupInformation: " << info;
m_ddsHandler->dts()->publish(info);
}
@@ -291,7 +290,7 @@ void Group::onCompleteCoreTick()
QList <int> prioList;
if (QDateTime::currentMSecsSinceEpoch() > m_completeCoreTimeout)
{
ERROR_LOG(m_logger) << "Could not start group Core, because no Heartbeat for EXM with RunningState 'Running' was received.";
ERROR_LOG() << "Could not start group Core, because no Heartbeat for EXM with RunningState 'Running' was received.";
return;
}
@@ -308,7 +307,7 @@ void Group::onCompleteCoreTick()
}
if (exmProc == nullptr)
{
ERROR_LOG(m_logger) << "Could not find Process for EXM";
ERROR_LOG() << "Could not find Process for EXM";
return;
}
@@ -320,7 +319,7 @@ void Group::onCompleteCoreTick()
{
if ( !prioList.contains(proc->prio()))
{
DEBUG_LOG(m_logger) << "prioList.append " << proc->prio()
DEBUG_LOG() << "prioList.append " << proc->prio()
<< " m_actPrio=" << m_actPrio
<< " groupId=" << m_groupId;
prioList.append(proc->prio());
@@ -332,7 +331,7 @@ void Group::onCompleteCoreTick()
{
if (proc->state() != QProcess::Running && proc->prio() == m_actPrio)
{
DEBUG_LOG(m_logger) << "onCompleteCoreTick proc->start() "
DEBUG_LOG() << "onCompleteCoreTick proc->start() "
<< proc->serviceName()
<< " prio=" << proc->prio();
proc->start();
@@ -346,7 +345,7 @@ void Group::onCompleteCoreTick()
return;
}
else
DEBUG_LOG(m_logger) << "EXM has runningState " << exmProc->runningState();
DEBUG_LOG() << "EXM has runningState " << exmProc->runningState();
// start next completion attemp
QTimer::singleShot(1000, this, &Group::onCompleteCoreTick);
}
@@ -358,7 +357,7 @@ ServiceProcess *Group::procFromPid(Q_PID pid)
if (proc->pid() == pid)
return proc;
}
DEBUG_LOG(m_logger) << "Searched for not existing process with PID "
DEBUG_LOG() << "Searched for not existing process with PID "
<< pid;
return nullptr;
}