Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
+2
-1
@@ -9,6 +9,7 @@
|
||||
#include "central_aes_byte_reader.h"
|
||||
|
||||
#include <LtsUtilsCore/qbytearray_byteaccess.h>
|
||||
#include <AreaEffectSimulation/aes_enums.hpp>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "settings.h"
|
||||
@@ -387,7 +388,7 @@ bool CentralAesByteReader::getDdsEnumVal(size_t &pos, T &ddsEnumVal) const
|
||||
|
||||
bool result = LtsUtils::get4Byte(m_data, pos, tempVal);
|
||||
|
||||
ddsEnumVal = static_cast<typename T::inner_enum>(tempVal);
|
||||
ddsEnumVal = static_cast<T>(tempVal);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
+3
-3
@@ -329,9 +329,9 @@ void HandlerOcSituationData::sendParticipantData(int requestId)
|
||||
}
|
||||
|
||||
ParticipantManagement::ModifyParticipantDataRequest *newRequest = new ParticipantManagement::ModifyParticipantDataRequest();
|
||||
newRequest->requestId(requestId);
|
||||
newRequest->data(LtsUtils::convert<std::vector<ParticipantManagement::ParticipantData>>(m_participantData));
|
||||
newRequest->forceAddWithId(true);
|
||||
newRequest->requestId = requestId;
|
||||
newRequest->data = LtsUtils::convert<std::vector<ParticipantManagement::ParticipantData>>(m_participantData);
|
||||
newRequest->forceAddWithId = true;
|
||||
m_modifiyRequests.insert(requestId, newRequest);
|
||||
m_participantData.clear();
|
||||
|
||||
|
||||
Reference in new issue
Block a user