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
@@ -25,7 +25,6 @@ namespace PrtCnv
|
||||
PrtCnvInjectionSocket::PrtCnvInjectionSocket()
|
||||
: m_Socket(nullptr)
|
||||
, m_Server(nullptr)
|
||||
, m_logger(getLogger("PrtCnvInjectionSocket"))
|
||||
{}
|
||||
|
||||
PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
|
||||
@@ -38,7 +37,7 @@ PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
|
||||
|
||||
void PrtCnvInjectionSocket::disconnectClient()
|
||||
{
|
||||
INFO_LOG(m_logger) << "A client has disconnected from the injection-server";
|
||||
INFO_LOG() << "A client has disconnected from the injection-server";
|
||||
emit disconnected(this);
|
||||
}
|
||||
|
||||
@@ -48,7 +47,7 @@ void PrtCnvInjectionSocket::disconnectClient()
|
||||
|
||||
void PrtCnvInjectionSocket::processInputData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Injection-server has data received";
|
||||
INFO_LOG() << "Injection-server has data received";
|
||||
N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
|
||||
qint64 bytesRead = m_Socket->peek((char*)&injectionHeader, sizeof(injectionHeader));
|
||||
if (sizeof(injectionHeader) == bytesRead)
|
||||
@@ -59,7 +58,7 @@ void PrtCnvInjectionSocket::processInputData()
|
||||
qint64 available = m_Socket->bytesAvailable();
|
||||
if (available < (injectionHeader.m_Size+sizeof(injectionHeader)))
|
||||
{
|
||||
INFO_LOG(m_logger) << "not enough bytes available - waiting for more data: "
|
||||
INFO_LOG() << "not enough bytes available - waiting for more data: "
|
||||
<< "headersize=" << sizeof(injectionHeader) << " id1="
|
||||
<< injectionHeader.m_Id1 << " id2=" << injectionHeader.m_Id2
|
||||
<< " kind=" << (int)injectionHeader.m_Kind << " size="
|
||||
@@ -86,26 +85,26 @@ void PrtCnvInjectionSocket::processInputData()
|
||||
if (N_CoPrtCnv::CoPrtCnvInjectionHeader::eCentral == injectionHeader.m_Kind &&
|
||||
tele->telegramId() != TrainingAreaBase::TetraIcd::TelegramId::DATENVERKEHR_TDS_SRT)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got an injection-central-telegram with telId=" << tele->telegramId();
|
||||
INFO_LOG() << "Got an injection-central-telegram with telId=" << tele->telegramId();
|
||||
m_Server->addToCentralList(tele);
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got an injection-radio-telegram with telId=" << tele->telegramId();
|
||||
INFO_LOG() << "Got an injection-radio-telegram with telId=" << tele->telegramId();
|
||||
m_Server->addToRadioList(tele);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
|
||||
ERROR_LOG() << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Corrupt injection-telegram received => reconnect";
|
||||
ERROR_LOG() << "Corrupt injection-telegram received => reconnect";
|
||||
m_Socket->disconnectFromHost();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user