Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+16
-15
@@ -8,32 +8,33 @@
|
||||
|
||||
|
||||
#include "web_socket_server.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QUrlQuery>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QSqlError>
|
||||
#include <QTimer>
|
||||
#include <QUrlQuery>
|
||||
#include <QWebSocket>
|
||||
#include <QWebSocketServer>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *parent) : QObject(parent)
|
||||
WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_wsServer(nullptr)
|
||||
, m_cleanupTimer(new QTimer(this))
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("WebSocketEventServer"))
|
||||
{
|
||||
m_cleanupTimer->setInterval(10000); // clear every 10s
|
||||
connect(m_cleanupTimer, &QTimer::timeout, this, &WebSocketEventServer::onCleanupLiveHistory);
|
||||
}
|
||||
|
||||
WebSocketEventServer::~WebSocketEventServer()
|
||||
{
|
||||
for (auto s : std::as_const(m_liveSockets))
|
||||
for (auto s : qAsConst(m_liveSockets))
|
||||
{
|
||||
s->disconnect(this);
|
||||
s->close();
|
||||
@@ -82,7 +83,7 @@ void WebSocketEventServer::sendEvent(const QJsonObject &obj)
|
||||
{
|
||||
const QJsonDocument doc(obj);
|
||||
const QString msg = QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
|
||||
for (QWebSocket *ws : std::as_const(m_liveSockets))
|
||||
for (QWebSocket *ws : qAsConst(m_liveSockets))
|
||||
ws->sendTextMessage(msg);
|
||||
m_liveHistory[time(nullptr)].push_back(msg);
|
||||
}
|
||||
@@ -103,7 +104,7 @@ void WebSocketEventServer::onNewConnection()
|
||||
{
|
||||
connect(ws, &QWebSocket::disconnected,
|
||||
this, &WebSocketEventServer::onSocketDisconnected);
|
||||
for (const auto &historyVec : std::as_const(m_liveHistory))
|
||||
for (const auto &historyVec : qAsConst(m_liveHistory))
|
||||
{
|
||||
for (const auto &msg : historyVec)
|
||||
ws->sendTextMessage(msg);
|
||||
|
||||
Reference in new issue
Block a user