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
@@ -48,7 +48,6 @@ namespace AreaEffectSimulation
|
||||
{
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
||||
QRandomGenerator(time(nullptr));
|
||||
@@ -96,7 +95,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if(!m_dbHandler->init(exerciseId, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -105,7 +104,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_dbHandlerEx0 = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandlerEx0->init(0, Settings::settings())) // need a second db connection due to username/password
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not init DbHandler";
|
||||
ERROR_LOG() << "Could not init DbHandler";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError,
|
||||
QStringLiteral("Could not init DbHandler"));
|
||||
return false;
|
||||
@@ -121,7 +120,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -159,7 +158,7 @@ bool MainHandler::initAESHandler()
|
||||
// prepare some basics for HandlerExplosionCluster
|
||||
// - TrajectoryGenerator
|
||||
// - LtsElevationManager
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " ****** std::make_shared<HandlerExplosionCluster...";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster...";
|
||||
const int exerciseId = dds()->exerciseId();
|
||||
LtsElevation::LTS_ELEVATION_MANAGER_TYPE ltsElevationManager = LtsElevation::LtsElevationManager::createInstance(exerciseId,
|
||||
dds()->exmDtc(),
|
||||
@@ -177,7 +176,7 @@ bool MainHandler::initAESHandler()
|
||||
#ifndef Q_OS_WIN // GUEZE-2195
|
||||
if (!ltsElevationManager)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " LtsElevation::createInstance failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " LtsElevation::createInstance failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -189,7 +188,7 @@ bool MainHandler::initAESHandler()
|
||||
this->dds()->asmDtc());
|
||||
if (!trajectoryGenerator)
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " TrajectoryGenerator::getInstance failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " TrajectoryGenerator::getInstance failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -197,7 +196,7 @@ bool MainHandler::initAESHandler()
|
||||
m_handlerExplosionCluster = std::make_shared<HandlerExplosionCluster>(this);
|
||||
if (!m_handlerExplosionCluster->init())
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " ****** std::make_shared<HandlerExplosionCluster... DONE";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster... DONE";
|
||||
|
||||
m_handlerFunctionalArea = std::make_shared<HandlerFunctionalArea>(this);
|
||||
if (!m_handlerFunctionalArea->init())
|
||||
@@ -249,7 +248,7 @@ bool MainHandler::initAESHandler()
|
||||
m_handlerBorderline = std::make_shared<HandlerBorderline>(this);
|
||||
if (!m_handlerBorderline->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerBorderline failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerBorderline failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -258,7 +257,7 @@ bool MainHandler::initAESHandler()
|
||||
m_handlerGasPipe = std::make_shared<HandlerGasPipe>(this);
|
||||
if (!m_handlerGasPipe->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerGasPipe failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerGasPipe failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -267,7 +266,7 @@ bool MainHandler::initAESHandler()
|
||||
m_handlerChargeEffect = std::make_shared<HandlerChargeEffect>(this);
|
||||
if (!m_handlerChargeEffect->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerChargeEffect failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -280,7 +279,7 @@ bool MainHandler::initAESHandler()
|
||||
m_handlerEffector = std::make_shared<HandlerEffector>(this);
|
||||
if (!m_handlerEffector->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Initialisation HandlerChargeEffect failed.";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user