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
+5
-5
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "frequency_planning_handler.h"
|
||||
#include <utility>
|
||||
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include "frequency_set_handler.h"
|
||||
@@ -18,7 +17,7 @@
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include <QtCore/QSet>
|
||||
#include <QSet>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
@@ -118,6 +117,7 @@ FrequencyPlanningHandler::FrequencyPlanningHandler(Interface::Dts *dts, Interfac
|
||||
, m_db(db)
|
||||
, m_frequencySetHandler(frequencySetHandler)
|
||||
, m_activeExercises(activeExercises)
|
||||
, m_logger(getLogger("FrequencyPlanningHandler"))
|
||||
{
|
||||
Q_ASSERT(dts);
|
||||
Q_ASSERT(fts);
|
||||
@@ -160,7 +160,7 @@ bool FrequencyPlanningHandler::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const Database::AvmFrequencyPlanning &planContainerDb : std::as_const(frequencyPlannings))
|
||||
for (const Database::AvmFrequencyPlanning &planContainerDb : qAsConst(frequencyPlannings))
|
||||
collectAndPublish(planContainerDb);
|
||||
|
||||
auto cbAfp = [this] (const Database::AvmActiveFrequencyPlanning ¤tDbData)
|
||||
@@ -360,7 +360,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify
|
||||
for (const FrequencyPlanningData &entry : request.data())
|
||||
{
|
||||
QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties());
|
||||
for(const int &setEntry : std::as_const(frequencySetEntries))
|
||||
for(const int &setEntry : qAsConst(frequencySetEntries))
|
||||
{
|
||||
if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId(), setEntry))
|
||||
return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId());
|
||||
@@ -556,7 +556,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve
|
||||
for (const FrequencyPlanningData &fpdEntry : entries)
|
||||
{
|
||||
QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties());
|
||||
for(const int &setEntry : std::as_const(frequencySetEntries))
|
||||
for(const int &setEntry : qAsConst(frequencySetEntries))
|
||||
{
|
||||
if(takenSetEntries.contains(setEntry))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user