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
@@ -43,13 +43,13 @@ Initialization::~Initialization()
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
|
||||
const QSqlDatabase &)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start GuezNasat Initialization.";
|
||||
INFO_LOG() << "Start GuezNasat Initialization.";
|
||||
|
||||
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
if (!m_dbHandler->init(ddsConnector->getPartitionId(), Settings::settings()))
|
||||
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -80,16 +80,16 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
|
||||
if (Settings::useWebSocket())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Using WebSocket";
|
||||
INFO_LOG() << "Using WebSocket";
|
||||
m_jsonSocketHandler.reset(new WebSocketHandler);
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Using TcpSocket";
|
||||
INFO_LOG() << "Using TcpSocket";
|
||||
m_jsonSocketHandler.reset(new TcpSocketHandler);
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "GuezNasat Initialization initialized";
|
||||
INFO_LOG() << "GuezNasat Initialization initialized";
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -97,7 +97,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
|
||||
bool Initialization::loadFromDatabase()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << "START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << "START";
|
||||
|
||||
if (!m_ddsHandler ||
|
||||
!m_dbHandler ||
|
||||
@@ -111,27 +111,27 @@ bool Initialization::loadFromDatabase()
|
||||
|
||||
if (!m_handlerNasatAircraft->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerNasatAircraft failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerNasatAircraft failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerNasatAircraftParticipant->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerNasatAircraftParticipant failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerNasatAircraftParticipant failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerNasatImpact->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerNasatImpact failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerNasatImpact failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerNasatNineLiner->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerNasatNineLiner failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerNasatNineLiner failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerParticipant->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ParticipantPositionPublisher failed.";
|
||||
ERROR_LOG() << "Initialisation ParticipantPositionPublisher failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -147,13 +147,13 @@ bool Initialization::loadFromDatabase()
|
||||
NOTICE_LOG(m_logger) << "Initialisation SocketHandler ....";
|
||||
if (!m_jsonSocketHandler->init(Settings::socketListenPort()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketHandler failed.";
|
||||
ERROR_LOG() << "Initialisation WebSocketHandler failed.";
|
||||
}
|
||||
});
|
||||
#else
|
||||
if (!m_jsonSocketHandler->init(Settings::socketListenPort()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketHandler failed.";
|
||||
ERROR_LOG() << "Initialisation WebSocketHandler failed.";
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
@@ -171,7 +171,7 @@ bool Initialization::loadFromDatabase()
|
||||
QObject::connect(m_jsonSocketHandler.get(), &AbstractSocketHandler::nineLinerReceived,
|
||||
m_handlerNasatNineLiner.get(), &HandlerNasatNineLiner::nineLinerReceived);
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << "END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << "END";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user