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
+12
-12
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "main_handler_sqlite.h"
|
||||
#include <utility>
|
||||
|
||||
#include "db_reader.h"
|
||||
#include "static_publisher.h"
|
||||
@@ -16,12 +15,12 @@
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
#include <LtsScriptTimeline/track_entry.h>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QFile>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QSet>
|
||||
#include <QSqlError>
|
||||
|
||||
namespace SituationReplay
|
||||
{
|
||||
@@ -32,6 +31,7 @@ MainHandlerSqlite::MainHandlerSqlite()
|
||||
, m_staticPublisher(nullptr)
|
||||
, m_ddsInterface(nullptr)
|
||||
, m_dbHandler(nullptr)
|
||||
, m_logger(getLogger("MainHandlerSqlite"))
|
||||
{}
|
||||
|
||||
MainHandlerSqlite::~MainHandlerSqlite()
|
||||
@@ -254,7 +254,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
|
||||
|
||||
void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTime = "<< curTime
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTime = "<< curTime
|
||||
<< " m_currentVisibleOverlays.size()= "<< m_currentVisibleOverlays.size();
|
||||
|
||||
const qint64 curTimeRelative = curTime - m_replay.timeSpan.begin + m_replay.relativeTimeSpan.begin; // + m_replay.relativeTimeSpan.begin
|
||||
@@ -262,7 +262,7 @@ void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
|
||||
{
|
||||
const qint64 endTime = m_currentVisibleOverlays.at(i).relativeTimeSpan.end;
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
|
||||
|
||||
if (curTimeRelative > endTime)
|
||||
{
|
||||
@@ -277,16 +277,16 @@ void MainHandlerSqlite::replayTimeMaybeJumpedOverlays(qint64 curTime)
|
||||
// not really optimal
|
||||
QSet<int> oldOverlayIds;
|
||||
oldOverlayIds.reserve(m_currentVisibleOverlays.size());
|
||||
for (const FilterInformation &overlay : std::as_const(m_currentVisibleOverlays))
|
||||
for (const FilterInformation &overlay : qAsConst(m_currentVisibleOverlays))
|
||||
oldOverlayIds += overlay.overlayId;
|
||||
|
||||
m_curOverlayArrayIdx = -1;
|
||||
m_currentVisibleOverlays.clear();
|
||||
maybeAddNewOverlay(curTime);
|
||||
|
||||
for (const FilterInformation &overlay : std::as_const(m_currentVisibleOverlays))
|
||||
for (const FilterInformation &overlay : qAsConst(m_currentVisibleOverlays))
|
||||
oldOverlayIds -= overlay.overlayId;
|
||||
for (const int overlayId : std::as_const(oldOverlayIds))
|
||||
for (const int overlayId : qAsConst(oldOverlayIds))
|
||||
emit removeOverlay(overlayId);
|
||||
}
|
||||
|
||||
@@ -308,7 +308,7 @@ int MainHandlerSqlite::findNextIndex(qint64 curTime, int curIdx, const QVector<F
|
||||
// startTime: msec, rel. to begin of SCRIPT
|
||||
const qint64 startTime = data.at(nextIdx).relativeTimeSpan.begin;
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
|
||||
|
||||
if (curTimeRelative < startTime)
|
||||
return -1;
|
||||
|
||||
Reference in new issue
Block a user