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:
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_bccontamination_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
#include "tln_bite_message_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QPainter>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -2,12 +2,12 @@
|
||||
|
||||
#include <LtsTimeline/item.h>
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "../../tln_abstract_event_item.h"
|
||||
|
||||
#include <vector>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
|
||||
class QPixmap;
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_borderline_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+7
-7
@@ -11,13 +11,13 @@
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
inline static void sort(QVector<QString> &items)
|
||||
{
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_camera_video_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+3
-3
@@ -5,9 +5,9 @@
|
||||
#include <ExerciseEventManagement/eem.hpp>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QGroupBox>
|
||||
#include <QGridLayout>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -3,10 +3,10 @@
|
||||
#include "tln_cross_borderline_filter.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QModelIndex>
|
||||
#include <QPainter>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_danger_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_emergency_call_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_enter_danger_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_enter_functional_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_enter_mine_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_enter_nuclear_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_equipment_error_report_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+6
-6
@@ -6,12 +6,12 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_fire_event_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_friendly_fire_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_functional_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_gas_pipe_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+6
-6
@@ -12,12 +12,12 @@
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QCheckBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_hit_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_hit_b_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+8
-8
@@ -14,16 +14,16 @@
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+5
-5
@@ -4,12 +4,12 @@
|
||||
|
||||
#include <AreaEffectSimulation/aes_translation.h>
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QObject>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_hit_c_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+6
-6
@@ -8,12 +8,12 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_hit_effect_simulation_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_hit_gas_pipe_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_hit_mine_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_hit_n_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_leave_danger_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_leave_functional_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_leave_mine_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_leave_nuclear_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QGroupBox>
|
||||
#include <QGridLayout>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_manipulation_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
#include <MarkerManagement/mrk.hpp>
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QGroupBox>
|
||||
#include <QGridLayout>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
|
||||
namespace NGL
|
||||
|
||||
+4
-4
@@ -2,10 +2,10 @@
|
||||
#include "tln_marker_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QModelIndex>
|
||||
#include <QPainter>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_mine_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_mine_corridor_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_n_contamination_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+5
-5
@@ -9,11 +9,11 @@
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_radio_cnr_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+5
-5
@@ -9,11 +9,11 @@
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -2,11 +2,11 @@
|
||||
#include "tln_radio_tvc_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_sanitation_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#include "tln_technical_area_item.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+5
-5
@@ -6,11 +6,11 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+5
-5
@@ -2,12 +2,12 @@
|
||||
#include "tln_weapon_assignment_event_factory.h"
|
||||
#include "../../logger.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QModelIndex>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QPixmap>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+6
-6
@@ -9,13 +9,13 @@
|
||||
#include <EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h>
|
||||
#include <EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h>
|
||||
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QComboBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
class QGridLayout;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <LtsTimeline/item.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
|
||||
class QPainter;
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsSession/lts_session_manager.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+8
-8
@@ -4,15 +4,15 @@
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
|
||||
#include <QGroupBox>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QComboBox>
|
||||
#include <QCheckBox>
|
||||
#include <QGridLayout>
|
||||
#include <QVBoxLayout>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QCheckBox>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <QVariant>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
|
||||
class QGroupBox;
|
||||
|
||||
+4
-4
@@ -7,10 +7,10 @@
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <LtsWidgets/lts_base.h>
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <LtsTimeline/timeline_utils.h>
|
||||
#include <LtsWidgets/lts_spinbox.h>
|
||||
#include <LtsWidgets/lts_date_time_edit.h>
|
||||
#include <QComboBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+7
-7
@@ -17,20 +17,20 @@
|
||||
#include "EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h"
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QPainter>
|
||||
#include <QDateTime>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtCore/QAbstractItemModel>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
|
||||
namespace NGL { class INGLLogger; }
|
||||
|
||||
+5
-5
@@ -15,11 +15,11 @@
|
||||
#include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonValue>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include <Viewer/LtsDataView/lts_data_view.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
|
||||
#include <QHeaderView>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace Timeline
|
||||
{
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <MarkerManagement/mrk_data_plugin_interface.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+4
-4
@@ -19,10 +19,10 @@
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
#include <QLabel>
|
||||
#include <QImage>
|
||||
#include <QPixmap>
|
||||
#include <QPainter>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+3
-3
@@ -5,10 +5,10 @@
|
||||
#include <LtsTimeline/timeline_view.h>
|
||||
#include <LtsTimeline/timeline_header_view.h>
|
||||
|
||||
#include <QGuiApplication>
|
||||
#include <QPainter>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+13
-13
@@ -37,21 +37,21 @@
|
||||
#include <LtsWidgets/lts_overlay_loading.h>
|
||||
|
||||
|
||||
#include <QFormLayout>
|
||||
#include <QSpinBox>
|
||||
#include <QLineEdit>
|
||||
#include <QTextEdit>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QFormLayout>
|
||||
#include <QtWidgets/QSpinBox>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
#include <QtWidgets/QTextEdit>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QCryptographicHash>
|
||||
#include <QInputDialog>
|
||||
#include <QLabel>
|
||||
#include <QMenu>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QCryptographicHash>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
#include <Plugins/SituationReplay/srp_data_plugin_interface.h>
|
||||
#include <Plugins/SituationReplayManagement/srm_data_plugin_interface.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace NGL { class INGLLogger; }
|
||||
|
||||
+13
-13
@@ -40,23 +40,23 @@
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include "tln_abstract_event_item.h"
|
||||
#include <QSqlDatabase>
|
||||
#include <QSqlQuery>
|
||||
#include <QSqlError>
|
||||
#include <QSqlRecord>
|
||||
#include <QSqlField>
|
||||
#include <QJsonDocument>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtSql/QSqlQuery>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtSql/QSqlRecord>
|
||||
#include <QtSql/QSqlField>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QElapsedTimer>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QFuture>
|
||||
#include <QFutureWatcher>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QFuture>
|
||||
#include <QtCore/QFutureWatcher>
|
||||
#include <QtConcurrent>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include "Services/AudioVideoManagement/stream_name_mapping.h"
|
||||
#include <map>
|
||||
#include <stdio.h>
|
||||
|
||||
+6
-6
@@ -16,14 +16,14 @@
|
||||
#include <Plugins/AudioVideoManagement/avm_menu_edit_gui_plugin_interface.h>
|
||||
#include <AudioVideoManagement/Shared/stream_list_result.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QMutex>
|
||||
#include <QPainter>
|
||||
#include <QSqlDatabase>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QUuid>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include <Viewer/LtsDataView/lts_data_view.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
|
||||
#include <QHeaderView>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QPalette>
|
||||
#include <QSpacerItem>
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
|
||||
|
||||
class QModelIndex;
|
||||
|
||||
+2
-2
@@ -5,9 +5,9 @@
|
||||
#include "tln_timeline_delegate.h"
|
||||
#include "tln_timeline_model.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "tln_utils.h"
|
||||
#include "ProjectDataManagement/pdm_translation.h"
|
||||
|
||||
#include <QHash>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
namespace Timeline
|
||||
|
||||
Reference in new issue
Block a user