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/VideoOverlayManagement/handler_overlays.cpp
+11 -12
View File
@@ -25,7 +25,6 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
, m_handlerParticipantData(handlerParticipantData)
, m_handlerInfrastructureData(handlerInfrastructureData)
, m_exerciseId(exerciseId)
, m_logger(getLogger("HandlerOverlays"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -37,7 +36,7 @@ HandlerOverlays::~HandlerOverlays()
bool HandlerOverlays::init()
{
INFO_LOG(m_logger) << "Start VideoOverlay Handler.";
INFO_LOG() << "Start VideoOverlay Handler.";
// internal Signal/Slot connection (must be done before calling initParticipantsInRoomMap() !)
connect(this, &HandlerOverlays::participantsInRoomMapChanged,
@@ -49,7 +48,7 @@ bool HandlerOverlays::init()
connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
this, &HandlerOverlays::onParticipantPositionChanged);
INFO_LOG(m_logger) << "VOM Handler initialized. ";
INFO_LOG() << "VOM Handler initialized. ";
return true;
} // end of init()
@@ -57,7 +56,7 @@ bool HandlerOverlays::init()
void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId, int participantId)
{
DEBUG_LOG(m_logger) << "onParticipantPositionChanged() "
DEBUG_LOG() << "onParticipantPositionChanged() "
<< " oldRoomId: " << oldRoomId
<< " newRoomId: " << newRoomId
<< " participantId: " << participantId
@@ -73,7 +72,7 @@ void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId,
void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants)
{
DEBUG_LOG(m_logger) << "onParticipantsInRoomMapChanged() "
DEBUG_LOG() << "onParticipantsInRoomMapChanged() "
<< " roomId: " << roomId
<< " partId: " << getAllEquipmentNumbers(participants, false)
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
@@ -82,7 +81,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
if (!m_handlerInfrastructureData->isCameraAvailable(roomId))
{
WARNING_LOG(m_logger) << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
WARNING_LOG() << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
return;
}
@@ -94,7 +93,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
if (streamName.isEmpty())
{
ERROR_LOG(m_logger) << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
ERROR_LOG() << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
return;
}
@@ -117,7 +116,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
QByteArray qba = cmd.toLatin1();
qba += "\r\n";
INFO_LOG(m_logger) << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
INFO_LOG() << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
m_avsIf->sendCommand(qba);
// room entry der keine participants enthaelt loeschen
@@ -138,7 +137,7 @@ void HandlerOverlays::initParticipantsInRoomMap()
void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participantId)
{
DEBUG_LOG(m_logger) << "addPartIdToParticipantsInRoomMap() "
DEBUG_LOG() << "addPartIdToParticipantsInRoomMap() "
<< " roomId: " << roomId
<< " participantId: " << participantId
;
@@ -155,7 +154,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
m_participantsInRoomMap.insert(roomId, participants);
///
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
<< " roomId: " << roomId
<< " partId: " << getAllEquipmentNumbers(participants, false)
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
@@ -168,7 +167,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int participantId)
{
DEBUG_LOG(m_logger) << "removePartIdFromParticipantsInRoomMap() "
DEBUG_LOG() << "removePartIdFromParticipantsInRoomMap() "
<< " roomId: " << roomId
<< " participantId: " << participantId
;
@@ -182,7 +181,7 @@ void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int part
participants.remove(participantId);
m_participantsInRoomMap.insert(roomId, participants);
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
<< " roomId: " << roomId
<< " partId: " << getAllEquipmentNumbers(participants, false)
<< " eqNo: " << getAllEquipmentNumbers(participants, true)