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/MapObjectSelection/map_object_model.cpp
+1
View File
@@ -98,6 +98,7 @@ MapObjectModel::MapObjectModel(QObject *parent)
tr("Picture")
},
parent)
, m_logger(getLogger("MapObjectModel"))
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
+2 -1
View File
@@ -149,6 +149,8 @@ private:
QMap<int, int> m_usedPartyIds;
QSet<QString> m_usedTypeName;
QMap<int, QString> m_usedVulnerabilities;
LOGGER_T m_logger;
friend class MapObjectProxyModel;
};
@@ -171,7 +173,6 @@ protected:
bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
protected:
NGL::INGLLogger &m_logger;
MapObjectModel *m_sourceModel = nullptr;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+8 -7
View File
@@ -3,6 +3,7 @@
#include "map_object_selection_widget.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "map_object_custom_view.h"
#include "map_object_model.h"
@@ -211,17 +212,17 @@ void MapObjectSelectionLtsDialog::updateCheckButtonHandler()
void MapObjectSelectionLtsDialog::onServiceMonitorBtnCombatReadyRequested()
{
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::CombatReady, false);
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, false);
}
void MapObjectSelectionLtsDialog::onServiceMonitorBtnCombatReadyResetContaminationRequested()
{
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::CombatReady, true);
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, true);
}
void MapObjectSelectionLtsDialog::onServiceMonitorBtnResetContaminationRequested()
{
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::NoChange, true);
onServiceMonitorBtnVulnerabiltyResetRequested(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange, true);
}
void MapObjectSelectionLtsDialog::onServiceMonitorBtnVulnerabiltyResetRequested( const ProjectDataManagement::VulnerabilityState &vs, bool resetContamination )
@@ -238,13 +239,13 @@ void MapObjectSelectionLtsDialog::onServiceMonitorBtnVulnerabiltyResetRequested(
Buildings::Building bldg;
for (int buildingId : buildingIds)
{
bldg.buildingId(buildingId);
bldg.buildingId = buildingId;
buildings.push_back(bldg);
}
Buildings::SetBuildingStatesRequest request;
request.buildings(buildings);
request.vulnerabilityState(vs);
request.resetContamination(resetContamination);
request.buildings = buildings;
request.vulnerabilityState = vs;
request.resetContamination = resetContamination;
m_requestHelper->addRequest([this, request]()
{