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
+12
-12
@@ -7,13 +7,12 @@
|
||||
*/
|
||||
|
||||
#include "handler_base_download.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtSql/QSqlDriver>
|
||||
#include <QtSql/QSqlField>
|
||||
#include <QtSql/QSqlRecord>
|
||||
#include <QStringList>
|
||||
#include <QSettings>
|
||||
#include <QSqlDriver>
|
||||
#include <QSqlField>
|
||||
#include <QSqlRecord>
|
||||
|
||||
#include <ngldb/dbconnection.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
@@ -25,8 +24,8 @@
|
||||
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QUuid>
|
||||
#include <QDateTime>
|
||||
#include "copy_database.h"
|
||||
#include "main_handler.h"
|
||||
#include "settings.h"
|
||||
@@ -51,6 +50,7 @@ HandlerBaseDownload::HandlerBaseDownload(MainHandler *mainHandler, QObject *pare
|
||||
, m_remoteDbRetryCounter(0)
|
||||
, m_copyDatabase(new CopyDatabase(getLogger("HandlerBaseDownload"), this))
|
||||
, m_exTblGen(new DBAdministration::ExerciseTableGenerator(getLogger("ExerciseTableGenerator"), NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml")), this))
|
||||
, m_logger(getLogger("HandlerBaseDownload"))
|
||||
{
|
||||
connect(m_baseDownloadReplyUpdateTimer, &QTimer::timeout,
|
||||
this, &HandlerBaseDownload::updateBaseDownloadReply);
|
||||
@@ -1126,7 +1126,7 @@ void HandlerBaseDownload::removeOldExercises()
|
||||
}
|
||||
QVector<ExerciseManagement::Database::ExmExercise> exercises;
|
||||
exmDbHandler->db()->select(exercises);
|
||||
for (const auto &ex : std::as_const(exercises))
|
||||
for (const auto &ex : qAsConst(exercises))
|
||||
{
|
||||
if (m_exTblGen->dropExerciseSchema(ex.id, false))
|
||||
continue;
|
||||
@@ -1718,7 +1718,7 @@ void HandlerBaseDownload::copyFromOldDatabase()
|
||||
//TODO: add more tables if needed, check data in these tables, z.B. in rec_equipment_position.equipment_number is always negative (?!)
|
||||
|
||||
DBTransaction trans(m_dbConnection);
|
||||
for (const QString &table : std::as_const(tableList))
|
||||
for (const QString &table : qAsConst(tableList))
|
||||
{
|
||||
if (!copyTable(dbIn, m_dbConnection, table))
|
||||
ERROR_LOG(m_logger) << "Failed to copy table " << table;
|
||||
@@ -1852,7 +1852,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat
|
||||
QVector<Database::FlmFolder> flmFolderData;
|
||||
dbIfcNew->select(flmFolderData);
|
||||
qint64 folderId = -1;
|
||||
for (const auto &folder : std::as_const(flmFolderData))
|
||||
for (const auto &folder : qAsConst(flmFolderData))
|
||||
{
|
||||
if (folder.name == QStringLiteral("Snapshots"))
|
||||
{
|
||||
@@ -1868,7 +1868,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat
|
||||
|
||||
if (folderId > 0) // found Snapshots folder for the exercise id
|
||||
{
|
||||
for (auto data : std::as_const(flmData))
|
||||
for (auto data : qAsConst(flmData))
|
||||
{
|
||||
if (data.folderId == folderId || //snapshots
|
||||
(data.fileTypeId.underlying() == FileManagement::FileType::Pdf)) //old PDF
|
||||
|
||||
Reference in new issue
Block a user