Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+1
@@ -12,6 +12,7 @@
|
||||
#include <QtGui/QBrush>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
||||
+1
-2
@@ -100,8 +100,7 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
|
||||
}
|
||||
|
||||
DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
|
||||
.getNGLLogger("OnlineReportDetailedChartModel")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage, QSet<int32_t>());
|
||||
|
||||
+1
-2
@@ -73,8 +73,7 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
|
||||
}
|
||||
|
||||
SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
|
||||
.getNGLLogger("OnlineReportSimpleChartModel")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
|
||||
{
|
||||
if (!m_config.participantIds.contains(data.participantId()))
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ CreateReportDialog::CreateReportDialog(const QString &menuGroup, QWidget *parent
|
||||
, m_ppmGuiCbxIfc(nullptr)
|
||||
, m_participantModel(nullptr)
|
||||
, m_typeModel(nullptr)
|
||||
.getNGLLogger("CreateReportDialog"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -161,7 +161,7 @@ bool CreateReportDialog::apply()
|
||||
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(index);
|
||||
|
||||
if (data.id() != 0 &&
|
||||
data.equipmentNumber().is_set() &&
|
||||
data.equipmentNumber().has_value() &&
|
||||
typeIds.contains(data.typeId()))
|
||||
participantIds.insert(data.id());
|
||||
}
|
||||
|
||||
+1
@@ -7,6 +7,7 @@
|
||||
#include <OnlineReports/ore_gui_plugin_interface.h>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
|
||||
: LtsWidgets::LtsDialog(parent)
|
||||
, m_ui(new Ui::ReportDialog)
|
||||
, m_name(config.name)
|
||||
.getNGLLogger("OnlineReportDialog"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ TypeModel::TypeModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc
|
||||
tr("Name")},
|
||||
parent)
|
||||
, m_ppmDtc(ppmDtc)
|
||||
.getNGLLogger("OnlineReportTypeModel"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
init();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user