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 @@ namespace ExerciseManagement
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
@@ -40,7 +39,7 @@ bool MainHandler::init(int domainId)
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -48,14 +47,14 @@ bool MainHandler::init(int domainId)
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(0, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// initialize DbAdministration
|
||||
if (!initDbAdminstration())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbAdministration failed.";
|
||||
ERROR_LOG() << "Initialisation dbAdministration failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -87,11 +86,11 @@ bool MainHandler::initDbAdminstration()
|
||||
connect(m_exTblGen.get(), &DBAdministration::ExerciseTableGenerator::aliveSignal,
|
||||
this, &MainHandler::sendKeepAlive);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise DbAdmin ";
|
||||
DEBUG_LOG() << "Initialise DbAdmin ";
|
||||
if (!m_exTblGen->init(m_dbHandler->db()->database(),
|
||||
m_dbHandler->db()->schemaName()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbAdminHandler failed.";
|
||||
ERROR_LOG() << "Initialisation dbAdminHandler failed.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -101,10 +100,10 @@ bool MainHandler::initExerciseHandler()
|
||||
{
|
||||
m_handlerExercise.reset(new HandlerExercise(this, m_ddsHandler, m_dbHandler->db(), m_exTblGen));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise ExerciseHandler ";
|
||||
DEBUG_LOG() << "Initialise ExerciseHandler ";
|
||||
if (!m_handlerExercise->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ExerciseHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ExerciseHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -115,10 +114,10 @@ bool MainHandler::initExercisePhaseHandler()
|
||||
{
|
||||
m_handlerExercisePhases.reset(new HandlerExercisePhase(this, m_ddsHandler, m_dbHandler->db()));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise ExercisePhaseHandler ";
|
||||
DEBUG_LOG() << "Initialise ExercisePhaseHandler ";
|
||||
if (!m_handlerExercisePhases->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ExercisePhaseHandler failed.";
|
||||
ERROR_LOG() << "Initialisation ExercisePhaseHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -128,10 +127,10 @@ bool MainHandler::initExercisePhaseHandler()
|
||||
bool MainHandler::initWebSocketHandler()
|
||||
{
|
||||
m_websocketHandler = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
|
||||
DEBUG_LOG(m_logger) << "Initialise WebSocketInterfaceHandler";
|
||||
DEBUG_LOG() << "Initialise WebSocketInterfaceHandler";
|
||||
if (!m_websocketHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user