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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495

No files matched your search

@@ -93,7 +93,7 @@ void PartyHandling::PartyHandler::resetAdlerProperties( QString &properties, con
if (connectState != ParticipantManagement::ConnectState::Disconnected)
{
QJsonObject propAdler = obj[QStringLiteral("Adler")].toObject();
propAdler[QStringLiteral("saaConnectedState")] = ParticipantManagement::ConnectState::Disconnected;
propAdler[QStringLiteral("saaConnectedState")] = static_cast<int>(ParticipantManagement::ConnectState::Disconnected);
obj[QStringLiteral("Adler")] = propAdler;
const QByteArray propertiesStr = QJsonDocument(obj).toJson(QJsonDocument::Compact);
properties = QString::fromStdString(propertiesStr.data());
@@ -149,11 +149,11 @@ void PartyHandling::PartyHandler::onModifyPartyDataRequest(const rti::core::Samp
Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(const ParticipantManagement::Party &request)
{
DEBUG_LOG(m_logger) << "onModifyPartyDataRequest: " << request;
Party *partyToPublish = m_parties.value(request.id());
Party *partyToPublish = m_parties.value(request.id);
if (!partyToPublish && request.id() >= 0)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
.arg(request.id());
if (!partyToPublish && request.id >= 0)
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
.arg(request.id);
if (!partyToPublish) // create new party
{
@@ -162,19 +162,19 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
// insert into database
Database::PpmParty newDbParty;
newDbParty.color = request.color();
newDbParty.fadingColor = request.fadingColor();
newDbParty.name = QString::fromStdString(request.name());
newDbParty.roleId = request.role();
newDbParty.isUsedBy = request.isUsedBy();
newDbParty.hlaForceIdentifier = request.hlaForceIdentifier().underlying();
newDbParty.properties = QString::fromStdString(request.properties());
newDbParty.color = request.color;
newDbParty.fadingColor = request.fadingColor;
newDbParty.name = QString::fromStdString(request.name);
newDbParty.roleId = request.role;
newDbParty.isUsedBy = request.isUsedBy;
newDbParty.hlaForceIdentifier = static_cast<int>(request.hlaForceIdentifier);
newDbParty.properties = QString::fromStdString(request.properties);
if (!m_mainHandler->db()->insert(newDbParty))
{
QString errText = m_mainHandler->db()->getLastError().databaseText();
ERROR_LOG(m_logger) << "Error inserting Party into database: " << errText;
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Error inserting new party to database: %1")).arg(errText);
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Error inserting new party to database: %1")).arg(errText);
}
partyToPublish = new Party(newDbParty);
@@ -189,7 +189,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
else // update in database
{
if (!m_mainHandler->db()->update(partyToPublish->toDbParty()))
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Error updating party in database"));
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Error updating party in database"));
}
}
if (partyToPublish)
@@ -197,7 +197,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
auto party = partyToPublish->toDdsParty();
m_mainHandler->dts()->publish(party);
}
return Core::FunctionReplyObject(request.id());
return Core::FunctionReplyObject(request.id);
}
//------------------------------------------------------------------------------------------
@@ -217,18 +217,18 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::removePartyRequest(const
{
DEBUG_LOG(m_logger) << "onRemovePartyRequest " << request;
if (request.partyId() < 0)
if (request.partyId < 0)
return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete a party, but no valid party id to delete"));
Party *partyToDelete = m_parties.value(request.partyId());
Party *partyToDelete = m_parties.value(request.partyId);
if (!partyToDelete)
return Core::FunctionReplyObject(tr_lts("dds", "Could not delete party with id %1, because no party with that id exists"))
.arg(request.partyId());
.arg(request.partyId);
if (partyToDelete->isUsedBy() == true)
return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a party in use"));
DEBUG_LOG(m_logger) << "Removing party with ID " << request.partyId();
DEBUG_LOG(m_logger) << "Removing party with ID " << request.partyId;
return removeParty(partyToDelete);
}
@@ -299,17 +299,17 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
if (hasChanges)
{
ParticipantManagement::Party req;
req.id(partyId);
req.id = partyId;
// taking new properties from ex_0
req.color(partyEx0.color);
req.fadingColor(partyEx0.fadingColor);
req.name(partyEx0.name.toStdString());
req.role(partyEx0.roleId);
req.hlaForceIdentifier(static_cast<HlaForceIdentifierEnum>(partyEx0.hlaForceIdentifier));
req.color = partyEx0.color;
req.fadingColor = partyEx0.fadingColor;
req.name = partyEx0.name.toStdString();
req.role = partyEx0.roleId;
req.hlaForceIdentifier = static_cast<HlaForceIdentifierEnum>(partyEx0.hlaForceIdentifier);
// this remains as it is
req.isUsedBy(partyEx->isUsedBy());
req.isUsedBy = partyEx->isUsedBy();
auto ret = modifyPartyDataRequest(req);
if (ret.error())
@@ -363,22 +363,22 @@ void PartyHandling::PartyHandler::onChangePartyUsedStateRequest(const rti::core:
//------------------------------------------------------------------------------------------
Core::FunctionReplyObject PartyHandling::PartyHandler::changePartyUsedStateRequest(const ParticipantManagement::ChangePartyUsedStateRequest &request)
{
Party *party = m_parties.value(request.partyId());
Party *party = m_parties.value(request.partyId);
if (!party)
return Core::FunctionReplyObject(request.partyId(), tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
.arg(request.partyId());
return Core::FunctionReplyObject(request.partyId, tr_lts("dds", "Could not modify party with id %1, because no party with that id exists"))
.arg(request.partyId);
ParticipantManagement::Party ddsParty = party->toDdsParty();
ddsParty.isUsedBy(request.isUsedBy());
ddsParty.isUsedBy = request.isUsedBy;
if (party->hasChanges(ddsParty, false))
{
if (!m_mainHandler->db()->update(party->toDbParty()))
return Core::FunctionReplyObject(request.partyId(), tr_lts("dds", "Error updating party used state in database"));
return Core::FunctionReplyObject(request.partyId, tr_lts("dds", "Error updating party used state in database"));
DEBUG_LOG(m_logger) << "Change used state for party " << party->id() << " to " << party->isUsedBy();
m_mainHandler->dts()->publish(party->toDdsParty());
}
return Core::FunctionReplyObject(request.partyId());
return Core::FunctionReplyObject(request.partyId);
}