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
+13
-14
@@ -1,10 +1,9 @@
|
||||
#include "static_pvsan_import.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSet>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QDir>
|
||||
#include <QSet>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
@@ -294,7 +293,7 @@ bool PvSanImport::addProcedures(const QVector<QString> &procedures)
|
||||
QVector<Database::PdmTranslation> translations;
|
||||
m_db->select(translations);
|
||||
QSet<quint64> idsToRemove;
|
||||
for (const auto &tr : std::as_const(translations))
|
||||
for (const auto &tr : qAsConst(translations))
|
||||
{
|
||||
if (tr.context == myContext)
|
||||
idsToRemove.insert(tr.id);
|
||||
@@ -419,7 +418,7 @@ bool PvSanImport::addMaterial(const QVector<QString> &material)
|
||||
QVector<Database::PdmTranslation> translations;
|
||||
m_db->select(translations);
|
||||
QSet<quint64> idsToRemove;
|
||||
for (const auto &tr : std::as_const(translations))
|
||||
for (const auto &tr : qAsConst(translations))
|
||||
{
|
||||
if (tr.context == myContext)
|
||||
idsToRemove.insert(tr.id);
|
||||
@@ -482,7 +481,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
QVector<Database::PdmTranslation> translations;
|
||||
m_db->select(translations);
|
||||
QSet<quint64> idsToRemove;
|
||||
for (const auto &tr : std::as_const(translations))
|
||||
for (const auto &tr : qAsConst(translations))
|
||||
{
|
||||
if (tr.context == myContext)
|
||||
idsToRemove.insert(tr.id);
|
||||
@@ -496,7 +495,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
//insert into db
|
||||
trans.context = myContext;
|
||||
Database::PdmSanitationInjuryKind injuryKindDb;
|
||||
for (const QString &kd : std::as_const(kind))
|
||||
for (const QString &kd : qAsConst(kind))
|
||||
{
|
||||
QStringList kde = kd.split(QStringLiteral(";"));
|
||||
if (kde.size() < 3 )
|
||||
@@ -527,7 +526,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
myContext = QStringLiteral("SanitationInjuryPlace1");
|
||||
m_db->truncatePdmSanitationInjuryPlace1();
|
||||
idsToRemove.clear();
|
||||
for (const auto &tr : std::as_const(translations))
|
||||
for (const auto &tr : qAsConst(translations))
|
||||
{
|
||||
if (tr.context == myContext)
|
||||
idsToRemove.insert(tr.id);
|
||||
@@ -541,7 +540,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
//insert into db
|
||||
trans.context = myContext;
|
||||
Database::PdmSanitationInjuryPlace1 placeDb;
|
||||
for (const QString &place : std::as_const(place1))
|
||||
for (const QString &place : qAsConst(place1))
|
||||
{
|
||||
QStringList pl = place.split(QStringLiteral(";"));
|
||||
if (pl.size() < 3 )
|
||||
@@ -573,7 +572,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
myContext = QStringLiteral("SanitationInjuryPlace2");
|
||||
m_db->truncatePdmSanitationInjuryPlace2();
|
||||
idsToRemove.clear();
|
||||
for (const auto &tr : std::as_const(translations))
|
||||
for (const auto &tr : qAsConst(translations))
|
||||
{
|
||||
if (tr.context == myContext)
|
||||
idsToRemove.insert(tr.id);
|
||||
@@ -587,7 +586,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
|
||||
//insert into db
|
||||
trans.context = myContext;
|
||||
Database::PdmSanitationInjuryPlace2 place2Db;
|
||||
for (const QString &place : std::as_const(place2))
|
||||
for (const QString &place : qAsConst(place2))
|
||||
{
|
||||
QStringList pl = place.split(QStringLiteral(";"));
|
||||
if (pl.size() < 3 )
|
||||
@@ -634,7 +633,7 @@ bool PvSanImport::addInjuries(const QVector<QString> &injuries)
|
||||
trans.context = myContext;
|
||||
Database::PdmSanitationInjury injuryDb;
|
||||
int id = 1;
|
||||
for (const QString &injury : std::as_const(injuries))
|
||||
for (const QString &injury : qAsConst(injuries))
|
||||
{
|
||||
QStringList kde = injury.split(QStringLiteral(";"));
|
||||
if (kde.size() < 29 )
|
||||
|
||||
Reference in new issue
Block a user