lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
+15 -13
View File
@@ -2,6 +2,7 @@
#include "obd_base_downloader.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "ui_obd_base_downloader.h"
#include "obd_base_downloader_pdf_selector.h"
@@ -32,6 +33,7 @@ BaseDownloader::BaseDownloader(const QString &menuGroup, LtsSession::LtsSession
, m_exmDtc(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::BaseDownloader)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
m_ui->leStatus->setText(tr("Not Connected"));
@@ -121,15 +123,15 @@ bool BaseDownloader::init()
void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObject)
{
DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
switch (replyObject.replyState().underlying())
DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep << " \n" << replyObject.progress;
switch (replyObject.replyState)
{
case Core::FtReplyState::InProgress:
{
m_ftcTimer->start();
m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", replyObject.currentStep().c_str())));
m_messageDlg->setProgress(replyObject.progress());
m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", replyObject.currentStep.c_str())));
m_messageDlg->setProgress(replyObject.progress);
break;
}
case Core::FtReplyState::Completed:
@@ -147,7 +149,7 @@ void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObje
case Core::FtReplyState::Error:
{
m_ftcTimer->stop();
m_messageDlg->setText(tr("Error Downloading Base Data for Exercise %1 <br> Error: %2").arg(m_exerciseId).arg(QString::fromStdString(replyObject.errorString())));
m_messageDlg->setText(tr("Error Downloading Base Data for Exercise %1 <br> Error: %2").arg(m_exerciseId).arg(QString::fromStdString(replyObject.errorString)));
m_messageDlg->setCloseable(true);
m_ui->pbDownload->setEnabled(true);
m_ui->pbPdfDownload->setEnabled(true);
@@ -158,14 +160,14 @@ void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObje
void BaseDownloader::onStartPdfDownloadReply(const PdfDownloadReply &reply)
{
m_messageDlg->setText(QString::fromStdString(reply.currentStep()) + QStringLiteral(" ") + QString::number(reply.replyState().underlying()));
switch (reply.replyState().underlying())
m_messageDlg->setText(QString::fromStdString(reply.currentStep) + QStringLiteral(" ") + QString::number(static_cast<int>(reply.replyState)));
switch (reply.replyState)
{
case Core::FtReplyState::InProgress:
m_ftcTimer->start();
m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", reply.currentStep().c_str())));
m_messageDlg->setProgress(reply.progress());
m_messageDlg->setText(tr("Download in Progress <br> %1").arg(QCoreApplication::translate("dds", reply.currentStep.c_str())));
m_messageDlg->setProgress(reply.progress);
break;
case Core::FtReplyState::Completed:
{
@@ -199,7 +201,7 @@ void BaseDownloader::startBaseDownload()
if (ret != LtsWidgets::Button::Ok)
return;
m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id();
m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id;
const StartBaseDownloadRequest req(m_exerciseId,
@@ -347,9 +349,9 @@ void BaseDownloader::onFtcTimerTimeout()
void BaseDownloader::onPdfDownloadClicked()
{
m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id();
m_exerciseId = m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id;
if (m_exmDtc->exercise(m_exerciseId).id() != m_exerciseId)
if (m_exmDtc->exercise(m_exerciseId).id != m_exerciseId)
{
LtsWidgets::LtsMessageDialog::showMessage(this,
tr("Make sure to download exercise with ID %1 first.").arg(m_exerciseId),
@@ -375,7 +377,7 @@ void BaseDownloader::onPdfDownloadClicked()
if (m_ftc->startPdfDownloadRequest({pdfSel->checkedPdfIds(),
m_ui->leServer->text().toStdString(),
m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id()
m_model->getRowData(m_ui->tvExercises->currentIndex().row()).id
},
this))
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <AssetManagement/asm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <QtNetwork/QAbstractSocket>
qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.cpp
+2
View File
@@ -2,6 +2,7 @@
#include "obd_base_downloader_message.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_obd_base_downloader_message.h"
#include <LtsWidgets/lts_frameless_dialog.h>
@@ -12,6 +13,7 @@ namespace OcBaseDownload
BaseDownloaderMessage::BaseDownloaderMessage(QWidget *parent)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::BaseDownloaderMessage)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
connect(m_ui->pbClose, &QPushButton::clicked, this, &BaseDownloaderMessage::close);
qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.cpp
+5 -3
View File
@@ -2,6 +2,7 @@
#include "obd_base_downloader_pdf_selector.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_obd_base_downloader_pdf_selector.h"
#include <LtsWidgets/lts_frameless_dialog.h>
@@ -14,6 +15,7 @@ const char *BaseDownloaderPdfSelector::ID = "id";
BaseDownloaderPdfSelector::BaseDownloaderPdfSelector(QWidget *parent)
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::BaseDownloaderPdfSelector)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -38,7 +40,7 @@ void BaseDownloaderPdfSelector::keyPressEvent(QKeyEvent *e)
void BaseDownloaderPdfSelector::onGetPdfListReply(const PdfListReply &reply)
{
for (const OcBaseDownload::PdfInfo &currentDocument : reply.documents())
for (const OcBaseDownload::PdfInfo &currentDocument : reply.documents)
addFile(currentDocument);
m_ui->lblTotal->setText(tr("Total: %1").arg(m_chks.size()));
@@ -61,8 +63,8 @@ void BaseDownloaderPdfSelector::addFile(const OcBaseDownload::PdfInfo &document)
{
QCheckBox *chk = new QCheckBox(this);
chk->setText(QString::fromStdString(document.name()));
chk->setProperty(ID, QVariant(document.id()));
chk->setText(QString::fromStdString(document.name));
chk->setProperty(ID, QVariant(document.id));
m_chks.append(chk);
qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
+20 -18
View File
@@ -3,6 +3,7 @@
#include "obd_ex_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <ngltools/ngltools_dtg.h>
#include <QtCore/QJsonObject>
@@ -19,6 +20,7 @@ ExModel::ExModel(QObject *parent)
tr("Description"),
QStringLiteral("Id")},
parent)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
void ExModel::addExercise(const QJsonObject &exercise)
@@ -26,18 +28,18 @@ void ExModel::addExercise(const QJsonObject &exercise)
ExerciseManagement::Exercise ex;
ex.name(exercise.value(QLatin1String("name")).toString().toStdString());
ex.beginTime(exercise.value(QLatin1String("beginTime")).toDouble());
ex.endTime(exercise.value(QLatin1String("endTime")).toDouble());
ex.defaultTimeZone(exercise.value(QLatin1String("timeZone")).toString().toStdString().c_str()[0]);
ex.startTime(exercise.value(QLatin1String("startTime")).toDouble());
ex.stopTime(exercise.value(QLatin1String("stopTime")).toDouble());
ex.state(static_cast<ExerciseManagement::ExerciseState>(exercise.value(QLatin1String("status")).toInt()));
ex.description(exercise.value(QLatin1String("description")).toString().toStdString());
ex.id(exercise.value(QLatin1String("id")).toInt());
ex.trainingAreaId(exercise.value(QLatin1String("trainingAreaId")).toInt());
ex.name = exercise.value(QLatin1String("name")).toString().toStdString();
ex.beginTime = exercise.value(QLatin1String("beginTime")).toDouble();
ex.endTime = exercise.value(QLatin1String("endTime")).toDouble();
ex.defaultTimeZone = exercise.value(QLatin1String("timeZone")).toString().toStdString().c_str()[0];
ex.startTime = exercise.value(QLatin1String("startTime")).toDouble();
ex.stopTime = exercise.value(QLatin1String("stopTime")).toDouble();
ex.state = static_cast<ExerciseManagement::ExerciseState>(exercise.value(QLatin1String("status")).toInt());
ex.description = exercise.value(QLatin1String("description")).toString().toStdString();
ex.id = exercise.value(QLatin1String("id")).toInt();
ex.trainingAreaId = exercise.value(QLatin1String("trainingAreaId")).toInt();
if (ex.id() > 0 && (ex.state() == ExerciseManagement::ExerciseState::Started || ex.state() == ExerciseManagement::ExerciseState::Paused ) )
if (ex.id > 0 && (ex.state == ExerciseManagement::ExerciseState::Started || ex.state == ExerciseManagement::ExerciseState::Paused ) )
insertRow(ex);
}
@@ -52,15 +54,15 @@ QVariant ExModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case ExModel::Columns::Name:
return QString::fromStdString(ex.name());
return QString::fromStdString(ex.name);
case ExModel::Columns::Begin:
return QDateTime::fromMSecsSinceEpoch(ex.beginTime());
return QDateTime::fromMSecsSinceEpoch(ex.beginTime);
case ExModel::Columns::End:
return QDateTime::fromMSecsSinceEpoch(ex.endTime());
return QDateTime::fromMSecsSinceEpoch(ex.endTime);
case ExModel::Columns::Description:
return QString::fromStdString(ex.description());
return QString::fromStdString(ex.description);
case ExModel::Columns::Id:
return ex.id();
return ex.id;
}
return QVariant();
@@ -84,9 +86,9 @@ bool ExProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &s
switch (source_left.column())
{
case ExModel::Begin:
return dataLeft.beginTime() < dataRight.beginTime();
return dataLeft.beginTime < dataRight.beginTime;
case ExModel::End:
return dataLeft.endTime() < dataRight.endTime();
return dataLeft.endTime < dataRight.endTime;
case ExModel::Name:
case ExModel::Description:
qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h
+1 -1
View File
@@ -12,7 +12,7 @@
namespace OcBaseDownload
{
class ExModel final : public LtsWidgets::LtsAbstractTableModel<Exercise>
class ExModel final : public LtsWidgets::LtsAbstractTableModel<ExerciseManagement::Exercise>
{
Q_OBJECT