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
+1
-2
@@ -8,7 +8,6 @@
|
||||
|
||||
|
||||
#include "participant_handler_for_replay.h"
|
||||
#include <utility>
|
||||
|
||||
#include "participant_for_replay.h"
|
||||
#include "ppm_record_replay_plugin_custom.h"
|
||||
@@ -89,7 +88,7 @@ void ParticipantHandlerForReplay::setDynamicParticipantData(const ParticipantMan
|
||||
|
||||
void ParticipantHandlerForReplay::publishData()
|
||||
{
|
||||
for (auto p : std::as_const(m_participants))
|
||||
for (auto p : qAsConst(m_participants))
|
||||
{
|
||||
p->publishParticipant();
|
||||
p->publishDynamicData();
|
||||
|
||||
+6
-7
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "ppm_record_replay_plugin_custom.h"
|
||||
#include <utility>
|
||||
#include "participant_handler_for_replay.h"
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <DDS/DTC/generic_dtc_impl.h>
|
||||
@@ -180,11 +179,11 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
|
||||
m_participantHandler->clearParticipants();
|
||||
INFO_LOG(m_logger) << "setReplayStartTime-clearParticipants " << startTime << " DONE";
|
||||
|
||||
for (const auto &ddsParticipant : std::as_const(m_participantMap))
|
||||
for (const auto &ddsParticipant : qAsConst(m_participantMap))
|
||||
m_participantHandler->createUpdateParticipant(ddsParticipant);
|
||||
INFO_LOG(m_logger) << "setReplayStartTime-createUpdateParticipant " << startTime << " DONE";
|
||||
|
||||
for (const auto &dynParticipant : std::as_const(m_dynamicParticipantDataMap))
|
||||
for (const auto &dynParticipant : qAsConst(m_dynamicParticipantDataMap))
|
||||
m_participantHandler->setDynamicParticipantData(dynParticipant);
|
||||
INFO_LOG(m_logger) << "setReplayStartTime-setDynamicParticipantData " << startTime << " DONE";
|
||||
|
||||
@@ -224,9 +223,9 @@ bool RecordReplayPluginCustom::publishData(qint64 desiredTime)
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const Participant &p : std::as_const(m_participantMap))
|
||||
for (const Participant &p : qAsConst(m_participantMap))
|
||||
m_participantHandler->createUpdateParticipant(p);
|
||||
for (const Participant &p : std::as_const(m_participantDisposedMap))
|
||||
for (const Participant &p : qAsConst(m_participantDisposedMap))
|
||||
m_participantHandler->removeParticipant(p);
|
||||
|
||||
setDataForParticipants(desiredTime);
|
||||
@@ -290,7 +289,7 @@ QVector<QFuture<void>> RecordReplayPluginCustom::makeConcurrentWithoutEquipNo(T
|
||||
it = content.erase(it);
|
||||
} // while
|
||||
|
||||
for (auto contentIndex : std::as_const(contentVec))
|
||||
for (auto contentIndex : qAsConst(contentVec))
|
||||
{
|
||||
// execute in workerThread
|
||||
result.append(QtConcurrent::run([this, contentIndex]()
|
||||
@@ -326,7 +325,7 @@ QVector<QFuture<void>> RecordReplayPluginCustom::makeConcurrent(T &content, qint
|
||||
it = content.erase(it);
|
||||
} // while
|
||||
|
||||
for (auto contentIndex : std::as_const(contentVec))
|
||||
for (auto contentIndex : qAsConst(contentVec))
|
||||
{
|
||||
// execute in workerThread
|
||||
result.append(QtConcurrent::run([this, contentIndex]()
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <TrainingAreaBase/tab_record_replay_plugin_custom.h>
|
||||
#include <ParticipantManagement/ppm_dts.h>
|
||||
#include <ParticipantManagement/ParticipantHandling/participant_handler.h>
|
||||
#include <QtCore/QFuture>
|
||||
#include <QFuture>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user