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
+2
-2
@@ -46,14 +46,14 @@ private Q_SLOTS:
|
||||
void onSocketDisconnect();
|
||||
|
||||
private: // methods
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void sendMessages();
|
||||
|
||||
private: // attributes
|
||||
QWebSocket *m_socket;
|
||||
QQueue<Messages::ReplyMessage> m_messageQueue;
|
||||
QHostAddress m_ip;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
}; // class ClientConnection
|
||||
} // namespace Connection
|
||||
} // namespace WsBiteInterface
|
||||
|
||||
+6
-5
@@ -7,7 +7,6 @@
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-07
|
||||
*/
|
||||
#include "connection_handler.h"
|
||||
#include <utility>
|
||||
|
||||
#include "client_connection.h"
|
||||
#include "WsBiteInterface/Messages/message_transmitter.h"
|
||||
@@ -19,13 +18,15 @@
|
||||
|
||||
using namespace WarehouseGuez::WsBiteInterface::Connection;
|
||||
|
||||
ConnectionHandler::ConnectionHandler() : m_server(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
ConnectionHandler::ConnectionHandler()
|
||||
: m_server(nullptr)
|
||||
, m_logger(getLogger("ConnectionHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
ConnectionHandler::~ConnectionHandler()
|
||||
{
|
||||
for (auto s : std::as_const(m_connections))
|
||||
for (auto s : qAsConst(m_connections))
|
||||
s->disconnect(this);
|
||||
qDeleteAll(m_connections);
|
||||
}
|
||||
@@ -106,7 +107,7 @@ void ConnectionHandler::onDisconnected(ClientConnection *conn)
|
||||
/*
|
||||
void ConnectionHandler::onPositions(const ::WsBiteInterface::Messages::ReplyMessage &positionsCnr)
|
||||
{
|
||||
for (ClientConnection *currentConnection : std::as_const(m_connections))
|
||||
for (ClientConnection *currentConnection : qAsConst(m_connections))
|
||||
currentConnection->addMessage(positionsCnr);
|
||||
}
|
||||
*/
|
||||
+2
-2
@@ -50,10 +50,10 @@ private Q_SLOTS:
|
||||
void onDisconnected(ClientConnection *conn);
|
||||
|
||||
private: // attributes
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QWebSocketServer *m_server;
|
||||
QVector<ClientConnection *> m_connections;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace Connection
|
||||
} // namespace WsBiteInterface
|
||||
|
||||
+4
-2
@@ -18,8 +18,10 @@ namespace WsBiteInterface
|
||||
namespace Messages
|
||||
{
|
||||
|
||||
MessageHandler::MessageHandler(DataManager *dataManager) : m_dataManager(dataManager),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
MessageHandler::MessageHandler(DataManager *dataManager)
|
||||
: m_dataManager(dataManager)
|
||||
, m_logger(getLogger("MessageHandler"))
|
||||
{
|
||||
Q_ASSERT(dataManager);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -34,9 +34,9 @@ public Q_SLOTS:
|
||||
void onNewTextMessage(MessageTransmitter *transmitter, const QString &message);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
DataManager *m_dataManager;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace Messages
|
||||
} // namespace WsBiteInterface
|
||||
|
||||
+4
-4
@@ -13,13 +13,13 @@
|
||||
|
||||
#include <WarehouseGuez/WsBiteInterface/json_keys.h>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
|
||||
#include <LtsUtilsCore/outdated_position.h>
|
||||
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QMap>
|
||||
#include <QUuid>
|
||||
#include <QJsonDocument>
|
||||
|
||||
namespace WarehouseGuez
|
||||
{
|
||||
|
||||
+5
-5
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
|
||||
#include <WarehouseGuez/WsBiteInterface/Messages/ws_reply_message.h>
|
||||
#include "logger.h"
|
||||
@@ -66,8 +66,6 @@ private Q_SLOTS:
|
||||
|
||||
private: // methods
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void connectToTabWebSocket(int port, int exerciseId);
|
||||
|
||||
private: // attributes
|
||||
@@ -94,6 +92,8 @@ private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc; ///< Pointer to DTC Training Area Base interface object
|
||||
QTimer *m_timer = nullptr;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
}; // class DataManager
|
||||
} // namespace WsBiteInterface
|
||||
} // namespace WarehouseGuez
|
||||
+1
@@ -23,6 +23,7 @@ WsBiteInterfaceHandler::WsBiteInterfaceHandler(DataManager *dataManager)
|
||||
: m_dataManager(dataManager)
|
||||
, m_connectionHandler(nullptr)
|
||||
, m_messageHandler(nullptr)
|
||||
, m_logger(getLogger("WsBiteInterfaceHandler"))
|
||||
{
|
||||
Q_ASSERT(dataManager);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user