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
@@ -39,6 +39,7 @@ if(QT6_GUI_AVAILABLE)
|
||||
SrmGuiPluginInterface
|
||||
SrmDataPluginInterface
|
||||
FltAesGuiPluginInterface
|
||||
AvmShared
|
||||
ddscore
|
||||
svcCoreClient
|
||||
${Qt6_Widgets}
|
||||
|
||||
+4
-3
@@ -29,6 +29,7 @@ SituationReplayManagementDialog::SituationReplayManagementDialog(LtsSession::Lts
|
||||
, m_ui(new Ui::SituationReplayManagementDialog)
|
||||
, m_srmForeign(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("SituationReplayManagementDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -76,7 +77,7 @@ void SituationReplayManagementDialog::slotStartReplay()
|
||||
const QModelIndex idx = m_ui->widget->currentIndex();
|
||||
const Core::ReplayPartition rp = m_model->getRowData(idx.row());
|
||||
|
||||
int replayPartition = rp.id();
|
||||
int replayPartition = rp.id;
|
||||
|
||||
if (replayPartition < 1)
|
||||
{
|
||||
@@ -144,8 +145,8 @@ void SituationReplayManagementDialog::onRemoveReplayPartition()
|
||||
for (auto i = selectedRows.constBegin(); i != selectedRows.constEnd(); ++i)
|
||||
{
|
||||
const Core::ReplayPartition &rp = m_model->getRowData((*i).row());
|
||||
int id = rp.id();
|
||||
int wsId = rp.workstationId();
|
||||
int id = rp.id;
|
||||
int wsId = rp.workstationId;
|
||||
|
||||
if (id < 1 || wsId < 1)
|
||||
continue;
|
||||
|
||||
+9
-8
@@ -13,6 +13,7 @@ ReplayPartitionDialogModel::ReplayPartitionDialogModel(QObject *parent)
|
||||
parent)
|
||||
, m_partitionid(-1)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("ReplayPartitionDialogModel"))
|
||||
{}
|
||||
|
||||
ReplayPartitionDialogModel::~ReplayPartitionDialogModel()
|
||||
@@ -41,20 +42,20 @@ QVariant ReplayPartitionDialogModel::data(const QModelIndex &index, int role) co
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
return partition.id();
|
||||
return partition.id;
|
||||
case Name:
|
||||
return QString::fromStdString(partition.name());
|
||||
return QString::fromStdString(partition.name);
|
||||
case Exercise:
|
||||
return partition.exerciseId();
|
||||
return partition.exerciseId;
|
||||
case WorkstationId:
|
||||
return partition.workstationId();
|
||||
return partition.workstationId;
|
||||
case ConnectionString:
|
||||
{
|
||||
if (partition.tcpConnectionUrl().size() == 0)
|
||||
return QString::number(partition.domainId());
|
||||
return QString(QString::fromUtf8(partition.tcpConnectionUrl().c_str()) +
|
||||
if (partition.tcpConnectionUrl.size() == 0)
|
||||
return QString::number(partition.domainId);
|
||||
return QString(QString::fromUtf8(partition.tcpConnectionUrl.c_str()) +
|
||||
QStringLiteral(" - ") +
|
||||
QString::number(partition.domainId()));
|
||||
QString::number(partition.domainId));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ public:
|
||||
protected:
|
||||
bool isFiltered(const Core::ReplayPartition &data, DataModification modType) const override
|
||||
{
|
||||
if (data.exerciseId() != m_partitionid)
|
||||
if (data.exerciseId != m_partitionid)
|
||||
return true;
|
||||
return LtsWidgets::LtsAbstractTableModel<Core::ReplayPartition>::isFiltered(data, modType);
|
||||
}
|
||||
|
||||
+2
-2
@@ -159,7 +159,7 @@ void InterfaceImpl::startReplay()
|
||||
{
|
||||
rp = m_coreDtc->replayPartition(replayId);
|
||||
|
||||
if (rp.id() == replayId)
|
||||
if (rp.id == replayId)
|
||||
{
|
||||
found = true;
|
||||
break;
|
||||
@@ -233,7 +233,7 @@ bool InterfaceImpl::transferFilter(const Core::ReplayPartition &data)
|
||||
|
||||
const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
const QString context = m_session->workspaceId();
|
||||
const QString replayContext = QStringLiteral("replay_%1").arg(data.id());
|
||||
const QString replayContext = QStringLiteral("replay_%1").arg(data.id);
|
||||
|
||||
|
||||
auto fOrig = m_fltAesIfc->aesFilterForOperator(operatorId, context);
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <SituationReplayManagement/srm_data_plugin_interface.h>
|
||||
|
||||
Reference in new issue
Block a user