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
@@ -54,7 +54,6 @@ PrtCnvApplication::PrtCnvApplication()
|
||||
: m_Config(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_accessMutex(QMutex::Recursive)
|
||||
, m_logger(getLogger("PrtCnvApplication"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -71,7 +70,7 @@ PrtCnvApplication::~PrtCnvApplication()
|
||||
|
||||
void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Wait for others until we can create " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Wait for others until we can create " << threadIdToString(a_threadId);
|
||||
setConstructed(a_threadId);
|
||||
switch (a_threadId)
|
||||
{
|
||||
@@ -81,7 +80,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
|
||||
isConstructed(e_Log) &&
|
||||
isConstructed(e_Injection)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -92,7 +91,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
|
||||
isConstructed(e_Log) &&
|
||||
isConstructed(e_Injection)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -101,14 +100,14 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
|
||||
while (!(isConstructed(e_Radio) &&
|
||||
isConstructed(e_Central)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Now we can create " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Now we can create " << threadIdToString(a_threadId);
|
||||
}
|
||||
|
||||
|
||||
@@ -117,7 +116,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
|
||||
|
||||
void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Wait for others until we can initialize " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Wait for others until we can initialize " << threadIdToString(a_threadId);
|
||||
setCreated(a_threadId);
|
||||
switch (a_threadId)
|
||||
{
|
||||
@@ -125,7 +124,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
|
||||
while (!(isCreated(e_Db) &&
|
||||
isCreated(e_Radio)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -134,7 +133,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
|
||||
while (!(isCreated(e_Db) &&
|
||||
isCreated(e_Central)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -143,14 +142,14 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
|
||||
while (!(isCreated(e_Radio) &&
|
||||
isCreated(e_Central)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Now we can initialize " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Now we can initialize " << threadIdToString(a_threadId);
|
||||
}
|
||||
|
||||
|
||||
@@ -158,7 +157,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
|
||||
|
||||
void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Wait for others until we can start " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Wait for others until we can start " << threadIdToString(a_threadId);
|
||||
setInitialized(a_threadId);
|
||||
switch (a_threadId)
|
||||
{
|
||||
@@ -168,7 +167,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
|
||||
isStarted(e_Log) &&
|
||||
isStarted(e_Injection)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -180,7 +179,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
|
||||
isStarted(e_Injection) &&
|
||||
isInitialized(e_RadioTraffic)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -190,7 +189,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
|
||||
isInitialized(e_Central) &&
|
||||
isStarted(e_Log)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
@@ -199,14 +198,14 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
|
||||
while (!(isInitialized(e_Radio) &&
|
||||
isStarted(e_Log)))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "wait...";
|
||||
DEBUG_LOG() << "wait...";
|
||||
QThread::sleep(1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Now we can start " << threadIdToString(a_threadId);
|
||||
INFO_LOG() << "Now we can start " << threadIdToString(a_threadId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user