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
@@ -8,17 +8,16 @@
|
||||
|
||||
|
||||
#include "web_socket_avs.h"
|
||||
#include <utility>
|
||||
#include "web_socket_server.h"
|
||||
#include "main_handler.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <ExerciseEventManagement/eem_db.h>
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QWebSocket>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
|
||||
@@ -53,7 +52,8 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
|
||||
const std::shared_ptr<AudioVideoManagement::Interface::Dtc> &avmDtc,
|
||||
const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &ismDtc,
|
||||
int exerciseId,
|
||||
QObject *parent) : QObject(parent)
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(db)
|
||||
, m_eventServer(eventServer)
|
||||
@@ -65,8 +65,9 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
|
||||
, m_cleanupTimer(new QTimer(this))
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_lastUpdate(0)
|
||||
, m_bWebSocketDisconnectedWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_bWebSocketDisconnectedWarnedOnce(false)
|
||||
, m_logger(getLogger("WebSocketAvs"))
|
||||
{
|
||||
connect(m_wsReconnectTimer, &QTimer::timeout,
|
||||
this, &WebSocketAvs::openWebSocket);
|
||||
|
||||
@@ -563,7 +564,7 @@ void WebSocketAvs::onCleanUpDbInternal()
|
||||
|
||||
}
|
||||
|
||||
for (const AvsData &oldEntry : std::as_const(ntpRangeSortLocal))
|
||||
for (const AvsData &oldEntry : qAsConst(ntpRangeSortLocal))
|
||||
{
|
||||
const auto &item = collection.value(oldEntry.eventTime);
|
||||
|
||||
@@ -679,7 +680,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
|
||||
//qCritical() << "END select reading internal db ";
|
||||
DEBUG_LOG(m_logger) << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
|
||||
int j = 0;
|
||||
for (const auto &dataI : std::as_const(dataVec))
|
||||
for (const auto &dataI : qAsConst(dataVec))
|
||||
{
|
||||
if (m_lastUpdate > 0 && dataI.sampleTime < m_lastUpdate)
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user