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
+11
-11
@@ -58,25 +58,25 @@ bool WebSocketHandler::sendTelegram(int typeId, const QJsonObject *data, int exe
|
||||
|
||||
bool WebSocketHandler::sendTelegram(const int wsId, const QJsonObject *data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Send Telegram esId=" << wsId
|
||||
DEBUG_LOG() << "Send Telegram esId=" << wsId
|
||||
<< ", m_connections.size=" << m_connections.size();
|
||||
|
||||
for (auto it = m_connections.begin(); it != m_connections.end(); it++)
|
||||
DEBUG_LOG(m_logger) << "key: " << it.key();
|
||||
DEBUG_LOG() << "key: " << it.key();
|
||||
|
||||
const QString jsonStr = QString::fromUtf8(QJsonDocument(*data).toJson(QJsonDocument::Compact));
|
||||
if(!m_connections.contains(wsId))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
|
||||
DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
|
||||
return false;
|
||||
}
|
||||
std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
|
||||
DEBUG_LOG() << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
|
||||
<< "." << ws->webSocket()->localPort()
|
||||
<< " PeerPort " << ws->webSocket()->peerAddress().toString()
|
||||
<< ":" <<ws->webSocket()->peerPort();
|
||||
DEBUG_LOG(m_logger) << "VERSION " << ws->webSocket()->version();
|
||||
DEBUG_LOG() << "VERSION " << ws->webSocket()->version();
|
||||
return ws->sendTextMessage(jsonStr);
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ bool WebSocketHandler::disconnectWs(int wsId)
|
||||
{
|
||||
if(!m_connections.contains(wsId))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
|
||||
DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
|
||||
return false;
|
||||
}
|
||||
std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
|
||||
@@ -124,7 +124,7 @@ int WebSocketHandler::getExerciseId(int wsId) const
|
||||
|
||||
void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Receive Telegram from SAA <<<<< " << baJson;
|
||||
DEBUG_LOG() << "Receive Telegram from SAA <<<<< " << baJson;
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
|
||||
WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
|
||||
@@ -147,7 +147,7 @@ void WebSocketHandler::onNewConnection()
|
||||
if (!ws)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
auto wsw = std::make_shared<WebSocketWrapper>(ws);
|
||||
int wsId = m_nextWsId;
|
||||
|
||||
@@ -158,7 +158,7 @@ void WebSocketHandler::onNewConnection()
|
||||
wsw->setWsId(wsId);
|
||||
emit newConnection( wsId, ws->peerAddress().toString(),ws->peerPort());
|
||||
m_connections.insert(wsId ,wsw);
|
||||
DEBUG_LOG(m_logger) << "m_connections.insert"
|
||||
DEBUG_LOG() << "m_connections.insert"
|
||||
<< ", wsId :" << wsId;
|
||||
m_nextWsId++;
|
||||
|
||||
@@ -181,10 +181,10 @@ void WebSocketHandler::onWebSocketDisconnected()
|
||||
for (auto it = copy.begin(); it != copy.end(); ++it)
|
||||
{
|
||||
auto wsw = *it;
|
||||
DEBUG_LOG(m_logger) << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
|
||||
DEBUG_LOG() << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
|
||||
if (wsw->webSocket() == ws)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
|
||||
DEBUG_LOG() << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
|
||||
emit wsDisconnected(it.key());
|
||||
m_connections.remove(it.key());
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user