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
+2
-1
@@ -42,6 +42,7 @@ ParticipantSelection::ParticipantSelection(LtsSession::LtsSession *session, QWid
|
||||
, m_ppmGuiCbxIfc(nullptr)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::ParticipantSelection)
|
||||
, m_logger(getLogger("ParticipantSelection"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -229,7 +230,7 @@ void ParticipantSelection::accept()
|
||||
QModelIndex sourceIndex = m_proxyTable->mapToSource(index);
|
||||
if (index.column() != 0)
|
||||
continue;
|
||||
participantIds << m_model->privateData(sourceIndex)->participant.id();
|
||||
participantIds << m_model->privateData(sourceIndex)->participant.id;
|
||||
}
|
||||
emit selectedParticipants(participantIds);
|
||||
}
|
||||
|
||||
+13
-13
@@ -23,7 +23,7 @@ namespace core
|
||||
{
|
||||
static inline uint qHash(const ParticipantManagement::TypeClass &tc)
|
||||
{
|
||||
return ::qHash(tc.underlying());
|
||||
return ::qHash(tc);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ static QVariant participantToQVariant(const ParticipantData &pd)
|
||||
ds << pd.id()
|
||||
<< pd.partyId()
|
||||
<< pd.hierarchyNumber()
|
||||
<< (pd.equipmentNumber().is_set() ? pd.equipmentNumber().get() : -1)
|
||||
<< (pd.equipmentNumber().has_value() ? pd.equipmentNumber().get() : -1)
|
||||
<< pd.typeId()
|
||||
<< pd.externalId()
|
||||
<< QString::fromStdString(pd.symbol())
|
||||
@@ -51,7 +51,7 @@ static QVariant participantToQVariant(const ParticipantData &pd)
|
||||
<< QString::fromStdString(pd.designator())
|
||||
<< QString::fromStdString(pd.tacticalIdentifier())
|
||||
<< QString::fromStdString(pd.info())
|
||||
<< pd.assignState().underlying()
|
||||
<< pd.assignState()
|
||||
<< pd.isSimulated()
|
||||
<< pd.isDeleted()
|
||||
<< pd.modId()
|
||||
@@ -203,7 +203,7 @@ QVariant ParticipantSelectionModel::headerData(int section, Qt::Orientation orie
|
||||
{
|
||||
for (const auto &typeClassId : m_usedTypeClassIds)
|
||||
{
|
||||
cfd.data = typeClassId.underlying();
|
||||
cfd.data = typeClassId;
|
||||
cfd.text = ParticipantManagement::toString(typeClassId);
|
||||
cfc.data.push_back(cfd);
|
||||
}
|
||||
@@ -269,7 +269,7 @@ QVariant ParticipantSelectionModel::data(const QModelIndex &index, int role) con
|
||||
return ParticipantManagement::trTypeName(m_types.value(participantData.typeId()).name());
|
||||
|
||||
case ColEquipmentNumber:
|
||||
if (!participantData.equipmentNumber().is_set())
|
||||
if (!participantData.equipmentNumber().has_value())
|
||||
{
|
||||
if (participantData.assignState() == ParticipantAssignState::HandoutExcon)
|
||||
return 0;
|
||||
@@ -302,7 +302,7 @@ QVariant ParticipantSelectionModel::data(const QModelIndex &index, int role) con
|
||||
|
||||
case LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole:
|
||||
if (index.column() == ColTypeClass)
|
||||
return typeClassIdFromTypeId(participantData.typeId()).underlying();
|
||||
return typeClassIdFromTypeId(participantData.typeId());
|
||||
if (index.column() == ColType)
|
||||
return participantData.typeId();
|
||||
return QVariant();
|
||||
@@ -373,7 +373,7 @@ bool ParticipantSelectionModel::isRowRemovable(const CheckedTreeItem *parentItem
|
||||
if (!parentItem)
|
||||
return false;
|
||||
const ParticipantManagement::ParticipantData &participantData = parentItem->participant;
|
||||
if (participantData.equipmentNumber().is_set() && participantData.equipmentNumber().get() > 0)
|
||||
if (participantData.equipmentNumber().has_value() && participantData.equipmentNumber().get() > 0)
|
||||
return false;
|
||||
|
||||
for (int i = 0; i < parentItem->childCount(); i++)
|
||||
@@ -975,11 +975,11 @@ bool ParticipantTreeFilterProxyModel::lessThan(const QModelIndex &source_left, c
|
||||
case ParticipantSelectionModel::ColType:
|
||||
break;
|
||||
case ParticipantSelectionModel::ColEquipmentNumber:
|
||||
if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
|
||||
if (!left->participant.equipmentNumber().has_value() && !right->participant.equipmentNumber().has_value())
|
||||
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
|
||||
if (!left->participant.equipmentNumber().is_set())
|
||||
if (!left->participant.equipmentNumber().has_value())
|
||||
return true;
|
||||
if (!right->participant.equipmentNumber().is_set())
|
||||
if (!right->participant.equipmentNumber().has_value())
|
||||
return false;
|
||||
return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
|
||||
case ParticipantSelectionModel::ColParticipantId:
|
||||
@@ -1171,11 +1171,11 @@ bool ParticipantTableFilterProxyModel::lessThan(const QModelIndex &sourceLeft, c
|
||||
return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
|
||||
|
||||
case ParticipantSelectionModel::ColEquipmentNumber:
|
||||
if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
|
||||
if (!left->participant.equipmentNumber().has_value() && !right->participant.equipmentNumber().has_value())
|
||||
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
|
||||
if (!left->participant.equipmentNumber().is_set())
|
||||
if (!left->participant.equipmentNumber().has_value())
|
||||
return true;
|
||||
if (!right->participant.equipmentNumber().is_set())
|
||||
if (!right->participant.equipmentNumber().has_value())
|
||||
return false;
|
||||
return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
|
||||
|
||||
|
||||
+1
-3
@@ -272,6 +272,4 @@ private:
|
||||
ParticipantSelectionModel *m_sourceModel{nullptr};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData)
|
||||
}
|
||||
Reference in new issue
Block a user