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
+11
-11
@@ -66,13 +66,13 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
const CallBiteRequest &request)
|
||||
{
|
||||
TrainingAreaBase::DemandBiteRequest req;
|
||||
req.equipmentNumbers().reserve(request.participantIds().size());
|
||||
req.withSelfTest(request.withSelfTest());
|
||||
req.equipmentNumbers.reserve(request.participantIds.size());
|
||||
req.withSelfTest = request.withSelfTest;
|
||||
|
||||
bool bOneFound = false;
|
||||
bool bAlreadyDemandedFound = false;
|
||||
QSet<int> currentDemandedParticipants;
|
||||
for (const int participantId : request.participantIds())
|
||||
for (const int participantId : request.participantIds)
|
||||
{
|
||||
if (m_demandedBiteParticipants.contains(participantId))
|
||||
{
|
||||
@@ -98,25 +98,25 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
m_demandedBiteParticipants.insert(participant->id());
|
||||
currentDemandedParticipants.insert(participant->id());
|
||||
|
||||
req.equipmentNumbers().push_back(participant->equipmentNumber());
|
||||
req.equipmentNumbers.push_back(participant->equipmentNumber());
|
||||
}
|
||||
|
||||
if (req.equipmentNumbers().size() == 0 && bAlreadyDemandedFound)
|
||||
return Core::FunctionReplyObject(req.requestId());
|
||||
if (req.equipmentNumbers.size() == 0 && bAlreadyDemandedFound)
|
||||
return Core::FunctionReplyObject(req.requestId);
|
||||
|
||||
if (req.equipmentNumbers().size() != 0)
|
||||
if (req.equipmentNumbers.size() != 0)
|
||||
{
|
||||
static int s_requestId = 1;
|
||||
req.requestId(s_requestId++);
|
||||
req.requestId = s_requestId++;
|
||||
|
||||
if (!m_mainHandler->tabFtc()->demandBiteRequest(req, this))
|
||||
return Core::FunctionReplyObject(req.requestId(),
|
||||
return Core::FunctionReplyObject(req.requestId,
|
||||
tr_lts("dds", "Error passing the BITE request to the proxy"));
|
||||
|
||||
QTimer *timeoutTimer = new QTimer(this);
|
||||
timeoutTimer->setSingleShot(true);
|
||||
timeoutTimer->setInterval(5000);
|
||||
const int requestId = req.requestId();
|
||||
const int requestId = req.requestId;
|
||||
m_demandedBiteParticipantRequests.insert(requestId, {currentDemandedParticipants, cookie, timeoutTimer});
|
||||
|
||||
auto cb = [this, requestId]()
|
||||
@@ -129,7 +129,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
// at least one found but this was already requested and we're waiting for answer -> don't answer with error
|
||||
if (bOneFound)
|
||||
return Core::FunctionReplyObject();
|
||||
return Core::FunctionReplyObject(req.requestId(),
|
||||
return Core::FunctionReplyObject(req.requestId,
|
||||
tr_lts("dds", "Got no valid participants for BITE request"));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user