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
@@ -8,14 +8,13 @@
|
||||
*/
|
||||
|
||||
#include "tvc_handler.h"
|
||||
#include <utility>
|
||||
#include "dds_handler.h"
|
||||
#include "exercise_context.h"
|
||||
#include "active_exercises.h"
|
||||
#include "av_helper.h"
|
||||
#include <avm_dts.h>
|
||||
#include <algorithm>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonDocument>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
@@ -156,6 +155,7 @@ private:
|
||||
TvcHandler *m_handler;
|
||||
DatabaseInterface *m_db;
|
||||
QMap<int32_t, Database::AvmDeviceConfig> m_cache; // <TvcConfig::id, Database::DeviceConfig>
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -166,6 +166,7 @@ TvcHandler::TvcHandler(Interface::Dts *dts, Interface::Fts *fts, DatabaseInterfa
|
||||
, m_fts(fts)
|
||||
, m_db(db)
|
||||
, m_activeExercises(activeExercises)
|
||||
, m_logger(getLogger("TrainingVoiceCommunicationHandler"))
|
||||
, m_deviceConfig(new DeviceConfig(this, m_db, m_logger))
|
||||
{
|
||||
Q_ASSERT(dts);
|
||||
@@ -200,7 +201,7 @@ bool TvcHandler::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const AvmTvcChannel ¤tChannel : std::as_const(m_channels))
|
||||
for (const AvmTvcChannel ¤tChannel : qAsConst(m_channels))
|
||||
m_dts->publish(toDds(currentChannel));
|
||||
|
||||
QVector<AvmTvcConfig> tvcConfigs;
|
||||
@@ -211,7 +212,7 @@ bool TvcHandler::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const AvmTvcConfig ¤tConfig : std::as_const(tvcConfigs))
|
||||
for (const AvmTvcConfig ¤tConfig : qAsConst(tvcConfigs))
|
||||
createTvcConfig(toRequest(currentConfig, 0), currentConfig.id);
|
||||
|
||||
return true;
|
||||
@@ -411,7 +412,7 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig)
|
||||
|
||||
Database::AvmTvcChannel TvcHandler::channelById(int32_t id) const
|
||||
{
|
||||
for (const Database::AvmTvcChannel &channel : std::as_const(m_channels))
|
||||
for (const Database::AvmTvcChannel &channel : qAsConst(m_channels))
|
||||
if (channel.id == id)
|
||||
return channel;
|
||||
|
||||
@@ -423,7 +424,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context)
|
||||
{
|
||||
bool isFirstActiveExercise = m_activeExercises->count() == 1;
|
||||
|
||||
for (const TvcConfig &tvcConfig : std::as_const(m_cache))
|
||||
for (const TvcConfig &tvcConfig : qAsConst(m_cache))
|
||||
{
|
||||
bool isLocal = tvcConfig.exerciseId().is_set();
|
||||
if (isLocal)
|
||||
@@ -445,7 +446,7 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context)
|
||||
{
|
||||
bool haveActiveExercise = m_activeExercises->count() > 0;
|
||||
|
||||
for (const TvcConfig &tvcConfig : std::as_const(m_cache))
|
||||
for (const TvcConfig &tvcConfig : qAsConst(m_cache))
|
||||
{
|
||||
bool isLocal = tvcConfig.exerciseId().is_set();
|
||||
|
||||
@@ -525,7 +526,7 @@ Core::FunctionReplyObject TvcHandler::validateRequest(const ModifyTvcConfigReque
|
||||
*/
|
||||
bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &constraint, const boost::optional<int> &exerciseId, const boost::optional<int32_t> &excludeId) const
|
||||
{
|
||||
for (const TvcConfig &config : std::as_const(m_cache))
|
||||
for (const TvcConfig &config : qAsConst(m_cache))
|
||||
{
|
||||
if (excludeId == config.id())
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user