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/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_model.cpp
+5 -5
View File
@@ -69,12 +69,12 @@ QVariant ConfigureMapUrlModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case Columns::Url:
return QString::fromStdString(md.url());
return QString::fromStdString(md.url);
case Columns::Name:
return QString::fromStdString(md.name());
return QString::fromStdString(md.name);
case Columns::MapType:
{
switch (md.mapTypeId().underlying())
switch (md.mapTypeId)
{
case AssetManagement::MapType::Aerial:
return tr("Aerial");
@@ -90,9 +90,9 @@ QVariant ConfigureMapUrlModel::data(const QModelIndex &index, int role) const
return tr("Unknown");
}
case Columns::MinScale:
return md.minScale();
return md.minScale;
case Columns::MaxScale:
return md.maxScale();
return md.maxScale;
}
return QVariant();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
+9 -9
View File
@@ -56,19 +56,19 @@ void ConfigureSingleMapUrl::setPlaceholderTextForFile()
void ConfigureSingleMapUrl::setData(const ConfigureSingleMapUrl::DATA_T &data)
{
m_ui->le_url->setText(QString::fromStdString(data.url()));
m_ui->le_name->setText(QString::fromStdString(data.name()));
m_ui->le_minScale->setText(QString::number(data.minScale()));
m_ui->le_maxScale->setText(QString::number(data.maxScale()));
m_ui->le_url->setText(QString::fromStdString(data.url));
m_ui->le_name->setText(QString::fromStdString(data.name));
m_ui->le_minScale->setText(QString::number(data.minScale));
m_ui->le_maxScale->setText(QString::number(data.maxScale));
}
ConfigureSingleMapUrl::DATA_T ConfigureSingleMapUrl::data()
{
ConfigureSingleMapUrl::DATA_T data;
data.url(m_ui->le_url->text().trimmed().toStdString());
data.name(m_ui->le_name->text().trimmed().toStdString());
data.minScale(m_ui->le_minScale->text().toDouble());
data.maxScale(m_ui->le_maxScale->text().toDouble());
data.url = m_ui->le_url->text().trimmed().toStdString();
data.name = m_ui->le_name->text().trimmed().toStdString();
data.minScale = m_ui->le_minScale->text().toDouble();
data.maxScale = m_ui->le_maxScale->text().toDouble();
return data;
}
@@ -88,7 +88,7 @@ void ConfigureSingleMapUrl::onClose()
ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent) : QWidget(parent)
, m_ui(new Ui::Configure_Urls_Widget),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
m_logger(getLogger("ConfigureMapUrlsWidget")) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
+2 -2
View File
@@ -60,8 +60,6 @@ protected Q_SLOTS:
void onClose();
private:
NGL::INGLLogger &m_logger;
Ui::Configure_Single_Url *m_ui;
LtsWidgets::LtsDialogButtonBox *m_buttonBox;
};
@@ -106,6 +104,8 @@ private:
Ui::Configure_Urls_Widget *m_ui;
ConfigureMapUrlModel *m_configureMapUrlModel = nullptr;
bool m_placeholderTextFile = false;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
+23 -22
View File
@@ -18,6 +18,7 @@ namespace SituationMap
ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
: LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_logger(getLogger("ConfigureMapUrls"))
, m_pluginProvider(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::Configure_Urls)
@@ -121,7 +122,7 @@ void ConfigureMapUrls::fillTrainingAreaCbx()
m_ui->cbTrainingArea->clear();
auto cb = [this](const AssetManagement::TrainingArea & ta)
{
m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name()), QVariant(ta.id()));
m_ui->cbTrainingArea->addItem(QString::fromStdString(ta.name), QVariant(ta.id));
};
m_asmDtc->trainingAreas(cb);
m_ui->cbTrainingArea->model()->sort(0);
@@ -148,7 +149,7 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
if (m_trainingArea.id() == newTrainingAreaId)
if (m_trainingArea.id == newTrainingAreaId)
return;
if (hasUnsavedChanges())
@@ -164,8 +165,8 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
}
break;
case LtsWidgets::Button::Cancel:
INFO_LOG(m_logger) << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id();
m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id()), Qt::UserRole));
INFO_LOG(m_logger) << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id;
m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id), Qt::UserRole));
break;
case LtsWidgets::Button::Discard:
if (!retrieveTaOfService(newTrainingAreaId))
@@ -208,13 +209,13 @@ bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(trainingAreaId);
if (ta.id() != trainingAreaId)
if (ta.id != trainingAreaId)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
return false;
}
m_trainingArea = ta;
INFO_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea " << m_trainingArea.id()
INFO_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea " << m_trainingArea.id
<< ", ta" << ta;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -258,7 +259,7 @@ void ConfigureMapUrls::syncTaToGui()
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(0));
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.map2D()));
w->model()->setData(vecToVec(m_trainingArea.map2D));
TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
@@ -273,19 +274,19 @@ void ConfigureMapUrls::syncTaToGui()
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(1));
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.scene3D()));
w->model()->setData(vecToVec(m_trainingArea.scene3D));
TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(2));
if (w && w->model())
w->model()->setData(vecToVec(m_trainingArea.elevation()));
w->model()->setData(vecToVec(m_trainingArea.elevation));
basicConfig(w, false);
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(3));
if (w && w->model())
w->model()->setData(vecToVec(m_trainingArea.sceneObjects()));
w->model()->setData(vecToVec(m_trainingArea.sceneObjects));
basicConfig(w, false);
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -299,31 +300,31 @@ void ConfigureMapUrls::syncGuiToTa()
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(0));
if (w && w->model())
m_trainingArea.map2D(vecToVec(w->model()->allData()));
m_trainingArea.map2D = vecToVec(w->model()->allData());
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(1));
if (w && w->model())
m_trainingArea.scene3D(vecToVec(w->model()->allData()));
m_trainingArea.scene3D = vecToVec(w->model()->allData());
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(2));
if (w && w->model())
m_trainingArea.elevation(vecToVec(w->model()->allData()));
m_trainingArea.elevation = vecToVec(w->model()->allData());
w = static_cast<ConfigureMapUrlsWidget *>(m_ui->tabWidget->widget(3));
if (w && w->model())
m_trainingArea.sceneObjects(vecToVec(w->model()->allData()));
m_trainingArea.sceneObjects = vecToVec(w->model()->allData());
for (auto &item : m_trainingArea.map2D())
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Map2D);
for (auto &item : m_trainingArea.scene3D())
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Scene3D);
for (auto &item : m_trainingArea.elevation())
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Elevation);
for (auto &item : m_trainingArea.sceneObjects())
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType::SceneObj);
for (auto &item : m_trainingArea.map2D)
item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Map2D;
for (auto &item : m_trainingArea.scene3D)
item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Scene3D;
for (auto &item : m_trainingArea.elevation)
item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Elevation;
for (auto &item : m_trainingArea.sceneObjects)
item.mapDescriptionTypeId = AssetManagement::MapDescriptionType::SceneObj;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";