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
+27
-27
@@ -11,18 +11,18 @@ ParticipantManagement::TemplateParticipant ParticipantManagement::TemplateHandli
|
||||
{
|
||||
TemplateParticipant result;
|
||||
|
||||
result.templateId(id());
|
||||
result.typeId(typeId());
|
||||
result.name(m_data.name.toStdString());
|
||||
result.designator(m_data.designator.toStdString());
|
||||
result.info(m_data.info.toStdString());
|
||||
result.symbol(m_data.symbol.toStdString());
|
||||
result.tacticalIdentifier(m_data.tacticalIdentifier.toStdString());
|
||||
result.hierarchyNumber(m_data.hierarchyNumber);
|
||||
result.superiorTemplateId(superiorId());
|
||||
result.equipmentNumber(m_data.equipmentNumber);
|
||||
result.templateId = id();
|
||||
result.typeId = typeId();
|
||||
result.name = m_data.name.toStdString();
|
||||
result.designator = m_data.designator.toStdString();
|
||||
result.info = m_data.info.toStdString();
|
||||
result.symbol = m_data.symbol.toStdString();
|
||||
result.tacticalIdentifier = m_data.tacticalIdentifier.toStdString();
|
||||
result.hierarchyNumber = m_data.hierarchyNumber;
|
||||
result.superiorTemplateId = superiorId();
|
||||
result.equipmentNumber = m_data.equipmentNumber;
|
||||
if (!m_inferiorIds.empty())
|
||||
result.inferiorIds().set(m_inferiorIds);
|
||||
result.inferiorIds.set(m_inferiorIds);
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -30,25 +30,25 @@ ParticipantManagement::TemplateParticipant ParticipantManagement::TemplateHandli
|
||||
bool ParticipantManagement::TemplateHandling::Template::hasToBeChanged(const ParticipantManagement::TemplateData &newData)
|
||||
{
|
||||
bool hasNoChanges =
|
||||
m_data.typeId == newData.typeId() &&
|
||||
m_data.hierarchyNumber == newData.hierarchyNumber() &&
|
||||
m_data.equipmentNumber == newData.equipmentNumber() &&
|
||||
m_data.name == QString::fromStdString(newData.name()) &&
|
||||
m_data.symbol == QString::fromStdString(newData.symbol()) &&
|
||||
m_data.info == QString::fromStdString(newData.info()) &&
|
||||
m_data.designator == QString::fromStdString(newData.designator()) &&
|
||||
m_data.tacticalIdentifier == QString::fromStdString(newData.tacticalIdentifier());
|
||||
m_data.typeId == newData.typeId &&
|
||||
m_data.hierarchyNumber == newData.hierarchyNumber &&
|
||||
m_data.equipmentNumber == newData.equipmentNumber &&
|
||||
m_data.name == QString::fromStdString(newData.name) &&
|
||||
m_data.symbol == QString::fromStdString(newData.symbol) &&
|
||||
m_data.info == QString::fromStdString(newData.info) &&
|
||||
m_data.designator == QString::fromStdString(newData.designator) &&
|
||||
m_data.tacticalIdentifier == QString::fromStdString(newData.tacticalIdentifier);
|
||||
|
||||
if (!hasNoChanges)
|
||||
{
|
||||
m_data.typeId = newData.typeId();
|
||||
m_data.hierarchyNumber = newData.hierarchyNumber();
|
||||
m_data.name = QString::fromStdString(newData.name());
|
||||
m_data.symbol = QString::fromStdString(newData.symbol());
|
||||
m_data.info = QString::fromStdString(newData.info());
|
||||
m_data.designator = QString::fromStdString(newData.designator());
|
||||
m_data.tacticalIdentifier = QString::fromStdString(newData.tacticalIdentifier());
|
||||
m_data.equipmentNumber = newData.equipmentNumber();
|
||||
m_data.typeId = newData.typeId;
|
||||
m_data.hierarchyNumber = newData.hierarchyNumber;
|
||||
m_data.name = QString::fromStdString(newData.name);
|
||||
m_data.symbol = QString::fromStdString(newData.symbol);
|
||||
m_data.info = QString::fromStdString(newData.info);
|
||||
m_data.designator = QString::fromStdString(newData.designator);
|
||||
m_data.tacticalIdentifier = QString::fromStdString(newData.tacticalIdentifier);
|
||||
m_data.equipmentNumber = newData.equipmentNumber;
|
||||
}
|
||||
|
||||
return !hasNoChanges;
|
||||
|
||||
Reference in new issue
Block a user