From 6794412c2960574502a0a69ac8216473309296a6 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Fri, 18 Sep 2026 17:45:16 +0200 Subject: [PATCH] Migrates GenericFtsImpl to plain members and FtReplyState --- .../Lts/DDS/FTS/generic_fts_impl.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h index 77547207b..23f8fb4f0 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h @@ -61,10 +61,14 @@ private: void sendReplyState(Core::FtReplyState replyState, const rti::core::SampleIdentity &requestSampleIdentity) { connext::WriteSample reply; - reply.data().replyState(replyState); + // rtiddsgen -stl generates plain public data members, so the reply + // state is assigned directly instead of the old setter call. + reply.data().replyState = replyState; - bool bLastTelegram = ((replyState != Core::FtReplyState_def::InProgress) && - (replyState != Core::FtReplyState_def::NotStarted)); + // FtReplyState_def doesn't exist anymore with rtiddsgen 7.7 - the + // enum values are directly available in Core::FtReplyState. + bool bLastTelegram = ((replyState != Core::FtReplyState::InProgress) && + (replyState != Core::FtReplyState::NotStarted)); m_replier->send_reply(reply, requestSampleIdentity, bLastTelegram); } @@ -77,7 +81,7 @@ private: template ::value, int>::type = 0> void setReply(T &data, Core::FtReplyState status) { - data.replyState(status); + data.replyState = status; } template ::value, int>::type = 0> @@ -233,8 +237,11 @@ protected: << "[s], -> age: " << age << "[s], data: " << s; ReplyTopic rt; - rt.errorString(tr_lts("dds", "Topic %1 was outdated and therefore ignored. Does the client time match the server time?")); - rt.errorParams({TopicNameHelper::requestTopicName()}); + // Generated topic types have plain public data members, so the + // error information is assigned directly instead of the old + // setter calls. + rt.errorString = tr_lts("dds", "Topic %1 was outdated and therefore ignored. Does the client time match the server time?"); + rt.errorParams = {TopicNameHelper::requestTopicName()}; sendReply(request.identity(), rt); return; }