Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase
- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({}))
- training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly
- training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods
- training_area_telegrams.h: Changed Header struct to public members for consistency
- tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access
- lts_coordinate.cpp: Added missing #include <iomanip>
- MIGRATION_STATUS.md: Added migration progress tracking document
C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+
Build status: BUILD_RTI=OFF successful (0 errors, warnings only)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+3
-3
@@ -15,8 +15,8 @@
|
||||
#include <AudioVideoManagement/Shared/avs_app.h>
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <OperatorManagement/opm.hpp>
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
#include <QtGlobal>
|
||||
#include <LtsSession/lts_session_data_dds.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <LtsSession/lts_session_data_dds.h>
|
||||
#include <ConnectDialog/connect_dialog_nt.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGlobal>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <boost/optional.hpp>
|
||||
#include <QChar>
|
||||
#include <QObject>
|
||||
#include <QtCore/QChar>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
|
||||
namespace OperatorManagement
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <AudioVideoManagement/ava_control.h>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <AudioVideoManagement/rt_state.h>
|
||||
#include <AudioVideoManagement/avm.hpp>
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
enum class DataModification;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "audio_settings_avail_streams_model.h"
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QVector>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <QtCore/QVector>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <set>
|
||||
#include <utility>
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
#include <QVector>
|
||||
#include <QMap>
|
||||
#include <QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "audio_settings_used_streams_model.h"
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
#include <QMimeData>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <AudioVideoManagement/avm.hpp>
|
||||
#include <QString>
|
||||
#include <QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <boost/operators.hpp>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#include "avm_sequence_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QColor>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QColor>
|
||||
#include <chrono>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <AudioVideoManagement/ava_session.h>
|
||||
#include <AudioVideoManagement/avs_dialog.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <TopicEditorBase/topic_previewer.h>
|
||||
#include <boost/optional.hpp>
|
||||
#include <cmath>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <QCollator>
|
||||
#include <QMimeData>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
namespace
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QDataStream>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
|
||||
class NGLTreeItem;
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
#include <Services/AudioVideoManagement/avs_dialog.h>
|
||||
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <LtsSession/lts_session_manager.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
#include "avm_menu_view_model.h"
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+7
-7
@@ -18,14 +18,14 @@
|
||||
#include <MarkerManagement/mrk_data_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QAction>
|
||||
#include <QIcon>
|
||||
#include <QInputDialog>
|
||||
#include <QMenu>
|
||||
#include <QModelIndex>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QSignalBlocker>
|
||||
#include <QStringList>
|
||||
#include <QVector>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtGlobal>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <utility>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <MarkerManagement/mrk_ftc.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <boost/optional.hpp>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <QMimeData>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+5
-5
@@ -3,11 +3,11 @@
|
||||
|
||||
#include "interval_model.h"
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
#include <QVariant>
|
||||
#include <QString>
|
||||
#include <QColor>
|
||||
#include <QModelIndex>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+6
-6
@@ -9,12 +9,12 @@
|
||||
#include <AudioVideoManagement/vd_control.h>
|
||||
#include <AudioVideoManagement/vd_session.h>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <QDebug>
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
#include <QJsonDocument>
|
||||
#include <QRect>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtGlobal>
|
||||
#include <TopicEditorBase/topic_editor_base.h>
|
||||
#include <chrono>
|
||||
|
||||
+4
-4
@@ -7,10 +7,10 @@
|
||||
#include <AudioVideoManagement/Shared/playback_app.h>
|
||||
#include <PluginInterfaces/topic_replay_interface.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QRect>
|
||||
#include <QVector>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <boost/optional.hpp>
|
||||
#include <memory>
|
||||
#include <AudioVideoManagement/ava_control.h>
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <utility>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+4
-4
@@ -11,10 +11,10 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QStandardItemModel>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
#include <QtCore/QTimer>
|
||||
#include <utility>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <boost/optional.hpp>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+4
-4
@@ -9,10 +9,10 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPainter>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QPainter>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include "avm_frequency_planning_helper.h"
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@
|
||||
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QTreeView>
|
||||
#include <QJsonArray>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QMessageBox>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
#include "avm_frequency_planning_dialog_model.h"
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_frequency_planning_helper.h"
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
#include <InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h>
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <AudioVideoManagement/avm.hpp>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ui_avm_load_frequency_planning_dialog.h"
|
||||
|
||||
#include "avm_load_frequency_planning_dialog_model.h"
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+4
-4
@@ -8,10 +8,10 @@
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPainter>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QPainter>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include "avm_frequency_planning_helper.h"
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include "avm_radio_specifica_widget.h"
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QButtonGroup>
|
||||
#include <QtWidgets/QButtonGroup>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include "avm_radio_specifica_widget.h"
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <QButtonGroup>
|
||||
#include <QtWidgets/QButtonGroup>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include "avm_radio_specifica_widget.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include "avm_radio_specifica_widget.h"
|
||||
|
||||
#include <QSpinBox>
|
||||
#include <QJsonArray>
|
||||
#include <QtWidgets/QSpinBox>
|
||||
#include <QtCore/QJsonArray>
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
RadioSpecificaWidget::RadioSpecificaWidget(QWidget *parent)
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QJsonObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <functional>
|
||||
|
||||
class QLabel;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <avm_eloka_edit_dialog.h>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
#include "avm_mvs_dialog.h"
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/AudioVideoManagement/avm_mvs_video_team_gui_plugin_interface.h>
|
||||
#include <QButtonGroup>
|
||||
#include <QtWidgets/QButtonGroup>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -9,10 +9,10 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <Services/AudioVideoManagement/avm_operator_rights.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QProcess>
|
||||
#include <QScreen>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtGui/QScreen>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "receiverelement.h"
|
||||
#include "ui_receiverelement.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOption>
|
||||
#include <QStyle>
|
||||
#include <QtWidgets/QStyle>
|
||||
|
||||
ReceiverElement::ReceiverElement(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <QRadioButton>
|
||||
#include <QtWidgets/QRadioButton>
|
||||
#include <AudioVideoManagement/avm.hpp>
|
||||
|
||||
namespace Ui
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include <QGroupBox>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QCheckBox;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
#include "avm_training_voice_communication_dialog_model.h"
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
#include <AudioVideoManagement/ava_control.h>
|
||||
#include <LtsMultiMonitor/lts_dummy_widget.h>
|
||||
#include <LtsMultiMonitor/lts_multi_monitor.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QScreen>
|
||||
#include <QPoint>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QPoint>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QString>
|
||||
#include <QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <QtGlobal>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
|
||||
namespace
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
#include <chrono>
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "project_settings.h"
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#include "stream_list_result.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <avmshared_export.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user