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

Session 026: Lts/Services Qt5:: to Qt6:: migration

Browse Source 
- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
1244 files changed
+4266 -4633
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/AvsCommands/change_rt_profile_circuit_name.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "change_rt_profile_circuit_name.h"
#include <AudioVideoManagement/iava_command_done_observer.h>
#include <QtCore/QString>
#include <QString>
#include <QtGlobal>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/choose_stream.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include <AudioVideoManagement/icommand.h>
#include <AudioVideoManagement/ava_types.h>
#include "svcavmcommon_export.h"
#include <QtCore/QString>
#include <AudioVideoManagement/avm_export.h>
#include <QString>
#include <boost/optional.hpp>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_eloka_list.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include <AudioVideoManagement/icommand.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QVector>
#include <QtCore/QString>
#include <QVector>
#include <QString>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_stream_list.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QVector>
#include <QVector>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_eloka.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QVector>
#include <QVector>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_timeline.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <boost/optional.hpp>
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QString>
#include <QString>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_abs_position.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include <AudioVideoManagement/icommand.h>
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/av_helper.h>
#include <QtCore/QString>
#include <QString>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_announcement_profile.h
+2 -2
View File
@@ -12,8 +12,8 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QString>
#include <QVector>
#include <boost/optional.hpp>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "set_rt_profile.h"
#include <AudioVideoManagement/iava_command_done_observer.h>
#include <QtCore/QString>
#include <QString>
#include <QtGlobal>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile_base.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include <AudioVideoManagement/icommand.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QVector>
#include <QtCore/QString>
#include <QVector>
#include <QString>
#include <boost/optional.hpp>
#include <functional>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "iava_comm.h"
#include "iava_command_done_observer.h"
#include <QtCore/QDebug>
#include <QDebug>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <QtCore/QString>
#include <QString>
#include <boost/optional.hpp>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_video_profile.h
+4 -4
View File
@@ -11,10 +11,10 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <QtCore/QString>
#include <QtCore/QList>
#include <QtCore/QVector>
#include <QtCore/QByteArray>
#include <QString>
#include <QList>
#include <QVector>
#include <QByteArray>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "iava_comm.h"
#include "iava_command_done_observer.h"
#include <QtCore/QDebug>
#include <QDebug>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <QtCore/QString>
#include <QString>
#include <boost/optional.hpp>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/vd_set_script.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "icommand.h"
#include <AudioVideoManagement/ava_types.h>
#include <QtCore/QString>
#include <QString>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
+3 -7
View File
@@ -4,8 +4,6 @@
# $Author$
#
IF(BUILD_RTI)
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
FIND_PACKAGE(Boost REQUIRED COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
ELSE()
@@ -132,7 +130,7 @@ CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
# Generate avm_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcAvmCommon SHARED ${SRCS_common})
NGL_ADD_LIBRARY(AAR SV WS svcAvmCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -165,7 +163,7 @@ SET(SRCS_client
# generate avm_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcAvmClient SHARED ${SRCS_client})
NGL_ADD_LIBRARY(AAR SV WS svcAvmClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -191,7 +189,7 @@ SET(SRCS_server
# generate avm_[d|f]ts.h, avm_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcAvmServer SHARED ${SRCS_server})
NGL_ADD_LIBRARY(AAR SV svcAvmServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -309,5 +307,3 @@ NGL_ADD_TARGET_LINK(svcAudioVideoManagement sAVM)
# Uncomment if necessary
ADD_SUBDIRECTORY(ModuleTests)
ADD_SUBDIRECTORY(UnitTests)
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
+3 -2
View File
@@ -11,8 +11,8 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtTest/QTest>
#include <QTimer>
#include <QTest>
#include <AudioVideoManagement/avm_ftc.h>
@@ -25,6 +25,7 @@ AvmFtTests::AvmFtTests(QObject *parent)
, m_testId(0)
, m_mountingPointId(100)
, m_bTestsSuccessful(true)
, m_logger(getLogger("FtTest"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
+3 -2
View File
@@ -26,7 +26,7 @@
#include <AudioVideoManagement/logger.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <QtCore/QObject>
#include <QObject>
namespace AudioVideoManagement
{
@@ -50,7 +50,6 @@ protected Q_SLOTS:
void tryModify();
void tryDelete();
protected:
NGL::INGLLogger &m_logger;
void onModifyMenuStructReply(const Core::FunctionReplyObject &replyObject) override final;
void createMenuStructReply(const Core::FunctionReplyObject &replyObject);
void modifyMenuStructReply(const Core::FunctionReplyObject &replyObject);
@@ -65,6 +64,8 @@ private:
int m_testId;
int m_mountingPointId;
bool m_bTestsSuccessful;
NGL::INGLLogger &m_logger;
};
} // namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp
+6 -7
View File
@@ -21,15 +21,14 @@
*/
#include "avm_vca_tests.h"
#include <utility>
#include <AudioVideoManagement/avm_dtc.h>
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtTest/QTest>
#include <QTest>
#include <QtGlobal>
#include <QtCore/QStringList>
#include <QtCore/QMap>
#include <QStringList>
#include <QMap>
#include <string>
#include <algorithm>
#include <iterator>
@@ -41,7 +40,7 @@ AvmVcaTests::AvmVcaTests(int domainId, int exerciseId, int operatorId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise))
, m_exerciseId(exerciseId)
, m_operatorId(operatorId)
.getNGLLogger("VcaTest"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("VcaTest"))
{
Q_ASSERT(exerciseId > 0);
Q_ASSERT(operatorId > 0);
@@ -194,14 +193,14 @@ void AvmVcaTests::createCnrConfig()
void AvmVcaTests::removeTvcConfig()
{
for (auto id: std::as_const(m_tvcConfigIds))
for (auto id: qAsConst(m_tvcConfigIds))
m_ftc->removeTvcConfigRequest(RemoveTvcConfigRequest{id}, this);
QTRY_VERIFY(m_tvcConfigIds.isEmpty());
}
void AvmVcaTests::removeCnrConfig()
{
for (auto id: std::as_const(m_cnrConfigIds))
for (auto id: qAsConst(m_cnrConfigIds))
m_ftc->removeCnrConfigRequest(RemoveCnrConfigRequest{id}, this);
QTRY_VERIFY(m_cnrConfigIds.isEmpty());
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
+3 -4
View File
@@ -14,8 +14,8 @@
#include <AudioVideoManagement/avm_ftc_types.h>
#include <AudioVideoManagement/avm_dtc.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <QObject>
#include <QVector>
namespace AudioVideoManagement
{
@@ -43,8 +43,6 @@ private slots:
void test();
private:
NGL::INGLLogger &m_logger;
void create();
void modify();
void remove();
@@ -74,6 +72,7 @@ NGL::INGLLogger &m_logger;
bool m_removeReplyReceived{false};
QVector<int> m_tvcConfigIds;
QVector<int> m_cnrConfigIds;
NGL::INGLLogger &m_logger;
};
} // namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
+3 -2
View File
@@ -11,8 +11,8 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtTest/QTest>
#include <QTimer>
#include <QTest>
#include <AudioVideoManagement/avm_ftc.h>
@@ -27,6 +27,7 @@ MvsTests::MvsTests(QObject *parent)
, m_radioStationId(200)
, m_exerciseId(0)
, m_bTestsSuccessful(true)
, m_logger(getLogger("Test"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include <AudioVideoManagement/logger.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <QtCore/QObject>
#include <QObject>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include <AudioVideoManagement/asset.h>
#include <AudioVideoManagement/mounting_point.h>
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <QtCore/QString>
#include <LtsUtilsCore/data_modification_enum.h>
#include <QString>
#include <QSignalSpy>
#include <vector>
#include <functional>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/audio_video_handler_impl_test.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <AudioVideoManagement/avm_enums.hpp>
#include <QtTest/QTest>
#include <QTest>
#include <memory>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include "av_helper_test.h"
#include <AudioVideoManagement/av_helper.h>
#include <QtCore/QDateTime>
#include <QtCore/QByteArray>
#include <QDateTime>
#include <QByteArray>
#include <string>
using namespace AudioVideoManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.cpp
+5 -5
View File
@@ -12,11 +12,11 @@
#include <AudioVideoManagement/ava_comm.h>
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/avs_dialog.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDateTime>
#include <QtCore/QList>
#include <QtCore/QVector>
#include <QtCore/QByteArray>
#include <QCoreApplication>
#include <QDateTime>
#include <QList>
#include <QVector>
#include <QByteArray>
#include <boost/optional.hpp>
using namespace AudioVideoManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
#include <memory>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.cpp
+2 -2
View File
@@ -15,9 +15,9 @@
#include <AudioVideoManagement/stream_name_mapping.h>
#include <AudioVideoManagement/avs_dialog.h>
#include <AudioVideoManagement/list_response_collector.h>
#include <QtCore/QVector>
#include <QVector>
#include <QtGlobal>
#include <QtCore/QDateTime>
#include <QDateTime>
#include <QSignalSpy>
#include <boost/optional.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
#include <memory>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp
+3 -3
View File
@@ -8,9 +8,9 @@
*/
#include <QtNetwork/QHostAddress>
#include <utility>
#include <QtCore/QStringList>
#include <QtCore/QString>
#include <QtCore/QRegExp>
#include <QString>
#include "ava_test_server.h"
namespace AudioVideoManagement
@@ -325,7 +325,7 @@ AvaTestServer::AvaTestServer()
AvaTestServer::~AvaTestServer()
{
for (QTcpSocket *conn : std::as_const(m_Conns))
for (QTcpSocket *conn : qAsConst(m_Conns))
{
// disconnect before we delete as otherwise closedConnection() would be called wich would
// also delete the socket.
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server_main.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#include "ava_test_server.h"
#include <QtCore/QCoreApplication>
#include <QCoreApplication>
int main(int argc, char** argv)
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_timeline_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "avs_command_queue_test.h"
#include <AudioVideoManagement/avs_command_queue.h>
#include <AudioVideoManagement/icommand.h>
#include <LtsUtils/LtsUtilsCore/connection.h>
#include <LtsUtilsCore/connection.h>
#include <memory>
#include <chrono>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/choose_stream_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include <AudioVideoManagement/list_response_collector.h>
#include <AudioVideoManagement/ava_types.h>
#include <AudioVideoManagement/av_helper.h>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QString>
#include <QVector>
using namespace AudioVideoManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/main.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QtTest/QtTest>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QtCore/QStringList>
#include <QStringList>
#include <map>
#include <functional>
#include <memory>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/parse_line_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/rt_state_test.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtTest/QTest>
#include <QTest>
/**
* @author Christian Fröbel
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/active_exercises.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QtCore/QObject>
#include <QObject>
#include <vector>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset.h
+2 -2
View File
@@ -9,8 +9,8 @@
#pragma once
#include "svcavmcommon_export.h"
#include <QtCore/QObject>
#include "avm_export.h"
#include <QObject>
#include <memory>
namespace InfrastructureManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.h
+2 -2
View File
@@ -10,9 +10,9 @@
#pragma once
#include "exercise_context.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "logger.h"
#include <QtCore/QObject>
#include <QObject>
#include <boost/optional.hpp>
#include <map>
#include <set>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <memory>
#include <QtCore/QObject>
#include <QObject>
class QString;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
+2 -1
View File
@@ -15,7 +15,7 @@
#include <AudioVideoManagement/avm.hpp>
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtilsCore/json_object.h>
#include <QtCore/QString>
#include <QString>
#include <QtGlobal>
#include <string>
@@ -222,6 +222,7 @@ AudioVideoHandlerImpl::AudioVideoHandlerImpl(Exercise *exercise, IDbProxy *dbPro
, m_exercise(exercise)
, m_dbProxy(dbProxy)
, m_dtsProxy(dtsProxy)
, m_logger(getLogger("AudioVideoHandler"))
{
Q_ASSERT(exercise);
Q_ASSERT(dbProxy);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.h
+2 -2
View File
@@ -11,10 +11,10 @@
#include "exercise_context.h"
#include "logger.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include <AudioVideoManagement/avm_db_structs.h>
#include <boost/optional.hpp>
#include <QtCore/QObject>
#include <QObject>
#include <string>
#include <map>
#include <cstdint>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_control.cpp
+2 -2
View File
@@ -6,8 +6,8 @@
*/
#include "av_control.h"
#include <QtCore/QTimer>
#include <QtCore/QList>
#include <QTimer>
#include <QList>
#include <time.h>
// TODO: on reconnect operatingmode abgleichen!
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.cpp
+2 -2
View File
@@ -8,8 +8,8 @@
*/
#include "av_helper.h"
#include <QtCore/QByteArray>
#include <QtCore/QRegularExpression>
#include <QByteArray>
#include <QRegularExpression>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "ava_types.h"
#include <chrono>
#include <utility>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.h
+5 -4
View File
@@ -7,13 +7,13 @@
#pragma once
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QtNetwork/QTcpSocket>
#include <QObject>
#include <QTimer>
#include <QTcpSocket>
#include <queue>
#include "logger.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
namespace AudioVideoManagement
{
@@ -55,6 +55,7 @@ protected:
QTimer *m_rcpLoginTimer;
QTimer *m_reconnectTimer;
std::queue<QByteArray> m_commandQueueForErrorHandling;
NGL::INGLLogger &m_logger;
NGL::INGLLogger &m_loggerIO;
};
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
+7 -6
View File
@@ -10,12 +10,12 @@
#include "ava_comm.h"
#include "av_helper.h"
#include <AudioVideoManagement/logger.h>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/QTextStream>
#include <QtCore/QRect>
#include <QString>
#include <QStringList>
#include <QByteArray>
#include <QList>
#include <QTextStream>
#include <QRect>
#include <cmath>
#include <ngltools/ngltools_dtg.h>
@@ -24,6 +24,7 @@ namespace AudioVideoManagement
AvaComm::AvaComm(const QString &avaHost, quint16 avaPort)
: m_avSocket(avaHost, avaPort, getLogger("AvaComm"), getLogger("AvaComm.IO"))
, m_logger(getLogger("AvaComm"))
, m_loggerIO(getLogger("AvaComm.IO"))
{
connect(&m_avSocket, &AVSocketWrapper::readyRead, this, &AvaComm::onReadyRead);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.h
+2 -2
View File
@@ -11,10 +11,10 @@
#include "iava_comm.h"
#include "ava_types.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "logger.h"
#include <AudioVideoManagement/av_socket.h>
#include <QtCore/QList>
#include <QList>
#include <QtGlobal>
#include <boost/optional.hpp>
#include <chrono>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
+5 -4
View File
@@ -27,13 +27,13 @@
#include "AvsCommands/set_abs_position.h"
#include "AvsCommands/set_volume.h"
#include "AvsCommands/keep_alive.h"
#include <LtsUtils/scoped_connection.h>
#include <QtCore/QTimer>
#include <QtCore/QRect>
#include <LtsUtilsCore/scoped_connection.h>
#include <QTimer>
#include <QRect>
#include <QtGlobal>
#include <chrono>
#include <QtCore/QDebug>
#include <QDebug>
namespace AudioVideoManagement
{
@@ -42,6 +42,7 @@ AvaControl::AvaControl(IAvaComm *comm, StreamNameMapping *streamNameMapping, std
: m_comm(comm)
, m_streamNameMapping(streamNameMapping)
, m_queue(commandTimeout)
, m_logger(getLogger("AvaControl"))
{
Q_ASSERT(comm);
Q_ASSERT(streamNameMapping);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h
+7 -6
View File
@@ -10,18 +10,19 @@
#pragma once
#include "iava_command_done_observer.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "ava_types.h"
#include "rt_state.h"
#include "avs_command_queue.h"
#include "logger.h"
#include <LtsUtils/LtsUtilsCore/connection.h>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVector>
#include <QtCore/QObject>
#include <LtsUtilsCore/connection.h>
#include <QString>
#include <QVector>
#include <QObject>
#include <chrono>
class QStringList;
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.cpp
+1
View File
@@ -25,6 +25,7 @@ AvaSession::AvaSession(AvaControl *ctrl, int exerciseId, const QString &operator
, m_timezone(timezone)
, m_guiStyle(guiStyle)
, m_keepAliveEnabled(keepAliveEnabled)
, m_logger(getLogger("AvaSession"))
{
Q_ASSERT(ctrl);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.h
+4 -4
View File
@@ -9,12 +9,12 @@
#pragma once
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "ava_types.h"
#include "logger.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QTimer>
#include <QObject>
#include <QString>
#include <QTimer>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp
+1 -2
View File
@@ -8,7 +8,6 @@
*/
#include "ava_state.h"
#include <utility>
#include "ava_session.h"
#include "ava_control.h"
#include "av_helper.h"
@@ -41,7 +40,7 @@ AvaState::AvaState(AvaSession *session)
QStringList AvaState::currentLiveVideoStreams() const
{
QStringList streams;
for (const QMap<QString, AvaStreamState> &map : std::as_const(m_videoState))
for (const QMap<QString, AvaStreamState> &map : qAsConst(m_videoState))
{
const QList<QString> streamNames = map.keys();
for (const QString &streamName : streamNames)
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.h
+5 -5
View File
@@ -11,11 +11,11 @@
#include "ava_types.h"
#include "rt_state.h"
#include "svcavmcommon_export.h"
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include "avm_export.h"
#include <QString>
#include <QStringList>
#include <QMap>
#include <QObject>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.cpp
+2 -2
View File
@@ -13,9 +13,9 @@
#include <LtsUtilsCore/json_object.h>
#include <QtCore/QVector>
#include <QVector>
#include <QtGlobal>
#include <QtCore/QDebug>
#include <QDebug>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.h
+5 -5
View File
@@ -9,11 +9,11 @@
#pragma once
#include <QtCore/QMetaType>
#include "svcavmcommon_export.h"
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVector>
#include <QMetaType>
#include "avm_export.h"
#include <QString>
#include <QStringList>
#include <QVector>
#include <chrono>
#include <cstdint>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "avs_command_queue.h"
#include "icommand.h"
#include <LtsUtils/LtsUtilsCore/connection.h>
#include <LtsUtilsCore/connection.h>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.h
+3 -3
View File
@@ -10,9 +10,9 @@
#pragma once
#include "logger.h"
#include "svcavmcommon_export.h"
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include "avm_export.h"
#include <QObject>
#include <QTimer>
#include <deque>
#include <memory>
#include <chrono>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_dialog.h
+2 -2
View File
@@ -9,9 +9,9 @@
#pragma once
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include <QtCore/QString>
#include <QString>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
+2 -2
View File
@@ -13,9 +13,9 @@
#include <AudioVideoManagement/avm.hpp>
#include <AudioVideoManagement/avm_dtc.h>
#include <AudioVideoManagement/avs_dialog.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <QtGlobal>
#include <QtCore/QString>
#include <QString>
#include <algorithm>
#include <utility>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.h
+2 -2
View File
@@ -9,8 +9,8 @@
#pragma once
#include "svcavmcommon_export.h"
#include <QtCore/QObject>
#include "avm_export.h"
#include <QObject>
#include <boost/optional.hpp>
#include <functional>
#include <InfrastructureManagement/ism_dtc.h>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
+9 -8
View File
@@ -8,7 +8,6 @@
*/
#include "cnr_handler.h"
#include <utility>
#include "avm_dts.h"
#include "dds_handler.h"
#include "exercise_context.h"
@@ -20,7 +19,7 @@
#include <InfrastructureManagement/ism_dtc.h>
#include <LtsUtilsCore/json_object.h>
#include <ngldb/dbtransaction.h>
#include <QtCore/QStringList>
#include <QStringList>
#include <algorithm>
namespace AudioVideoManagement
@@ -178,6 +177,7 @@ private:
CnrHandler *m_handler;
DatabaseInterface *m_db;
QHash<int32_t, Database::AvmDeviceConfig> m_cache; //!< cnrConfig-Id -> AvmDeviceConfig
LOGGER_T m_logger;
};
@@ -189,6 +189,7 @@ CnrHandler::CnrHandler(Interface::Dts *dts, Interface::Fts *fts, InfrastructureM
, m_frequencyPlanningHandler(frequencyPlanningHandler)
, m_db(db)
, m_activeExercises(activeExercises)
, m_logger(getLogger("CombatNetRadioHandler"))
, m_deviceConfig(new DeviceConfig(this, db, m_logger))
{
Q_ASSERT(dts);
@@ -234,7 +235,7 @@ bool CnrHandler::init()
return false;
}
for (const AvmCnrChannel &currentChannel : std::as_const(m_channels))
for (const AvmCnrChannel &currentChannel : qAsConst(m_channels))
m_dts->publish(::AudioVideoManagement::toDds(currentChannel));
// Don't use select with callback here as addConfig() uses the DB, too.
@@ -245,7 +246,7 @@ bool CnrHandler::init()
return false;
}
for (const AvmCnrConfig &currentConfig : std::as_const(cnrConfigs))
for (const AvmCnrConfig &currentConfig : qAsConst(cnrConfigs))
{
auto reply = createCnrConfig(toRequest(currentConfig, 0), currentConfig.id);
if (reply.error())
@@ -398,7 +399,7 @@ void CnrHandler::updateDeviceConfig()
{
DBTransaction trans(m_db->database());
for (const auto &config : std::as_const(m_cache))
for (const auto &config : qAsConst(m_cache))
if (config.isActive())
m_deviceConfig->update(config);
@@ -480,7 +481,7 @@ Core::FunctionReplyObject CnrHandler::validateRequest(const ModifyCnrConfigReque
*/
bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &constraint, const boost::optional<int> &exerciseId, const boost::optional<int32_t> &excludeId) const
{
for (const CnrConfig &config : std::as_const(m_cache))
for (const CnrConfig &config : qAsConst(m_cache))
{
if (excludeId == config.id())
continue;
@@ -706,7 +707,7 @@ QString CnrHandler::exerciseList(const CnrConfig &config) const
// Global - all active exercises, no matter if they have active plannings or not
QStringList exerciseList;
for (const auto &context : std::as_const(m_activeExercises->allContexts()))
for (const auto &context : qAsConst(m_activeExercises->allContexts()))
exerciseList.append(context.toString());
return exerciseList.join(QLatin1Char(','));
}
@@ -743,7 +744,7 @@ int CnrHandler::normalizedAddacChannel(int addacChannel) const
Database::AvmCnrChannel CnrHandler::channelById(int32_t id) const
{
for (const Database::AvmCnrChannel &channel : std::as_const(m_channels))
for (const Database::AvmCnrChannel &channel : qAsConst(m_channels))
if (channel.id == id)
return channel;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.h
+5 -5
View File
@@ -11,11 +11,11 @@
#include "logger.h"
#include "avm_fts.h"
#include <AudioVideoManagement/avm_db.h>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtCore/QVector>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QObject>
#include <QHash>
#include <QVector>
#include <QMap>
#include <QString>
#include <boost/optional.hpp>
#include <memory>
#include <functional>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp
+5 -5
View File
@@ -8,7 +8,6 @@
*/
#include "cnr_tvc_profile_handler.h"
#include <utility>
#include "cnr_handler.h"
#include "tvc_handler.h"
#include <AudioVideoManagement/avm_dts.h>
@@ -50,7 +49,7 @@ CnrTvcProfile toDds(const Database::AvmCnrTvcProfile &circuitContainerDb, T circ
CnrTvcProfile circuitContainerDds(circuitContainerDb.id, circuitContainerDb.operatorId, circuitContainerDb.exerciseId, {});
circuitContainerDds.data().reserve(circuitsDb.size());
for (const auto &currentCircuitDb : std::as_const(circuitsDb))
for (const auto &currentCircuitDb : qAsConst(circuitsDb))
circuitContainerDds.data().push_back(toDds(currentCircuitDb));
return circuitContainerDds;
}
@@ -117,6 +116,7 @@ CnrTvcProfileHandler::CnrTvcProfileHandler(DatabaseInterface *db, Interface::Dts
, m_fts(fts)
, m_cnrHandler(cnrHandler)
, m_tvcHandler(tvcHandler)
, m_logger(getLogger("CnrTvcProfileHandler"))
{
Q_ASSERT(db);
Q_ASSERT(dts);
@@ -148,7 +148,7 @@ bool CnrTvcProfileHandler::init()
return false;
}
for (const auto &currentCircuitContainer: std::as_const(circuitContainersDb))
for (const auto &currentCircuitContainer: qAsConst(circuitContainersDb))
status &= collectAndPublish(currentCircuitContainer);
return status;
@@ -570,7 +570,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type)
// Find all CnrTvcProfiles where this config is referenced and reload those.
// Hint: reloading might modify m_cache. Thus the reloading is done in a separate loop.
for (const auto &profile : std::as_const(m_cache))
for (const auto &profile : qAsConst(m_cache))
for (const auto &data : profile.data())
if (data.radioSystemId() == type && data.radioCircuitId() == configId)
{
@@ -578,7 +578,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type)
break;
}
for (const auto &profile : std::as_const(toBeReloaded))
for (const auto &profile : qAsConst(toBeReloaded))
{
Database::AvmCnrTvcProfile profileDb = toDb(profile);
const bool isReload = true;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h
+3 -3
View File
@@ -11,9 +11,9 @@
#include <logger.h>
#include <avm_fts.h>
#include <avm_db.h>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <QtCore/QMap>
#include <QObject>
#include <QVector>
#include <QMap>
#include <cstdint>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp
+1 -12
View File
@@ -18,9 +18,7 @@
#include <InfrastructureManagement/ism_dtc.h>
#include <DDS/DDSConnector/dds_connector.h>
#if BUILD_RTI
#include <DDS/Core/pacemaker.h>
#endif
namespace AudioVideoManagement
@@ -28,6 +26,7 @@ namespace AudioVideoManagement
DdsHandler::DdsHandler(int domainId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
@@ -40,7 +39,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
return false;
}
#if BUILD_RTI
// default initialize Publisher and Subscriber
m_ddsConnector->initPublisherSubscriber();
// no batched writer possible until frequency set data is no longer that big (currently 1800rows)
@@ -60,9 +58,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
bRet &= m_fts->enableAll();
return bRet;
#else
return true;
#endif
}
bool DdsHandler::enableDtcClients()
@@ -70,7 +65,6 @@ bool DdsHandler::enableDtcClients()
Q_ASSERT(m_exmDtc);
Q_ASSERT(m_ismDtc);
Q_ASSERT(m_asmDtc);
#if BUILD_RTI
bool status = m_exmDtc->enableExercise() &&
m_ismDtc->enableInstrumentationAsset() &&
m_ismDtc->enableMainStructureElement() &&
@@ -79,16 +73,11 @@ bool DdsHandler::enableDtcClients()
Q_ASSERT(status);
return status;
#else
return true;
#endif
}
#if BUILD_RTI
dds::domain::DomainParticipant DdsHandler::domainParticipant() const
{
return m_ddsConnector->getDomainParticipant();
}
#endif
} // Namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
+3 -8
View File
@@ -8,11 +8,9 @@
#pragma once
#include "logger.h"
#if BUILD_RTI
#include <dds/domain/DomainParticipant.hpp>
#endif
#include <DDS/Core/topic_lock_master.h>
#include <QtCore/QStringList>
#include <QStringList>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dts_types.h>
@@ -75,11 +73,7 @@ public:
*/
bool enableDtcClients();
#if BUILD_RTI
dds::domain::DomainParticipant domainParticipant() const;
#else
void* domainParticipant() const { return nullptr; }
#endif
std::shared_ptr<Core::Pacemaker> pacemaker() const { return m_pacemaker; }
std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }
@@ -93,7 +87,6 @@ public:
std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
@@ -102,6 +95,8 @@ private:
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
std::shared_ptr<Interface::Fts> m_fts;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
+6 -4
View File
@@ -15,7 +15,7 @@
#include <AudioVideoManagement/avm_dts.h>
#include <AudioVideoManagement/handler_menu_struct.h>
#include <InfrastructureManagement/ism_dtc.h>
#include <QtCore/QTimer>
#include <QTimer>
#include <QtGlobal>
#include <set>
#include <algorithm>
@@ -70,13 +70,15 @@ bool isStreamOfInterest(const AudioVideoManagement::Stream &stream, bool isAudio
namespace AudioVideoManagement
{
DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc) : m_context(context)
DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc)
: m_context(context)
, m_dts(dts)
, m_videoTeamHandler(handlerVideoTeams)
, m_ismDtc(ismDtc)
, m_timer(new QTimer)
, m_isInitialized(false),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_logger(getLogger("DefaultAvMenus"))
, m_isInitialized(false)
{
Q_ASSERT(dts);
Q_ASSERT(ismDtc);
if(!m_ismDtc->isMainStructureElementEnabled())
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include "handler_video_team.h"
#include <AudioVideoManagement/avm_dtc.h>
#include <QtCore/QObject>
#include <QObject>
#include <map>
#include <vector>
#include <memory>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
+2 -4
View File
@@ -10,10 +10,10 @@
#pragma once
#include "exercise_context.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include "asset.h"
#include "mounting_point.h"
#include <QtCore/QObject>
#include <QObject>
#include <boost/optional.hpp>
#include <memory>
#include <map>
@@ -69,8 +69,6 @@ signals:
void assetUnassigned(Asset *asset);
private:
NGL::INGLLogger &m_logger;
ExerciseContext m_context;
std::map<int, std::unique_ptr<Asset>> m_assets;
std::map<int, std::unique_ptr<MountingPoint>> m_mountingPoints;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#include "exercise_context.h"
#include <QtCore/QString>
#include <QString>
namespace
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include <boost/optional.hpp>
#include <QtGlobal>
#include <ostream>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp
+5 -3
View File
@@ -35,15 +35,17 @@ bool isActive(ExerciseManagement::ExerciseState state)
namespace AudioVideoManagement
{
ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId) : QObject()
ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId)
: QObject()
, m_exContext(exerciseId)
, m_curExerciseState(ExerciseManagement::ExerciseState::Unknown)
, m_curAVOperatingMode(AVControl::OperatingMode::Unknown)
, m_mainHandler(mainHandler)
, m_updateTimer(new QTimer(this))
, m_lastSeenTimer(new QTimer(this))
, m_bWarnedOnce(false),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_bWarnedOnce(false)
, m_logger(getLogger("ExerciseHandler"))
{
m_updateTimer->setSingleShot(true);
connect(m_updateTimer, &QTimer::timeout, this, &ExerciseHandler::onUpdateTimerTimeout);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.h
+2 -2
View File
@@ -8,9 +8,9 @@
#pragma once
#include <QtCore/QObject>
#include <QObject>
#include <QMultiMap>
#include <QtCore/QTimer>
#include <QTimer>
#include <AudioVideoManagement/avm_db.h>
#include <ExerciseManagement/exm_dtc.h>
#include <ExerciseManagement/exm_enums.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp
+7 -6
View File
@@ -7,7 +7,6 @@
*/
#include "exercises_handler.h"
#include <utility>
#include "dds_handler.h"
#include "dds_handler_exercise.h"
#include "main_handler.h"
@@ -52,10 +51,12 @@ private:
};
ExercisesHandler::ExercisesHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
ExercisesHandler::ExercisesHandler(MainHandler *mainHandler)
: m_mainHandler(mainHandler)
, m_triggerAvUpdateTimer(new QTimer(this))
, m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc())),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc()))
, m_logger(getLogger("ExercisesHandler"))
{
m_triggerAvUpdateTimer->setSingleShot(true);
m_triggerAvUpdateTimer->setInterval(1000);
connect(m_triggerAvUpdateTimer, &QTimer::timeout,
@@ -79,7 +80,7 @@ bool ExercisesHandler::init()
return false;
DBTransaction trans(db()->database());
for (const Database::AvmDeviceConfig &dc : std::as_const(avmDeviceConfig))
for (const Database::AvmDeviceConfig &dc : qAsConst(avmDeviceConfig))
{
// nur hinzufuegen, wenn es record/replay session ist
// alle anderen -> aus DB loeschen
@@ -97,7 +98,7 @@ bool ExercisesHandler::init()
connect(exmDtc(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
this, &ExercisesHandler::onExerciseChanged);
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " done";
DEBUG_LOG(m_logger) << LOGFUNCTION << " done";
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.h
+2 -2
View File
@@ -78,7 +78,6 @@ public slots:
void onAvDbReloadNeeded();
private:
NGL::INGLLogger &m_logger;
void createExerciseHandlerFromLastSeen(const Database::AvmExerciseLastSeen &lastSeen);
ExerciseHandler *getOrCreateExerciseHandler(int exerciseId);
ExerciseHandler *createExerciseHandler(int exerciseId);
@@ -93,12 +92,13 @@ private slots:
void exerciseFinished(int exerciseId);
private:
NGL::INGLLogger &m_logger;
MainHandler *m_mainHandler;
QTimer *m_triggerAvUpdateTimer;
std::unique_ptr<AssetAssignmentManager> m_assetAssignmentManager;
class ExerciseParts;
std::map<int, ExerciseParts> m_exercises;
NGL::INGLLogger &m_logger;
};
} // namespace WarehouseManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
+5 -5
View File
@@ -7,7 +7,6 @@
*/
#include "frequency_planning_handler.h"
#include <utility>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include "frequency_set_handler.h"
@@ -18,7 +17,7 @@
#include <ngldb/dbtransaction.h>
#include <algorithm>
#include <vector>
#include <QtCore/QSet>
#include <QSet>
namespace AudioVideoManagement
{
@@ -118,6 +117,7 @@ FrequencyPlanningHandler::FrequencyPlanningHandler(Interface::Dts *dts, Interfac
, m_db(db)
, m_frequencySetHandler(frequencySetHandler)
, m_activeExercises(activeExercises)
, m_logger(getLogger("FrequencyPlanningHandler"))
{
Q_ASSERT(dts);
Q_ASSERT(fts);
@@ -160,7 +160,7 @@ bool FrequencyPlanningHandler::init()
return false;
}
for (const Database::AvmFrequencyPlanning &planContainerDb : std::as_const(frequencyPlannings))
for (const Database::AvmFrequencyPlanning &planContainerDb : qAsConst(frequencyPlannings))
collectAndPublish(planContainerDb);
auto cbAfp = [this] (const Database::AvmActiveFrequencyPlanning &currentDbData)
@@ -360,7 +360,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify
for (const FrequencyPlanningData &entry : request.data())
{
QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties());
for(const int &setEntry : std::as_const(frequencySetEntries))
for(const int &setEntry : qAsConst(frequencySetEntries))
{
if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId(), setEntry))
return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId());
@@ -556,7 +556,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve
for (const FrequencyPlanningData &fpdEntry : entries)
{
QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties());
for(const int &setEntry : std::as_const(frequencySetEntries))
for(const int &setEntry : qAsConst(frequencySetEntries))
{
if(takenSetEntries.contains(setEntry))
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include <avm.hpp>
#include <logger.h>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <QMap>
#include <vector>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp
+7 -6
View File
@@ -8,7 +8,6 @@
*/
#include "frequency_set_handler.h"
#include <utility>
#include "dds_handler.h"
#include "main_handler.h"
#include <AudioVideoManagement/avm_dts.h>
@@ -16,16 +15,18 @@
namespace AudioVideoManagement
{
FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
, m_db(db),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db)
: m_dts(dts)
, m_db(db)
, m_logger(getLogger("FrequencySetHandler"))
{
Q_ASSERT(dts);
Q_ASSERT(db);
}
bool FrequencySetHandler::init()
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
DEBUG_LOG(m_logger) << LOGFUNCTION;
QVector<Database::AvmFrequencySet> frequencySets;
// Don't use select() with callback here as the callback (body of for-loop below) would use the DB, too.
@@ -36,7 +37,7 @@ bool FrequencySetHandler::init()
}
DEBUG_LOG(m_logger) << "Found " << frequencySets.size() << " Frequency Sets";
for (const Database::AvmFrequencySet &currentfrequencySet : std::as_const(frequencySets))
for (const Database::AvmFrequencySet &currentfrequencySet : qAsConst(frequencySets))
addFrequencySet(toDdsFrequencySet(currentfrequencySet));
return true;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include <avm_db.h>
#include <avm.hpp>
#include <logger.h>
#include <QtCore/QMap>
#include <QtCore/QVector>
#include <QMap>
#include <QVector>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp
+5 -5
View File
@@ -7,7 +7,6 @@
*/
#include "handler_frequency_planning_status.h"
#include <utility>
#include "object_frequency_planning_status.h"
#include "avm_db.h"
@@ -54,6 +53,7 @@ HandlerFrequencyPlanningStatus::HandlerFrequencyPlanningStatus(Interface::Dts *d
, m_dts(dts)
, m_fts(fts)
, m_db(db)
, m_logger(getLogger("HandlerFrequencyPlanningStatus"))
{
Q_ASSERT(dts);
Q_ASSERT(fts);
@@ -81,7 +81,7 @@ bool HandlerFrequencyPlanningStatus::init()
}
// create objects
for (const Database::AvmFrequencyPlanningStatus &data : std::as_const(dataVec))
for (const Database::AvmFrequencyPlanningStatus &data : qAsConst(dataVec))
{
FrequencyPlanningStatus ddsData = ObjectFrequencyPlanningStatus::toDdsData(data);
ObjectFrequencyPlanningStatus *ifs(new ObjectFrequencyPlanningStatus(m_dts, m_db));
@@ -112,7 +112,7 @@ void HandlerFrequencyPlanningStatus::onClearFrequencyPlanningStatusRequest(const
{
Q_UNUSED(request);
Core::FunctionReplyObject ret;
for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data))
for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data))
{
ret = ifs->clearValues();
if (ret.error())
@@ -125,7 +125,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ
{
Core::FunctionReplyObject ret;
QVector<int> clients;
for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data))
for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data))
{
if (request.client() == 0 || ifs->getData().client() == request.client())
{
@@ -137,7 +137,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ
clients << client;
}
}
for (int client : std::as_const(clients))
for (int client : qAsConst(clients))
{
// delete ObjectVideoReceiver
delete m_data[client];
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.h
+2 -2
View File
@@ -12,8 +12,8 @@
#include "main_handler.h"
#include <avm_fts.h>
#include <AudioVideoManagement/avm_db.h>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QMap>
#include <QObject>
#include <memory>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
+2 -1
View File
@@ -11,7 +11,7 @@
#include "object_menu_struct.h"
#include "audio_video_handler_impl.h"
#include <AudioVideoManagement/avm_dts.h>
#include <QtCore/QVector>
#include <QVector>
#include <tuple>
namespace
@@ -106,6 +106,7 @@ HandlerMenuStruct::HandlerMenuStruct(Interface::Dts *dts, Interface::Fts *fts, D
, m_dts(dts)
, m_fts(fts)
, m_db(db)
, m_logger(getLogger("HandlerMenuStruct"))
{
Q_ASSERT(dts);
Q_ASSERT(fts);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.h
+3 -3
View File
@@ -9,9 +9,9 @@
#include "logger.h"
#include <AudioVideoManagement/avm_fts.h>
#include <AudioVideoManagement/avm_db.h>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QObject>
#include <QMap>
#include <QList>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
+5 -5
View File
@@ -7,12 +7,11 @@
*/
#include "handler_video_receiver.h"
#include <utility>
#include "object_video_receiver.h"
#include <QtNetwork/QNetworkReply>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <QNetworkReply>
#include <QJsonObject>
#include <QJsonDocument>
#include <QEventLoop>
#include <LtsUtilsCore/json_object.h>
#include <QJsonParseError>
@@ -34,6 +33,7 @@ HandlerVideoReceiver::HandlerVideoReceiver(MainHandler *mainHandler,
, m_dts(dts)
, m_fts(fts)
, m_db(db)
, m_logger(getLogger("HandlerVideoReceiver"))
{
m_fts->setVideoReceiverModifyActiveRequestHandler(this);
m_fts->setVideoReceiverModifyAvsRequestHandler(this);
@@ -68,7 +68,7 @@ bool HandlerVideoReceiver::init()
}
// create objects
for (const Database::AvmVideoReceiver &data : std::as_const(dataVec))
for (const Database::AvmVideoReceiver &data : qAsConst(dataVec))
{
AudioVideoManagement::VideoReceiver ddsData = ObjectVideoReceiver::toDdsData(data);
ObjectVideoReceiver *ifs(new ObjectVideoReceiver(m_dts, m_db));
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.h
+4 -4
View File
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QMap>
#include <QObject>
#include "dds_handler.h"
#include "logger.h"
@@ -16,8 +16,8 @@
#include <avm_fts.h>
// HTTP Request
#include <QtNetwork/QNetworkAccessManager>
#include <QtCore/QTimer>
#include <QNetworkAccessManager>
#include <QTimer>
#include <AudioVideoManagement/avm_db.h>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp
+6 -5
View File
@@ -7,7 +7,6 @@
*/
#include "handler_video_team.h"
#include <utility>
#include "object_video_team.h"
#include "default_av_menus.h"
@@ -101,6 +100,7 @@ private:
QMap<int32_t, Database::AvmDeviceConfig> m_cache; //!< <VideoTeam::id, Database::DeviceConfig>
HandlerVideoTeam *m_handler;
DatabaseInterface *m_db;
LOGGER_T m_logger;
};
@@ -111,6 +111,7 @@ HandlerVideoTeam::HandlerVideoTeam(Interface::Dts *dts, Interface::Fts *fts, Dat
, m_fts(fts)
, m_db(db)
, m_activeExercises(activeExercises)
, m_logger(getLogger("HandlerVideoTeam"))
, m_deviceConfig(new DeviceConfig(this, db, m_logger))
{
Q_ASSERT(dts);
@@ -142,7 +143,7 @@ bool HandlerVideoTeam::init()
}
// create objects
for (const Database::AvmVideoTeam &data : std::as_const(dataVec))
for (const Database::AvmVideoTeam &data : qAsConst(dataVec))
{
VideoTeam ddsData = ObjectVideoTeam::toDdsData(data);
ObjectVideoTeam *ifs(new ObjectVideoTeam(m_dts, m_db));
@@ -167,7 +168,7 @@ bool HandlerVideoTeam::init()
QMap<int, VideoTeam> HandlerVideoTeam::videoTeams() const
{
QMap<int, VideoTeam> ret;
for (const auto &videoTeam : std::as_const(m_videoTeamObjMap))
for (const auto &videoTeam : qAsConst(m_videoTeamObjMap))
ret.insert(videoTeam->getId(), videoTeam->getData());
return ret;
}
@@ -192,7 +193,7 @@ bool HandlerVideoTeam::needDeviceConfig(const VideoTeam &videoTeam) const
void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
{
for (const auto *ifs : std::as_const(m_videoTeamObjMap))
for (const auto *ifs : qAsConst(m_videoTeamObjMap))
{
VideoTeam ddsData = ifs->getData();
if (ddsData.exerciseId() == context.id())
@@ -202,7 +203,7 @@ void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context)
{
for (ObjectVideoTeam *ifs : std::as_const(m_videoTeamObjMap))
for (ObjectVideoTeam *ifs : qAsConst(m_videoTeamObjMap))
{
if (ifs->exerciseId() == context.id())
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.h
+2 -2
View File
@@ -12,8 +12,8 @@
#include "main_handler.h"
#include <avm_fts.h>
#include <AudioVideoManagement/avm_db.h>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QMap>
#include <QObject>
#include <memory>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/iava_comm.h
+3 -3
View File
@@ -10,12 +10,12 @@
#pragma once
#include "ava_types.h"
#include "svcavmcommon_export.h"
#include "avm_export.h"
#include <boost/optional.hpp>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <QObject>
#include <QVector>
#include <chrono>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/icommand.h
+2 -2
View File
@@ -9,8 +9,8 @@
#pragma once
#include "svcavmcommon_export.h"
#include <QtCore/QObject>
#include <AudioVideoManagement/avm_export.h>
#include <QObject>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include <AudioVideoManagement/exercise_context.h>
#include <AudioVideoManagement/avm_db.h>
#include <QtCore/QObject>
#include <QObject>
#include <map>
#include <cstdint>
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ivd_comm.h
+3 -3
View File
@@ -10,9 +10,9 @@
#pragma once
#include "ava_types.h"
#include "svcavmcommon_export.h"
#include <QtCore/QList>
#include <QtCore/QObject>
#include "avm_export.h"
#include <QList>
#include <QObject>
#include <chrono>
class QString;
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include "list_response_collector.h"
#include "av_helper.h"
#include <QtCore/QString>
#include <QtCore/QByteArray>
#include <QString>
#include <QByteArray>
#include <QtGlobal>
namespace AudioVideoManagement
Loaded 100 of 1244 files, more files were not shown because too many files have changed in this diff. Show more