lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates AudioVideoManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across avm service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:51 +02:00
1 parent 82356f23e5
commit 40f767fc4d
29 files changed
+308 -295
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
+31 -31
View File
@@ -79,26 +79,26 @@ void AvmFtTests::tryCreate()
m_menuStructId = -2;
ModifyMenuStructRequest request;
request.id(0);
request.name("TestGlobalMenu");
request.id = 0;
request.name = "TestGlobalMenu";
int newId = -10000000;
request.menuEntries().resize(3);
request.menuEntries()[0].name().set("Test-1");
request.menuEntries()[0].id(newId++);
request.menuEntries()[0].parentId(request.id());
request.menuEntries()[0].isGroup(true);
request.menuEntries.resize(3);
request.menuEntries[0].name.set("Test-1");
request.menuEntries[0].id = newId++;
request.menuEntries[0].parentId = request.id;
request.menuEntries[0].isGroup = true;
request.menuEntries()[1].mountingPointId(m_mountingPointId);
request.menuEntries()[1].id(newId++);
request.menuEntries()[1].parentId(request.menuEntries()[0].id());
request.menuEntries()[1].isGroup(false);
request.menuEntries[1].mountingPointId = m_mountingPointId;
request.menuEntries[1].id = newId++;
request.menuEntries[1].parentId = request.menuEntries[0].id;
request.menuEntries[1].isGroup = false;
request.menuEntries()[2].mountingPointId(m_mountingPointId+1);
request.menuEntries()[2].id(newId++);
request.menuEntries()[2].parentId(request.menuEntries()[0].id());
request.menuEntries()[2].isGroup(false);
request.menuEntries[2].mountingPointId = m_mountingPointId+1;
request.menuEntries[2].id = newId++;
request.menuEntries[2].parentId = request.menuEntries[0].id;
request.menuEntries[2].isGroup = false;
if (!m_ftc->modifyMenuStructRequest(request, this))
{
@@ -112,26 +112,26 @@ void AvmFtTests::tryModify()
{
INFO_LOG(m_logger) << "trying to send modify request for menuStructId = " << m_menuStructId;
ModifyMenuStructRequest request;
request.id(m_menuStructId);
request.name("TestGlobalMenuModify");
request.id = m_menuStructId;
request.name = "TestGlobalMenuModify";
int newId = -10000000;
request.menuEntries().resize(3);
request.menuEntries()[0].name().set("Test-1-mod");
request.menuEntries()[0].id(newId++);
request.menuEntries()[0].parentId(request.id());
request.menuEntries()[0].isGroup(true);
request.menuEntries.resize(3);
request.menuEntries[0].name.set("Test-1-mod");
request.menuEntries[0].id = newId++;
request.menuEntries[0].parentId = request.id;
request.menuEntries[0].isGroup = true;
request.menuEntries()[1].mountingPointId(m_mountingPointId);
request.menuEntries()[1].id(newId++);
request.menuEntries()[1].parentId(request.menuEntries()[0].id());
request.menuEntries()[1].isGroup(false);
request.menuEntries[1].mountingPointId = m_mountingPointId;
request.menuEntries[1].id = newId++;
request.menuEntries[1].parentId = request.menuEntries[0].id;
request.menuEntries[1].isGroup = false;
request.menuEntries()[2].mountingPointId(m_mountingPointId+1);
request.menuEntries()[2].id(newId++);
request.menuEntries()[2].parentId(request.menuEntries()[0].id());
request.menuEntries()[2].isGroup(false);
request.menuEntries[2].mountingPointId = m_mountingPointId+1;
request.menuEntries[2].id = newId++;
request.menuEntries[2].parentId = request.menuEntries[0].id;
request.menuEntries[2].isGroup = false;
if (!m_ftc->modifyMenuStructRequest(request, this))
{
@@ -145,7 +145,7 @@ void AvmFtTests::tryDelete()
{
INFO_LOG(m_logger) << "trying to send delete request for menuStructId = " << m_menuStructId;
RemoveMenuStructRequest request;
request.id(m_menuStructId);
request.id = m_menuStructId;
if (!m_ftc->removeMenuStructRequest(request, this))
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp
+19 -19
View File
@@ -84,14 +84,14 @@ void AvmVcaTests::create()
{
CnrTvcProfile createRequest;
createRequest.id(0); // create
createRequest.exerciseId(m_exerciseId);
createRequest.operatorId(m_operatorId);
createRequest.id = 0; // create
createRequest.exerciseId = m_exerciseId;
createRequest.operatorId = m_operatorId;
createRequest.data().resize(3);
createRequest.data()[0] = CnrTvcProfileData(m_cnrConfigIds.at(0), RadioSystem::Cnr);
createRequest.data()[1] = CnrTvcProfileData(m_tvcConfigIds.at(0), RadioSystem::Tvc);
createRequest.data()[2] = CnrTvcProfileData(m_cnrConfigIds.at(1), RadioSystem::Cnr);
createRequest.data.resize(3);
createRequest.data[0] = CnrTvcProfileData(m_cnrConfigIds.at(0), RadioSystem::Cnr);
createRequest.data[1] = CnrTvcProfileData(m_tvcConfigIds.at(0), RadioSystem::Tvc);
createRequest.data[2] = CnrTvcProfileData(m_cnrConfigIds.at(1), RadioSystem::Cnr);
m_modifyReplyReceived = false;
bool status = m_ftc->modifyCnrTvcProfileRequest(createRequest, this);
@@ -100,7 +100,7 @@ void AvmVcaTests::create()
QVERIFY(m_circuitId > 0);
CnrTvcProfile expected = createRequest;
expected.id(m_circuitId);
expected.id = m_circuitId;
QTRY_COMPARE(m_dtc->cnrTvcProfile(m_circuitId), expected);
}
@@ -108,21 +108,21 @@ void AvmVcaTests::modify()
{
CnrTvcProfile request;
request.id(m_circuitId); // modify
request.exerciseId(m_exerciseId);
request.operatorId(m_operatorId);
request.id = m_circuitId; // modify
request.exerciseId = m_exerciseId;
request.operatorId = m_operatorId;
request.data().resize(4);
request.data()[0] = CnrTvcProfileData(m_tvcConfigIds.at(0), RadioSystem::Tvc);
request.data()[1] = CnrTvcProfileData(m_tvcConfigIds.at(1), RadioSystem::Tvc);
request.data()[2] = CnrTvcProfileData(m_cnrConfigIds.at(2), RadioSystem::Cnr);
request.data()[3] = CnrTvcProfileData(m_cnrConfigIds.at(1), RadioSystem::Cnr);
request.data.resize(4);
request.data[0] = CnrTvcProfileData(m_tvcConfigIds.at(0), RadioSystem::Tvc);
request.data[1] = CnrTvcProfileData(m_tvcConfigIds.at(1), RadioSystem::Tvc);
request.data[2] = CnrTvcProfileData(m_cnrConfigIds.at(2), RadioSystem::Cnr);
request.data[3] = CnrTvcProfileData(m_cnrConfigIds.at(1), RadioSystem::Cnr);
m_modifyReplyReceived = false;
bool status = m_ftc->modifyCnrTvcProfileRequest(request, this);
QVERIFY(status);
QTRY_VERIFY(m_modifyReplyReceived);
QCOMPARE(m_circuitId, request.id());
QCOMPARE(m_circuitId, request.id);
CnrTvcProfile expected = request;
QTRY_COMPARE(m_dtc->cnrTvcProfile(m_circuitId), expected);
@@ -131,13 +131,13 @@ void AvmVcaTests::modify()
void AvmVcaTests::remove()
{
Core::RemoveElementRequest request;
request.id(m_circuitId);
request.id = m_circuitId;
m_removeReplyReceived = false;
bool status = m_ftc->removeCnrTvcProfileRequest(request, this);
QVERIFY(status);
QTRY_VERIFY(m_removeReplyReceived);
QCOMPARE(m_circuitId, request.id());
QCOMPARE(m_circuitId, request.id);
CnrTvcProfile expected;
QTRY_COMPARE(m_dtc->cnrTvcProfile(m_circuitId), expected);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
+27 -27
View File
@@ -138,16 +138,16 @@ void MvsTests::tryModifyVideoTeam()
{
VideoTeamModifyRequest request;
request.id(m_teamId);
request.name("MVS001");
request.streamName("Stream name for MVS001");
request.id = m_teamId;
request.name = "MVS001";
request.streamName = "Stream name for MVS001";
if (m_exerciseId > 0)
request.exerciseId(m_exerciseId);
request.exerciseId = m_exerciseId;
else
request.exerciseId(0);
request.exerciseId = 0;
request.vtPort(0);
request.ssrc(0);
request.vtPort = 0;
request.ssrc = 0;
if (!m_ftc->videoTeamModifyRequest(request, this))
{
@@ -180,13 +180,13 @@ void MvsTests::tryCreateVideoReceiver()
INFO_LOG(m_logger) << "trying to send createRequest VideoReceiver";
VideoReceiverModifyRequest request;
request.id(0);
request.streamName("Stream name MVS_00");
request.mainStructureElementId(m_radioStationId);
request.teamId(m_teamId);
request.hostName("Hostname");
request.frequency(0);
request.isLocked(false);
request.id = 0;
request.streamName = "Stream name MVS_00";
request.mainStructureElementId = m_radioStationId;
request.teamId = m_teamId;
request.hostName = "Hostname";
request.frequency = 0;
request.isLocked = false;
if (!m_ftc->videoReceiverModifyRequest(request, this))
{
@@ -202,13 +202,13 @@ void MvsTests::tryModifyVideoReceiver()
{
VideoReceiverModifyRequest request;
request.id(m_receiverId);
request.streamName("Stream name MVS_001");
request.mainStructureElementId(m_radioStationId);
request.teamId(m_teamId);
request.hostName("Hostname");
request.frequency(0);
request.isLocked(false);
request.id = m_receiverId;
request.streamName = "Stream name MVS_001";
request.mainStructureElementId = m_radioStationId;
request.teamId = m_teamId;
request.hostName = "Hostname";
request.frequency = 0;
request.isLocked = false;
if (!m_ftc->videoReceiverModifyRequest(request, this))
{
@@ -224,9 +224,9 @@ void MvsTests::tryModifyAvsVideoReceiver()
{
VideoReceiverModifyAvsRequest request;
request.id(m_receiverId);
request.dbm(80);
request.snr(20);
request.id = m_receiverId;
request.dbm = 80;
request.snr = 20;
if (!m_ftc->videoReceiverModifyAvsRequest(request, this))
{
@@ -242,8 +242,8 @@ void MvsTests::tryModifyActiveVideoReceiver()
{
VideoReceiverModifyActiveRequest request;
request.id(m_receiverId);
request.isActive(true);
request.id = m_receiverId;
request.isActive = true;
if (!m_ftc->videoReceiverModifyActiveRequest(request, this))
{
@@ -260,7 +260,7 @@ void MvsTests::tryDeleteVideoReceiver()
{
Core::RemoveElementRequest request;
request.id(m_receiverId);
request.id = m_receiverId;
if (!m_ftc->videoReceiverRemoveRequest(request, this))
{