lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
+17 -17
View File
@@ -134,7 +134,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
realUrl.setQuery(query);
m_webSocketEem->open(realUrl);
DEBUG_LOG(m_logger) << "requesting data from EEM: " << realUrl.toString();
DEBUG_LOG() << "requesting data from EEM: " << realUrl.toString();
}
TimelineDataProvider::~TimelineDataProvider()
@@ -157,13 +157,13 @@ void TimelineDataProvider::textMessageFromEem(const QString &message)
{
if (message.isEmpty() || message == QStringLiteral("{}"))
{
DEBUG_LOG(m_logger) << "textMessageFromEem - finished";
DEBUG_LOG() << "textMessageFromEem - finished";
disconnectedFromEem();
return;
}
const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
const QJsonArray arr = doc.array();
DEBUG_LOG(m_logger) << "textMessageFromEem - #events: " << arr.size();
DEBUG_LOG() << "textMessageFromEem - #events: " << arr.size();
m_eventData.reserve(m_eventData.size() + arr.size());
using namespace ExerciseEventManagement::Database;
std::transform(arr.begin(), arr.end(),
@@ -175,7 +175,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
{
if (!m_webSocketEem)
{
WARNING_LOG(m_logger) << "No connection to EEM - can not request data!";
WARNING_LOG() << "No connection to EEM - can not request data!";
return nullptr;
}
static int s_requestId = 0;
@@ -185,7 +185,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
connect(tldp, &TimelineDataProvider::finished, this, &ForeignInterfaceImpl::requestFinished);
connect(tldp, &TimelineDataProvider::destroyed, this, [this, curRequestId]() { m_pendingRequests.remove(curRequestId);});
m_pendingRequests[curRequestId] = tldp;
DEBUG_LOG(m_logger) << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
DEBUG_LOG() << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
return tldp;
}
@@ -208,26 +208,26 @@ void ForeignInterfaceImpl::connectToScm()
const QUrl scmUrl(QStringLiteral("ws://%1:%2")
.arg(NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET))
.arg(NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET)));
DEBUG_LOG(m_logger) << "Trying to connect to SCM at " << scmUrl.toString();
DEBUG_LOG() << "Trying to connect to SCM at " << scmUrl.toString();
m_webSocketScm->open(scmUrl);
}
void ForeignInterfaceImpl::connectedToScm()
{
DEBUG_LOG(m_logger) << "Connected to SCM...";
DEBUG_LOG() << "Connected to SCM...";
m_webSocketScm->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
}
void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
DEBUG_LOG(m_logger) << "textMessageFromScm from scm: " << message;
DEBUG_LOG() << "textMessageFromScm from scm: " << message;
const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
const QJsonArray exercises = doc.object().value(QStringLiteral("data")).toArray();
for (const QJsonValue &valEx : exercises)
{
const QJsonObject &exercise = valEx.toObject();
const int exerciseId = exercise.value(QStringLiteral("exerciseId")).toInt();
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - exerciseId " << exerciseId;
DEBUG_LOG() << "textMessageFromScm from scm - exerciseId " << exerciseId;
if (exerciseId != m_session->exerciseId())
continue;
@@ -237,7 +237,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
const QJsonObject &service = valSvc.toObject();
const QString svcName = service.value(QStringLiteral("nameAbbrevation")).toString().toUpper();
DEBUG_LOG(m_logger) << "textMessageFromScm from scm - svcName " << svcName;
DEBUG_LOG() << "textMessageFromScm from scm - svcName " << svcName;
if (svcName != QStringLiteral("EEM"))
continue;
@@ -272,24 +272,24 @@ void ForeignInterfaceImpl::connectToEem()
this, &ForeignInterfaceImpl::textMessageFromEem);
QUrl url(eemUrl());
url.setPath(QStringLiteral("/live"));
DEBUG_LOG(m_logger) << "Trying to connect to EEM at " << url.toString();
DEBUG_LOG() << "Trying to connect to EEM at " << url.toString();
m_webSocketEem->open(url);
}
void ForeignInterfaceImpl::connectedToEem()
{
DEBUG_LOG(m_logger) << "Connected to EEM...";
DEBUG_LOG() << "Connected to EEM...";
}
void ForeignInterfaceImpl::disconnectedFromEem()
{
WARNING_LOG(m_logger) << "EEM connection closed - try to reconnect";
WARNING_LOG() << "EEM connection closed - try to reconnect";
QTimer::singleShot(500, this, &ForeignInterfaceImpl::connectToScm);
}
void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
{
TRACE_LOG(m_logger) << "textMessageFromEem: " << message;
TRACE_LOG() << "textMessageFromEem: " << message;
const QJsonObject obj(QJsonDocument::fromJson(message.toUtf8()).object());
using namespace ExerciseEventManagement::Database;
@@ -303,16 +303,16 @@ void ForeignInterfaceImpl::requestFinished()
TimelineDataProvider *tldp = qobject_cast<TimelineDataProvider *>(sender());
if (!tldp)
{
WARNING_LOG(m_logger) << "requestFinished without valid sender";
WARNING_LOG() << "requestFinished without valid sender";
return;
}
auto it = m_pendingRequests.find(tldp->requestId());
if (it == m_pendingRequests.end())
{
WARNING_LOG(m_logger) << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
WARNING_LOG() << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
return;
}
DEBUG_LOG(m_logger) << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
DEBUG_LOG() << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
emit requestedDataAvailable(it.value());
it.value()->deleteLater();
m_pendingRequests.erase(it);