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
@@ -15,21 +15,21 @@ namespace UasHandling
|
||||
|
||||
bool Uas::hasChanges(const CreateModifyUasRequest &request)
|
||||
{
|
||||
bool hasChanges = request.deviceIdentifier() != m_data.deviceIdentifier.toStdString() ||
|
||||
request.participantId() != m_data.participantId ||
|
||||
request.exerciseId() != m_data.exerciseId ||
|
||||
request.hostname() != m_data.hostname.toStdString() ||
|
||||
request.hostport() != m_data.hostport ||
|
||||
request.useTcp() != m_data.useTcp;
|
||||
bool hasChanges = request.deviceIdentifier != m_data.deviceIdentifier.toStdString() ||
|
||||
request.participantId != m_data.participantId ||
|
||||
request.exerciseId != m_data.exerciseId ||
|
||||
request.hostname != m_data.hostname.toStdString() ||
|
||||
request.hostport != m_data.hostport ||
|
||||
request.useTcp != m_data.useTcp;
|
||||
|
||||
if (hasChanges)
|
||||
{
|
||||
m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
|
||||
m_data.participantId = request.participantId();
|
||||
m_data.exerciseId = request.exerciseId();
|
||||
m_data.hostname = QString::fromStdString(request.hostname());
|
||||
m_data.hostport = request.hostport();
|
||||
m_data.useTcp = request.useTcp();
|
||||
m_data.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
|
||||
m_data.participantId = request.participantId;
|
||||
m_data.exerciseId = request.exerciseId;
|
||||
m_data.hostname = QString::fromStdString(request.hostname);
|
||||
m_data.hostport = request.hostport;
|
||||
m_data.useTcp = request.useTcp;
|
||||
}
|
||||
|
||||
return hasChanges;
|
||||
@@ -53,7 +53,7 @@ void Uas::unlinkUas()
|
||||
|
||||
void Uas::setState(const ProjectDataManagement::UasState &newState)
|
||||
{
|
||||
m_data.uasStateId = newState.underlying();
|
||||
m_data.uasStateId = static_cast<int>(newState);
|
||||
}
|
||||
int32_t Uas::id() const
|
||||
{
|
||||
@@ -74,15 +74,15 @@ UAS Uas::toDdsUas() const
|
||||
{
|
||||
ParticipantManagement::UAS result;
|
||||
|
||||
result.id(m_data.id);
|
||||
result.deviceIdentifier(m_data.deviceIdentifier.toStdString());
|
||||
result.uasState(static_cast<ProjectDataManagement::UasState>(m_data.uasStateId));
|
||||
result.participantId(m_data.participantId);
|
||||
result.exerciseId(m_data.exerciseId);
|
||||
result.hostname(m_data.hostname.toStdString());
|
||||
result.hostport(m_data.hostport);
|
||||
result.sampleTime(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
result.useTcp(m_data.useTcp);
|
||||
result.id = m_data.id;
|
||||
result.deviceIdentifier = m_data.deviceIdentifier.toStdString();
|
||||
result.uasState = static_cast<ProjectDataManagement::UasState>(m_data.uasStateId);
|
||||
result.participantId = m_data.participantId;
|
||||
result.exerciseId = m_data.exerciseId;
|
||||
result.hostname = m_data.hostname.toStdString();
|
||||
result.hostport = m_data.hostport;
|
||||
result.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
result.useTcp = m_data.useTcp;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user