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
+22
-22
@@ -11,26 +11,26 @@
|
||||
bool ParticipantManagement::PartyHandling::Party::hasChanges(const ParticipantManagement::Party &request,
|
||||
const bool bIgnoreIsUsedBy)
|
||||
{
|
||||
const QString requestProperties = QString::fromStdString(request.properties());
|
||||
bool hasChanges = request.color() != m_data.color
|
||||
|| request.fadingColor() != m_data.fadingColor
|
||||
|| request.name() != m_data.name.toStdString()
|
||||
|| request.hlaForceIdentifier().underlying() != m_data.hlaForceIdentifier
|
||||
|| request.role() != m_data.roleId
|
||||
const QString requestProperties = QString::fromStdString(request.properties);
|
||||
bool hasChanges = request.color != m_data.color
|
||||
|| request.fadingColor != m_data.fadingColor
|
||||
|| request.name != m_data.name.toStdString()
|
||||
|| static_cast<int>(request.hlaForceIdentifier) != m_data.hlaForceIdentifier
|
||||
|| request.role != m_data.roleId
|
||||
|| requestProperties != m_data.properties;
|
||||
if (!bIgnoreIsUsedBy && !hasChanges)
|
||||
hasChanges = request.isUsedBy() != m_data.isUsedBy;
|
||||
hasChanges = request.isUsedBy != m_data.isUsedBy;
|
||||
|
||||
if (hasChanges)
|
||||
{
|
||||
m_data.color = request.color();
|
||||
m_data.fadingColor = request.fadingColor();
|
||||
m_data.name = QString::fromStdString(request.name());
|
||||
m_data.roleId = request.role();
|
||||
m_data.hlaForceIdentifier = request.hlaForceIdentifier().underlying();
|
||||
m_data.color = request.color;
|
||||
m_data.fadingColor = request.fadingColor;
|
||||
m_data.name = QString::fromStdString(request.name);
|
||||
m_data.roleId = request.role;
|
||||
m_data.hlaForceIdentifier = static_cast<int>(request.hlaForceIdentifier);
|
||||
m_data.properties = requestProperties;
|
||||
if (!bIgnoreIsUsedBy)
|
||||
m_data.isUsedBy = request.isUsedBy();
|
||||
m_data.isUsedBy = request.isUsedBy;
|
||||
}
|
||||
|
||||
return hasChanges;
|
||||
@@ -45,15 +45,15 @@ ParticipantManagement::Party ParticipantManagement::PartyHandling::Party::toDdsP
|
||||
{
|
||||
ParticipantManagement::Party result;
|
||||
|
||||
result.id(id());
|
||||
result.color(m_data.color);
|
||||
result.fadingColor(m_data.fadingColor);
|
||||
result.name(m_data.name.toStdString());
|
||||
result.role(m_data.roleId);
|
||||
result.hlaForceIdentifier(static_cast<HlaForceIdentifierEnum>(m_data.hlaForceIdentifier));
|
||||
result.isUsedBy(m_data.isUsedBy);
|
||||
result.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
result.properties(m_data.properties.toStdString());
|
||||
result.id = id();
|
||||
result.color = m_data.color;
|
||||
result.fadingColor = m_data.fadingColor;
|
||||
result.name = m_data.name.toStdString();
|
||||
result.role = m_data.roleId;
|
||||
result.hlaForceIdentifier = static_cast<HlaForceIdentifierEnum>(m_data.hlaForceIdentifier);
|
||||
result.isUsedBy = m_data.isUsedBy;
|
||||
result.sampleTime = QDateTime::currentMSecsSinceEpoch();
|
||||
result.properties = m_data.properties.toStdString();
|
||||
|
||||
return result;
|
||||
}
|
||||
Reference in new issue
Block a user