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:
1718 files changed
+126739
-18495
No files matched your search
+22
-22
@@ -27,36 +27,36 @@ ParticipantHandlerForReplay::ParticipantHandlerForReplay(RecordReplayPluginCusto
|
||||
static inline Database::PpmParticipant toDb(const ParticipantManagement::Participant &ddsPart)
|
||||
{
|
||||
Database::PpmParticipant db;
|
||||
db.id = ddsPart.id();
|
||||
db.assignState = ddsPart.assignState();
|
||||
db.partyId = ddsPart.partyId();
|
||||
db.typeId = ddsPart.typeId();
|
||||
db.externalId = ddsPart.externalId();
|
||||
db.designator = QString::fromStdString(ddsPart.designator());
|
||||
db.equipmentNumber = ddsPart.equipmentNumber.is_set() ? ddsPart.equipmentNumber.get() : 0;
|
||||
db.hierarchyNumber = ddsPart.hierarchyNumber();
|
||||
db.identification = QString::fromStdString(ddsPart.identification());
|
||||
db.info = QString::fromStdString(ddsPart.info());
|
||||
db.isDeleted = ddsPart.isDeleted();
|
||||
db.isSimulated = ddsPart.isSimulated();
|
||||
db.name = QString::fromStdString(ddsPart.name());
|
||||
db.superiorId = ddsPart.superiorId();
|
||||
db.symbol = QString::fromStdString(ddsPart.symbol());
|
||||
db.tacticalIdentifier = QString::fromStdString(ddsPart.tacticalIdentifier());
|
||||
db.properties = QString::fromStdString(ddsPart.properties());
|
||||
db.id = ddsPart.id;
|
||||
db.assignState = ddsPart.assignState;
|
||||
db.partyId = ddsPart.partyId;
|
||||
db.typeId = ddsPart.typeId;
|
||||
db.externalId = ddsPart.externalId;
|
||||
db.designator = QString::fromStdString(ddsPart.designator);
|
||||
db.equipmentNumber = ddsPart.equipmentNumber.has_value() ? ddsPart.equipmentNumber.get() : 0;
|
||||
db.hierarchyNumber = ddsPart.hierarchyNumber;
|
||||
db.identification = QString::fromStdString(ddsPart.identification);
|
||||
db.info = QString::fromStdString(ddsPart.info);
|
||||
db.isDeleted = ddsPart.isDeleted;
|
||||
db.isSimulated = ddsPart.isSimulated;
|
||||
db.name = QString::fromStdString(ddsPart.name);
|
||||
db.superiorId = ddsPart.superiorId;
|
||||
db.symbol = QString::fromStdString(ddsPart.symbol);
|
||||
db.tacticalIdentifier = QString::fromStdString(ddsPart.tacticalIdentifier);
|
||||
db.properties = QString::fromStdString(ddsPart.properties);
|
||||
|
||||
return db;
|
||||
}
|
||||
|
||||
void ParticipantHandlerForReplay::createUpdateParticipant(const ParticipantManagement::Participant &ddsPart)
|
||||
{
|
||||
auto *p = m_participants.value(ddsPart.id());
|
||||
auto *p = m_participants.value(ddsPart.id);
|
||||
if (!p)
|
||||
{
|
||||
p = new ParticipantForReplay(this,
|
||||
m_unitPositionCalculator.get(),
|
||||
toDb(ddsPart));
|
||||
m_participants.insert(ddsPart.id(), p);
|
||||
m_participants.insert(ddsPart.id, p);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -68,7 +68,7 @@ void ParticipantHandlerForReplay::removeParticipant(const ParticipantManagement:
|
||||
{
|
||||
// maybe clear m_hitLineInfoMap for this participant also but is this a real-world problem?
|
||||
|
||||
auto *p = m_participants.take(ddsPart.id());
|
||||
auto *p = m_participants.take(ddsPart.id);
|
||||
if (p)
|
||||
{
|
||||
p->removeFromDds();
|
||||
@@ -79,9 +79,9 @@ void ParticipantHandlerForReplay::removeParticipant(const ParticipantManagement:
|
||||
|
||||
void ParticipantHandlerForReplay::setDynamicParticipantData(const ParticipantManagement::DynamicParticipantData &dynPart)
|
||||
{
|
||||
auto *p = m_participants.value(dynPart.participantId());
|
||||
auto *p = m_participants.value(dynPart.participantId);
|
||||
if (!p) {
|
||||
WARNING_LOG(m_logger) << "Got dynamic participant data for unknown participant with id " << dynPart.participantId();
|
||||
WARNING_LOG(m_logger) << "Got dynamic participant data for unknown participant with id " << dynPart.participantId;
|
||||
return;
|
||||
}
|
||||
p->setDynamicData(dynPart);
|
||||
|
||||
+4
-4
@@ -88,7 +88,7 @@ void RecordReplayPluginCustom::removeOld(QMultiMap<long long, T> &map, qint64 de
|
||||
for (const auto &inner : map.values(item))
|
||||
{
|
||||
// Remove delted ones
|
||||
if (inner.isDeleted())
|
||||
if (inner.isDeleted)
|
||||
{
|
||||
map.remove(item, inner);
|
||||
}
|
||||
@@ -125,7 +125,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
|
||||
// {
|
||||
// for (const auto &p : m_participantMap)
|
||||
// {
|
||||
// if (p.equipmentNumber.is_set())
|
||||
// if (p.equipmentNumber.has_value())
|
||||
// m_equipmentNumbers.insert(p.equipmentNumber.get());
|
||||
// }
|
||||
// DEBUG_LOG(m_logger) << "setReplayStartTime-m_equipmentNumbers after" << m_equipmentNumbers.count();
|
||||
@@ -144,7 +144,7 @@ bool RecordReplayPluginCustom::setReplayStartTime(NSqlQuery &q, qint64 startTime
|
||||
const auto &inner = backup.values(key);
|
||||
for (const auto &value : inner)
|
||||
{
|
||||
if (m_participantKeys.find(value.participantId()) == m_participantKeys.end())
|
||||
if (m_participantKeys.find(value.participantId) == m_participantKeys.end())
|
||||
m_dynamicParticipantDataMap.remove(key, value);
|
||||
}
|
||||
}
|
||||
@@ -334,7 +334,7 @@ QVector<QFuture<void>> RecordReplayPluginCustom::makeConcurrent(T &content, qint
|
||||
for (auto it = contentIndex.begin(); it != contentIndex.end(); ++it)
|
||||
{
|
||||
// following is relavant to a) OPTIMZE = true; // GUEZE-3521 and b) E01562-183 "Prüfung Replay"
|
||||
if (m_equipmentNumbers.isEmpty() || m_equipmentNumbers.contains(abs(it->equipmentNumber())))
|
||||
if (m_equipmentNumbers.isEmpty() || m_equipmentNumbers.contains(abs(it->equipmentNumber)))
|
||||
m_participantHandler->newData(*it);
|
||||
}
|
||||
}));
|
||||
|
||||
Reference in new issue
Block a user