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
+7
-8
@@ -8,17 +8,16 @@
|
||||
*/
|
||||
|
||||
#include "handler_effect_area.h"
|
||||
#include <utility>
|
||||
#include "handler_main_structure_element.h"
|
||||
#include "handler_mounting_point_asset.h"
|
||||
#include "object_main_structure_element.h"
|
||||
#include "object_effect_area.h"
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QDebug>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
@@ -42,7 +41,7 @@ HandlerEffectArea::~HandlerEffectArea()
|
||||
bool HandlerEffectArea::init()
|
||||
{
|
||||
const QHash<int, ObjectMainStructureElement *> &objMseMap = m_mainHandler->getHandlerMainStructureElement()->getMainStructureElementsMap();
|
||||
for (const auto &objMse : std::as_const(objMseMap))
|
||||
for (const auto &objMse : qAsConst(objMseMap))
|
||||
{
|
||||
ObjectEffectArea *effectAreaObj = createEffectAreaForMse(objMse->getData());
|
||||
if (effectAreaObj)
|
||||
@@ -52,7 +51,7 @@ bool HandlerEffectArea::init()
|
||||
if (m_logger.isDebugEnabled())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "number of EffectAreas: " << m_objectEffectAreaMap.size();
|
||||
for (const auto &EffectAreaObj : std::as_const(m_objectEffectAreaMap))
|
||||
for (const auto &EffectAreaObj : qAsConst(m_objectEffectAreaMap))
|
||||
DEBUG_LOG(m_logger) << "EffectArea ID: " << EffectAreaObj->getId()
|
||||
<< " | area EGCU ID: " << EffectAreaObj->getAreaEgcuId();
|
||||
}
|
||||
@@ -129,7 +128,7 @@ std::vector<int32_t> HandlerEffectArea::egcuIdsFromJsonObject(const QJsonObject
|
||||
|
||||
const QJsonArray &egcuMountPoints = jsonObj.value(QStringLiteral("egcuMountpoints")).toArray(); // qAsConst does not work with r-value
|
||||
DEBUG_LOG(m_logger) << "egcuMountPoints.size=" << egcuMountPoints.size();
|
||||
for (const auto &egcuMountPnt : std::as_const(egcuMountPoints))
|
||||
for (const auto &egcuMountPnt : qAsConst(egcuMountPoints))
|
||||
{
|
||||
QJsonObject element = egcuMountPnt.toObject();
|
||||
int mountingPointId = element.value(QStringLiteral("id")).toInt();
|
||||
|
||||
Reference in new issue
Block a user