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/AudioVideoManagement/main_handler.cpp
+11 -12
View File
@@ -38,7 +38,6 @@ using namespace AudioVideoManagement;
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler() = default;
@@ -49,7 +48,7 @@ bool MainHandler::init(int domainId)
m_dbHandler.reset(new DbHandler());
if (!m_dbHandler->init(0, Settings::settings()))
{
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
ERROR_LOG() << "Initialisation dbHandler failed.";
return false;
}
m_dbInterface = m_dbHandler->db();
@@ -58,7 +57,7 @@ bool MainHandler::init(int domainId)
m_ddsHandler.reset(new DdsHandler(domainId));
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
ERROR_LOG() << "Initialisation ddsHandler failed.";
return false;
}
@@ -83,7 +82,7 @@ bool MainHandler::init(int domainId)
connect(m_videoTeamHandler.get(), &HandlerVideoTeam::avDbReloadNeeded, m_exHandler.get(), &ExercisesHandler::onAvDbReloadNeeded);
if (!m_videoTeamHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerVideoTeam failed.";
ERROR_LOG() << "Initialisation HandlerVideoTeam failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -91,7 +90,7 @@ bool MainHandler::init(int domainId)
m_frequencyPlanningStatusHandler.reset(new HandlerFrequencyPlanningStatus(m_ddsHandler->dts(), m_ddsHandler->fts(), m_dbInterface.get()));
if (!m_frequencyPlanningStatusHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerFrequencyPlanningStatus failed.";
ERROR_LOG() << "Initialisation HandlerFrequencyPlanningStatus failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -109,7 +108,7 @@ bool MainHandler::init(int domainId)
connect(m_tvcHandler.get(), &TvcHandler::avDbReloadNeeded, m_exHandler.get(), &ExercisesHandler::onAvDbReloadNeeded);
if (!m_tvcHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation tvcHandler failed";
ERROR_LOG() << "Initialisation tvcHandler failed";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -117,7 +116,7 @@ bool MainHandler::init(int domainId)
m_frequencySetHandler.reset(new FrequencySetHandler(m_ddsHandler->dts(), m_dbInterface.get()));
if (!m_frequencySetHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation FrequencySetHandler failed";
ERROR_LOG() << "Initialisation FrequencySetHandler failed";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -131,14 +130,14 @@ bool MainHandler::init(int domainId)
m_frequencyPlanningHandler->setCnrHandler(m_cnrHandler.get());
if (!m_frequencyPlanningHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation FrequencyPlanningHandler failed";
ERROR_LOG() << "Initialisation FrequencyPlanningHandler failed";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
if (!m_cnrHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation cnrHandler failed";
ERROR_LOG() << "Initialisation cnrHandler failed";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -146,7 +145,7 @@ bool MainHandler::init(int domainId)
m_cnrTvcProfileHandler.reset(new CnrTvcProfileHandler(m_dbInterface.get(), m_ddsHandler->dts(), m_ddsHandler->fts(), m_cnrHandler.get(), m_tvcHandler.get()));
if (!m_cnrTvcProfileHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation RadioCircuitsHandler failed";
ERROR_LOG() << "Initialisation RadioCircuitsHandler failed";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -157,7 +156,7 @@ bool MainHandler::init(int domainId)
m_videoReceiverHandler.reset(new HandlerVideoReceiver(this, m_ddsHandler->dts(), m_ddsHandler->fts(), m_dbInterface.get()));
if (!m_videoReceiverHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerVideoReceiver failed.";
ERROR_LOG() << "Initialisation HandlerVideoReceiver failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -166,7 +165,7 @@ bool MainHandler::init(int domainId)
if (!m_ddsHandler->enableDtcClients())
{
ERROR_LOG(m_logger) << "Initialisation DTCs failed.";
ERROR_LOG() << "Initialisation DTCs failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}