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
+11
-10
@@ -7,21 +7,22 @@
|
||||
*/
|
||||
|
||||
#include "web_socket_handler.h"
|
||||
#include <utility>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QWebSocket>
|
||||
#include <iostream>
|
||||
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonValue>
|
||||
#include <QJsonDocument>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("AVS-Server"), QWebSocketServer::NonSecureMode, this))
|
||||
, m_timer(new QTimer()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_timer(new QTimer())
|
||||
, m_logger(getLogger("Json.WebSocketHandler"))
|
||||
{
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &WebSocketHandler::onSendMessage);
|
||||
|
||||
@@ -31,7 +32,7 @@ WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
for (auto s : std::as_const(m_webSockets))
|
||||
for (auto s : qAsConst(m_webSockets))
|
||||
{
|
||||
s->disconnect(this);
|
||||
s->close();
|
||||
@@ -63,7 +64,7 @@ bool WebSocketHandler::sendTelegram(const QString &jsonStr)
|
||||
ERROR_LOG(m_logger) << "jsonStr" << jsonStr;
|
||||
|
||||
bool bOk = false;
|
||||
for (QWebSocket *ws : std::as_const(m_webSockets))
|
||||
for (QWebSocket *ws : qAsConst(m_webSockets))
|
||||
{
|
||||
if (ws->sendTextMessage(jsonStr))
|
||||
bOk = true;
|
||||
|
||||
+4
-4
@@ -8,11 +8,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
#include "../logger.h"
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
@@ -40,10 +40,10 @@ private Q_SLOTS:
|
||||
void onWebSocketDisconnected();
|
||||
void onSendMessage();
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QWebSocketServer *m_webSocketServer;
|
||||
QSet<QWebSocket *> m_webSockets;
|
||||
QTimer *m_timer;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user