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
+10
-11
@@ -8,15 +8,14 @@
|
||||
*/
|
||||
|
||||
#include "pdm_dtc_impl_custom.h"
|
||||
#include <utility>
|
||||
#include "NGLLogger/INGLLogger.h"
|
||||
#include "pdm_translation.h"
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QVector>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QSet>
|
||||
#include <QVariant>
|
||||
#include <QVector>
|
||||
#include <DDS/DTC/generic_dtc.h>
|
||||
#include <DDS/Generic/generic_data_reader.h>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
@@ -1160,7 +1159,7 @@ QStringList DtcImplCustom::chargeNames(std::vector<int> &chargeIds)
|
||||
QStringList sl;
|
||||
auto uleisClassOffsets = it.value();
|
||||
sl.reserve(uleisClassOffsets.size());
|
||||
for (UleisClassOffset o : std::as_const(uleisClassOffsets))
|
||||
for (UleisClassOffset o : qAsConst(uleisClassOffsets))
|
||||
sl << offsetName(o);
|
||||
|
||||
if (sl.size() == 6)
|
||||
@@ -1616,7 +1615,7 @@ ProjectDataManagement::BuildingChargeEffect DtcImplCustom::getBuildingChargeEffe
|
||||
waitForHistoricalDataBuildingChargeEffect(2000);
|
||||
}
|
||||
|
||||
for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : std::as_const(m_buildingChargeEffectCont))
|
||||
for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : qAsConst(m_buildingChargeEffectCont))
|
||||
{
|
||||
if (bcEffect.chargeTypeId() == chargeTypeId)
|
||||
{
|
||||
@@ -1676,7 +1675,7 @@ QString DtcImplCustom::adlerLoadTypeName(int loadTypeId)
|
||||
|
||||
QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
|
||||
{
|
||||
for (const ProjectDataManagement::TargetType &targetTyp : std::as_const(m_targetTypeCont))
|
||||
for (const ProjectDataManagement::TargetType &targetTyp : qAsConst(m_targetTypeCont))
|
||||
{
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetTyp.properties().c_str(),
|
||||
targetTyp.properties().size())).object();
|
||||
@@ -1688,7 +1687,7 @@ QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
|
||||
|
||||
QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId)
|
||||
{
|
||||
for (const ProjectDataManagement::TargetSubType &targetSubTyp : std::as_const(m_targetSubTypeCont))
|
||||
for (const ProjectDataManagement::TargetSubType &targetSubTyp : qAsConst(m_targetSubTypeCont))
|
||||
{
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetSubTyp.properties().c_str(),
|
||||
targetSubTyp.properties().size())).object();
|
||||
|
||||
Reference in new issue
Block a user