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
+10
-11
@@ -27,7 +27,6 @@ WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *pare
|
||||
, m_wsServer(nullptr)
|
||||
, m_cleanupTimer(new QTimer(this))
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("WebSocketEventServer"))
|
||||
{
|
||||
m_cleanupTimer->setInterval(10000); // clear every 10s
|
||||
connect(m_cleanupTimer, &QTimer::timeout, this, &WebSocketEventServer::onCleanupLiveHistory);
|
||||
@@ -95,7 +94,7 @@ void WebSocketEventServer::onNewConnection()
|
||||
QWebSocket *ws = m_wsServer->nextPendingConnection();
|
||||
if (!ws)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "New incoming connection from "
|
||||
DEBUG_LOG() << "New incoming connection from "
|
||||
<< ws->peerAddress().toString() << ":"
|
||||
<< ws->peerPort() << ", "
|
||||
<< ws->requestUrl().toString();
|
||||
@@ -116,7 +115,7 @@ void WebSocketEventServer::onNewConnection()
|
||||
historyDataRequested(m_db, ws, requestUrl);
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Unknown request path: '" << requestPath << "' - closing";
|
||||
WARNING_LOG() << "Unknown request path: '" << requestPath << "' - closing";
|
||||
ws->close();
|
||||
ws->deleteLater();
|
||||
}
|
||||
@@ -127,7 +126,7 @@ void WebSocketEventServer::onSocketDisconnected()
|
||||
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
|
||||
if (!ws)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "Disconnected from "
|
||||
DEBUG_LOG() << "Disconnected from "
|
||||
<< ws->peerAddress().toString() << ":"
|
||||
<< ws->peerPort() << ", "
|
||||
<< ws->requestUrl().toString();
|
||||
@@ -151,7 +150,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
|
||||
const qint64 to = query.queryItemValue(QStringLiteral("to")).toLongLong();
|
||||
if (requestId == 0 || from <= 0 || to <= 0 || from > to)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Unknown request: '" << requestUrl.toString() << "' - closing, "
|
||||
WARNING_LOG() << "Unknown request: '" << requestUrl.toString() << "' - closing, "
|
||||
<< requestId << ", " << from << ", to " << to;
|
||||
ws->sendTextMessage(QStringLiteral("{}"));
|
||||
ws->close();
|
||||
@@ -185,7 +184,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
|
||||
if (query.hasQueryItem(QStringLiteral("filter")))
|
||||
{
|
||||
const QString filterString = query.queryItemValue(QStringLiteral("filter"));
|
||||
DEBUG_LOG(m_logger) << "filter string: " << filterString;
|
||||
DEBUG_LOG() << "filter string: " << filterString;
|
||||
const QJsonObject obj(QJsonDocument::fromJson(filterString.toUtf8()).object());
|
||||
if (obj.keys().size() == 1)
|
||||
{
|
||||
@@ -211,16 +210,16 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
|
||||
if (query.hasQueryItem(QStringLiteral("limit")))
|
||||
{
|
||||
const QString limitString = query.queryItemValue(QStringLiteral("limit"));
|
||||
DEBUG_LOG(m_logger) << "limiting query to " << limitString << " events";
|
||||
DEBUG_LOG() << "limiting query to " << limitString << " events";
|
||||
stmt += QStringLiteral(" LIMIT ") + limitString;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "stmt: " << stmt;
|
||||
DEBUG_LOG() << "stmt: " << stmt;
|
||||
|
||||
NSqlQuery q(db);
|
||||
if (!q.exec(stmt))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error while selecting event-data: " << stmt << ", " << q.lastError().databaseText();
|
||||
ERROR_LOG() << "Error while selecting event-data: " << stmt << ", " << q.lastError().databaseText();
|
||||
ws->sendTextMessage(QStringLiteral("{}"));
|
||||
ws->close();
|
||||
ws->deleteLater();
|
||||
@@ -247,7 +246,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
|
||||
events.append(Database::toJson(data));
|
||||
if (events.size() > 100)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Sending an answer with " << events.size() << " events for query " << stmt;
|
||||
INFO_LOG() << "Sending an answer with " << events.size() << " events for query " << stmt;
|
||||
const QJsonDocument doc(events);
|
||||
ws->sendTextMessage(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
|
||||
events = QJsonArray();
|
||||
@@ -255,7 +254,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
|
||||
}
|
||||
if (!events.isEmpty())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Sending an answer with " << events.size() << " events for query " << stmt;
|
||||
INFO_LOG() << "Sending an answer with " << events.size() << " events for query " << stmt;
|
||||
const QJsonDocument doc(events);
|
||||
ws->sendTextMessage(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user