From 27fe03a03a1ada6ab4fbb975270f0dbc3a1f39f5 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Fri, 21 Aug 2026 07:04:40 +0200 Subject: [PATCH] WIP: Build fixes und EXTERNAL_DEPENDENCIES.md --- EXTERNAL_DEPENDENCIES.md | 174 ++++++++++++++++++ qt6-after/qt6-migrated-legatus/CMakeLists.txt | 2 + .../LtsElevation/lts_elevation_manager.h | 2 +- .../Lts/Common/LtsLogin/lts_login.cpp | 2 +- .../lts_multi_monitor_selector_base.cpp | 2 +- .../LtsMultiMonitor/lts_screen_base.cpp | 2 +- .../WebSocket/messages.h | 2 +- .../lts_projection_workstation.h | 2 +- .../Lts/Common/LtsTimelineClassic/Event.h | 2 +- .../LtsUtils/LtsUtilsCore/CMakeLists.txt | 8 +- .../LtsUtilsGuiDds/dds_vector_to_pixmap.cpp | 2 +- .../LtsUtilsGuiDds/dds_vector_to_pixmap.h | 2 +- .../LtsVirtualKeyboard/LtsVirtualKeyboard.cpp | 5 - .../LtsWidgets/lts_abstract_table_model.h | 2 +- .../Lts/Common/LtsWidgets/lts_base.h | 2 +- .../lts_column_filter_proxy_model.cpp | 2 +- .../lts_column_filter_proxy_model.h | 2 +- .../PluginInterfaces/gui_plugin_interface.h | 2 +- .../TopicEditorBase/topic_editor_base.h | 2 +- .../Lts/DDS/DTC/generic_dtc.h | 2 +- .../Lts/DDS/DdsUnitTests/generic_data_tests.h | 2 +- .../Lts/DDS/Generic/dynamic_data_reader.h | 2 +- .../Lts/DDS/Generic/generic_data_reader.h | 2 +- .../AdvancedSymbology/Data/CMakeLists.txt | 2 + .../Data/asb_foreign_interface_impl.cpp | 12 +- .../Data/asb_foreign_interface_impl.h | 73 ++++++++ .../Gui/SymbolEditor/asb_symbol_edit_scene.h | 2 +- .../Gui/SymbolEditor/asb_symbol_editor.cpp | 12 +- .../Gui/SymbolEditor/asb_symbol_editor.h | 2 +- .../asb_symbol_editor_gui_plugin.cpp | 2 +- .../Gui/SymbolProxy/asb_flm_subscriber.cpp | 2 +- .../Gui/SymbolProxy/asb_flm_subscriber.h | 2 +- .../asb_data_plugin_interface.h | 2 +- .../Gui/Common/alm_config_alarm_model.cpp | 41 +++-- .../Gui/Common/alm_config_alarm_model.h | 2 +- .../Gui/Common/alm_history_alarm_model.cpp | 30 +-- .../Gui/Common/alm_history_alarm_model.h | 2 +- .../aes_air_support_9liner_model.cpp | 2 +- .../Gui/Base/aes_base_edit.h | 2 +- .../asm_edit_training_area_dialog.cpp | 2 +- .../Data/operator_settings_observer.cpp | 2 +- .../Data/rt_profile_observer.cpp | 2 +- .../Gui/AVMenuEdit/avm_choose_menu.cpp | 2 +- .../avm_frequency_planning_dialog.h | 2 +- .../bdv_communication_interface_internal.h | 2 +- .../Common/bdv_dds_controller.cpp | 2 +- .../Common/bdv_dds_controller.h | 2 +- .../BuildingViewer/Common/bdv_helper.h | 2 +- .../bdv_topic_replay_interface.cpp | 2 +- .../Gui/BuildingInfo/bld_info_dialog.h | 2 +- .../Gui/BuildingInfo/bridge_info_dialog.h | 2 +- .../Gui/BuildingInfo/egcu_info_dialog.h | 2 +- .../Gui/BuildingInfo/egcu_operational.h | 2 +- .../Gui/CreateSimulation/cds_pdf_creator.cpp | 2 +- .../Gui/CreateSimulation/cds_plan_creator.cpp | 2 +- .../EffectShowClient/Gui/esc_order_edit.cpp | 2 +- .../EffectShowClient/Gui/esc_order_model.cpp | 2 +- .../Gui/EsmComboBox/esm_combobox.cpp | 3 +- ...sm_combobox_foreign_gui_interface_impl.cpp | 8 +- .../esm_combobox_foreign_gui_interface_impl.h | 31 +++- .../esm_effect_show_actor_relocation_edit.cpp | 4 + .../esm_effect_show_actor_relocation_edit.h | 4 + ...esm_effect_show_actor_relocation_model.cpp | 2 +- .../Gui/esm_effect_show_edit.cpp | 4 + .../Gui/esm_effect_show_edit.h | 5 + .../Gui/esm_effect_show_list.cpp | 4 + .../Gui/esm_effect_show_list.h | 4 + .../Gui/esm_effect_show_model.cpp | 2 +- .../esm_data_plugin_interface.h | 4 + .../san_nine_liner_dialog_model.cpp | 2 +- .../san_nine_liner_edit_dialog.cpp | 2 +- .../ExerciseChooser/exm_chooser.cpp | 2 +- .../ExerciseChooser/exm_chooser.h | 2 +- .../Gui/ExerciseEdit/exm_dialog_model.cpp | 2 +- .../Gui/ExerciseEdit/exm_edit_dialog.cpp | 2 +- .../HQReports/flm_hq_report_converter.cpp | 2 +- .../Explorer/HQReports/flm_hq_report_model.h | 2 +- .../Gui/Explorer/TopicEditor/topic_editor.cpp | 2 +- .../Gui/Explorer/flm_dialog.cpp | 2 +- .../Gui/Explorer/flm_explorer_gui_plugin.cpp | 2 +- .../Gui/Explorer/flm_preview_file_dialog.cpp | 2 +- .../Gui/Explorer/flm_preview_playback.cpp | 2 +- .../flt_aes_plugin_interface.h | 2 +- .../gim_data_plugin_interface.h | 4 + .../Gui/Common/gna_nasat_aircraft_model.cpp | 2 +- .../Common/gna_nasat_aircraft_part_model.cpp | 20 +- .../Common/gna_nasat_aircraft_part_model.h | 3 +- .../ism_mounting_point_list_dialog.cpp | 2 +- .../ism_dds_selector.cpp | 2 +- .../Gui/Common/CustomViews/mrk_marker.cpp | 11 +- .../Gui/Common/mrk_dialog_model.cpp | 29 ++- .../Gui/Common/mrk_dialog_model.h | 15 +- .../Gui/MarkerEdit/mrk_create_snapshot.cpp | 2 +- .../Gui/MarkerEdit/mrk_set_markers.cpp | 4 +- .../Gui/MarkerEdit/snapshot_dialog.cpp | 2 +- .../Gui/NotificationEdit/nom_dialog_model.cpp | 2 +- .../osc_participant_info.cpp | 2 +- .../Data/opm_data_plugin.cpp | 2 +- .../Gui/Login/opm_login_dialog_gui_plugin.cpp | 2 +- .../group_edit_member_of_model.cpp | 2 +- .../Gui/OperatorEdit/operator_edit_dialog.cpp | 2 +- .../operator_settings_dialog.cpp | 2 +- .../participant_organisation.cpp | 2 +- .../participant_history_dialog_model.cpp | 2 +- .../participant_info_dialog.cpp | 2 +- .../participant_info_table_model.cpp | 2 +- .../participant_set_sanitation_dialog.cpp | 2 +- .../participant_shootback_area_model.cpp | 2 +- .../ParticipantOrgChart/org_chart_main.cpp | 2 +- .../Gui/plan_overlays_gui_plugin.cpp | 2 +- .../Script/ScriptEditor/pre_script_dialog.cpp | 2 +- .../pre_script_dialog.cpp | 4 +- .../pre_topic_recorder.cpp | 2 +- .../Data/pdm_data_plugin.cpp | 2 +- .../Gui/PdmChargeTable/charge_edit_dialog.cpp | 9 +- .../Gui/PdmChargeTable/charge_edit_dialog.h | 30 ++- .../Gui/PdmChargeTable/charge_table.cpp | 7 +- .../Gui/PdmChargeTable/charge_table.h | 50 +++-- .../Gui/PdmChargeTable/charge_table_model.cpp | 6 +- .../Gui/PdmChargeTable/charge_table_model.h | 15 +- .../Gui/PdmComboBox/pdm_charge_selector.cpp | 9 +- .../Gui/PdmComboBox/pdm_charge_selector.h | 13 ++ .../Gui/PdmComboBox/pdm_combobox.cpp | 16 +- .../Gui/PdmComboBox/pdm_combobox.h | 22 ++- ...dm_combobox_foreign_gui_interface_impl.cpp | 7 +- .../pdm_combobox_foreign_gui_interface_impl.h | 12 ++ .../pdm_data_plugin_interface.h | 19 +- .../Common/pws_vnc_handler.cpp | 4 +- .../Input/rep_input_charge_model.cpp | 2 +- .../Models/rep_abstract_model.cpp | 2 +- .../Gui/ReportViewer/rep_report_edit.cpp | 2 +- .../Gui/ReportViewer/rep_report_preview.cpp | 2 +- .../Gui/ServiceEdit/scm_dialog.cpp | 2 +- .../Gui/Monitors/smo_base_player_model.cpp | 2 +- .../SituationMap/AdapterDds/adapter_dds.cpp | 2 +- .../Gui/SituationMap/AdapterDds/adapter_dds.h | 2 +- .../AdapterDds/booby_traps_to_map.cpp | 2 +- .../AdapterDds/building_contamination.cpp | 2 +- .../AdapterDds/building_contamination.h | 2 +- .../AdapterDds/building_ownership.cpp | 2 +- .../AdapterDds/building_ownership.h | 2 +- .../AdapterDds/charge_effect_to_map.cpp | 2 +- .../AdapterDds/effect_cluster_to_map.cpp | 2 +- .../AdapterDds/emergency_call_to_map.cpp | 2 +- .../AdapterDds/explosion_cluster_to_map.cpp | 2 +- .../AdapterDds/hitlineinfo_to_map.cpp | 4 +- .../AdapterDds/mounting_point_to_map.cpp | 2 +- .../AdapterDds/ncontamination_to_map.cpp | 2 +- .../AdapterDds/off_route_to_map.cpp | 2 +- .../AdapterDds/participant_to_map.cpp | 4 +- .../Gui/SituationMap/AdapterDds/pdm_handler.h | 2 +- .../AdapterDds/sim_to_situation_map_tmpl.h | 2 +- .../AdapterDds/unified_map_object_data.h | 2 +- .../map_object_custom_view.h | 2 +- .../MapObjectSelection/map_object_model.h | 2 +- .../map_object_selection_widget.h | 2 +- .../Gui/SituationMap/layers_model.h | 2 +- .../Gui/SituationMap/sitmap_layer_control.h | 2 +- .../Gui/SituationMap/sitmap_widget_control.h | 2 +- .../Gui/SituationMap/situation_map_init.h | 4 +- .../Gui/SituationMap/situation_map_init_p.h | 2 +- .../SituationMap/terrain_profile_handler.cpp | 2 +- .../Data/srm_data_plugin.cpp | 2 +- .../replay_management_gui_plugin.cpp | 2 +- .../tgt_area_model.cpp | 2 +- .../tgt_assignment_part_model.cpp | 2 +- .../tgt_target_part_model.cpp | 2 +- .../EventTimeline/tln_abstract_event_item.h | 2 +- .../Gui/EventTimeline/tln_timeline_dialog.cpp | 2 +- .../Gui/EventTimelineClassic/detail_data.h | 2 +- .../BuildingControlUnit/VWM/vwm_building.h | 2 +- .../VWM/vwm_building_room_geometry.cpp | 2 +- .../VWM/vwm_building_room_geometry.h | 2 +- .../BuildingControlUnit/VWM/vwm_deposition.h | 2 +- .../BuildingControlUnit/VWM/vwm_math.h | 2 +- .../BuildingControlUnit/VWM/vwm_types.h | 2 +- .../Buildings/BuildingControlUnit/bcu_types.h | 2 +- .../Proxies/Buildings/building_process.cpp | 2 +- .../Lts/Proxies/Buildings/ism_handler.cpp | 2 +- .../Lts/Proxies/Buildings/ism_handler.h | 4 +- .../Lts/Proxies/Buildings/settings.cpp | 2 +- .../Helper/cnr_frequency_planning_helper.h | 2 - .../CombatNetRadio/active_exercises.cpp | 2 +- .../Proxies/CombatNetRadio/positions_cnr.cpp | 2 +- .../Plugins/AdlerJson/aes_handler.h | 2 +- .../Plugins/AdlerJson/asm_handler.cpp | 2 +- .../Plugins/AdlerJson/flm_handler.cpp | 2 +- .../Plugins/AdlerJson/pdm_handler.h | 2 +- .../Plugins/AdlerJson/ppm_handler.cpp | 2 +- .../Plugins/AdlerJson/ppm_handler.h | 2 +- .../Plugins/AdlerJson/settings.cpp | 2 +- .../Plugins/ApacheHlaJson/aes_handler.h | 2 +- .../Plugins/ApacheHlaJson/pdm_handler.h | 2 +- .../Plugins/ApacheHlaJson/ppm_handler.h | 2 +- .../TmsIfAdapter/src/abstract_dispatcher.h | 2 +- .../Proxies/TrainingAreaBase/ism_handler.h | 2 +- .../Lts/Proxies/TrainingAreaBase/settings.cpp | 2 +- .../TrainingAreaBaseOC/canag_handler.cpp | 2 +- .../TrainingAreaBaseOC/canag_handler.h | 2 +- .../connection_handler_serial.h | 2 +- .../connection_handler_tcp.h | 2 +- .../connection_handler_tcp_ttci.h | 2 +- .../WirelessLocationSystem/ism_handler.h | 2 +- .../Proxies/WirelessLocationSystem/main.cpp | 2 +- .../web_socket_handler.cpp | 2 +- .../wls_participant.cpp | 4 +- .../wls_sfm_message_converter.cpp | 2 +- .../abstract_firing_strategy.cpp | 2 +- .../gmlrs_firing_strategy.h | 2 +- .../trajectory_unit_test.cpp | 2 +- .../Trajectory/trajectory_generator.cpp | 2 +- .../Trajectory/trajectory_generator.h | 2 +- .../Trajectory/trajectory_generator_vulcano.h | 2 +- .../Trajectory/trajectory_helper.cpp | 2 +- .../Trajectory/trajectory_point.h | 2 +- .../Trajectory/trajectory_transform.h | 2 +- .../AreaEffectSimulation/Utils/aes_helper.h | 2 +- .../Utils/firing_timer.cpp | 2 +- .../AreaEffectSimulation/Utils/polygons.cpp | 2 +- .../_object_explosion_single_central.h | 2 +- .../object_effect_cluster.h | 2 +- .../AreaEffectSimulation/object_effector.cpp | 2 +- .../object_explosion_cluster.h | 2 +- .../AssetManagement/convert_db_to_dds.h | 2 +- .../asset_assignment_manager_test.cpp | 2 +- .../UnitTests/avs_command_queue_test.cpp | 2 +- .../AudioVideoManagement/ava_control.h | 2 +- .../avs_command_queue.cpp | 2 +- .../AudioVideoManagement/avs_menus.cpp | 2 +- .../stream_name_mapping.cpp | 2 +- .../stream_name_mapping_publisher.cpp | 2 +- .../AudioVideoManagement/vd_control.h | 2 +- .../Plugins/Buildings/ces_building_model.cpp | 2 +- .../Plugins/Buildings/handler_aes_data.cpp | 2 +- .../Plugins/Ces2D/handler_aes_data.cpp | 2 +- .../Plugins/Explosions/handler_explosions.cpp | 2 +- .../Plugins/Explosions/handler_vulcano.cpp | 2 +- .../Plugins/GasPipes/handler_aes_data.cpp | 2 +- .../Plugins/GeoPairing/handler_geopairing.cpp | 2 +- .../Plugins/MineAreas/handler_mine_areas.cpp | 2 +- .../TargetAreas/handler_target_areas.h | 2 +- .../handler_participant.h | 2 +- .../connection_handler_serial.cpp | 2 +- .../connection_handler_tcp.cpp | 2 +- .../EffectShowClient/connection_handler_tcp.h | 2 +- .../EffectShowClient/esc_convert_to_tab.cpp | 2 +- .../esm_convert_to_tab.cpp | 2 +- .../EffectShowManagement/handler_tab_data.cpp | 2 +- .../UnitTests/data_topic_tests.h | 2 +- .../ExerciseManagement/convert_db_to_dds.h | 2 +- .../ExerciseManagement/handler_exercise.cpp | 2 +- .../Services/ExerciseManagement/settings.cpp | 2 +- .../FileManagement/ModuleTests/flm_tests.cpp | 2 +- .../FileManagement/convert_db_to_dds.h | 2 +- .../Lts/Services/FileManagement/settings.cpp | 2 +- .../ModuleTests/ism_tests.cpp | 2 +- .../object_main_structure_element.cpp | 2 +- .../parse_building_xml.cpp | 2 +- .../OcSituationClient/handler_oc_data.cpp | 2 +- .../handler_oc_situation_data.cpp | 2 +- .../OcSituationServer/handler_oc_aes_data.cpp | 2 +- .../handler_oc_central_aes_data.cpp | 4 +- .../OcSituationServer/handler_oc_data.cpp | 2 +- .../handler_oc_situation_data.cpp | 4 +- .../OperatorManagement/handler_operator.cpp | 2 +- .../OperatorManagement/object_operator.cpp | 2 +- .../Services/OperatorManagement/settings.cpp | 2 +- .../equipment_event_handler.cpp | 2 +- .../participant_handler.cpp | 2 +- .../unit_position_calculator.cpp | 4 +- .../ParticipantManagement/convert_db_to_dds.h | 2 +- .../ParticipantManagement/settings.cpp | 2 +- .../ModuleTests/pdm_tests.h | 7 +- .../ProjectDataManagement/translation.cpp | 2 +- .../Generator/handler_report_get_data.cpp | 2 +- .../Generator/handler_report_unit_power.cpp | 2 +- .../ModuleTests/rep_tests.cpp | 2 +- .../UnitTests/data_topic_tests.h | 2 +- .../ServiceManagement/service_handler.cpp | 2 +- .../TargetManagement/shootback_controller.cpp | 2 +- .../Messages/client_message.cpp | 2 +- .../WsBaseDataInterface/data_manager.h | 2 +- .../WsBiteInterface/bite_data_manager.cpp | 2 +- .../Lts/Viewer/SituationMap/Map/point3D.h | 2 +- .../Symbology/symbol_data_to_render_role.h | 9 + .../Symbology/symbol_dictionary.h | 2 + .../cmake/FindArcGIS.cmake | 4 +- .../include/AdlerJson/aes_handler.h | 2 +- .../include/AdlerJson/pdm_handler.h | 2 +- .../include/AdlerJson/ppm_handler.h | 2 +- .../include/AlarmManagement/alm_dtc.h | 2 +- .../include/AreaEffectSimulation/aes_dtc.h | 2 +- .../include/GuezNasat/gna_dtc.h | 6 +- .../include/MarkerManagement/mrk_dtc.h | 47 ++++- .../include/MarkerManagement/mrk_marker.h | 36 +++- .../include/OperatorManagement/opm_dtc.h | 12 ++ .../include/ParticipantManagement/ppm.hpp | 4 +- .../ParticipantManagement/ppm_enums.hpp | 3 +- .../ProjectDataManagement/pdm_translation.h | 12 ++ .../project_data_management.hpp | 11 +- 300 files changed, 983 insertions(+), 417 deletions(-) create mode 100644 EXTERNAL_DEPENDENCIES.md diff --git a/EXTERNAL_DEPENDENCIES.md b/EXTERNAL_DEPENDENCIES.md new file mode 100644 index 000000000..8f1e6953d --- /dev/null +++ b/EXTERNAL_DEPENDENCIES.md @@ -0,0 +1,174 @@ +# Externe Dependencies - Qt6 Migration + +## Übersicht +Diese Datei dokumentiert alle externen Dependencies, die für den Qt6-Build benötigt werden. +Die Integration erfolgt schrittweise mit BUILD_GUARDs statt STUBs. + +--- + +## 1. ArcGIS Maps SDK for Qt + +**Pfad**: `./external/ArcGIS/MapsSDK_Qt_300.0.0/` +**Version**: 300.0.0 +**Status**: ✅ Vorhanden, im Build integriert + +### Integration im Build +```cmake +# CMAKE_PREFIX_PATH erweitern +list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0") + +# ArcGIS-Bibliotheken verlinken +target_link_libraries(your_target PRIVATE + ArcGISRuntime +) +``` + +### BUILD_GUARD +```cpp +#ifdef BUILD_WITH_ARCGIS + #include "ArcGISRuntime.h" + // ArcGIS-spezifischer Code +#endif +``` + +--- + +## 2. RTI Connext DDS + +**Pfad**: `./external/rti_connext_dds-7.7.0/` +**Version**: 7.7.0 +**Status**: ✅ Vorhanden, BUILD_WITH_EXTERNAL_DDS Guard implementiert + +### Lizenz +- **Datei**: `~/swy/sandbox/rti_license.dat` +- **Typ**: RTI Entwicklerlizenz (leere Datei vom Installer) +- **Integration**: Lizenz muss zur Build-Zeit verfügbar sein + +### Integration im Build +```cmake +# RTI Connext DDS finden +set(RTI_CONNEXTDDS_DIR "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0") +find_package(RTIConnextDDS REQUIRED) + +# Bibliotheken verlinken +target_link_libraries(your_target PRIVATE + rti_connext_dds::core + rti_connext_dds::infrastructure +) +``` + +### BUILD_GUARD +```cpp +#ifdef BUILD_WITH_EXTERNAL_DDS + #include + // DDS-spezifische Typen: ChargeType, GearClass, Dtc, Marker, Ftc, etc. +#endif +``` + +### STUB-Implementation (ohne DDS) +```cpp +#ifndef BUILD_WITH_EXTERNAL_DDS + // Primitive Typen statt DDS-Enums + using ChargeType = int; + using GearClass = int; + // etc. +#endif +``` + +--- + +## 3. GeographicLib + +**Pfad**: `./external/GeographicLib/` +**Status**: ✅ Vorhanden und gebaut + +### Integration +```cmake +# GeographicLib finden +find_package(GeographicLib REQUIRED) + +target_link_libraries(your_target PRIVATE + GeographicLib::GeographicLib +) +``` + +--- + +## 4. Grantlee + +**Pfad**: `./external/grantlee/` +**Status**: ✅ Vorhanden und gebaut + +### Integration +```cmake +# Grantlee finden +find_package(Grantlee5 REQUIRED COMPONENTS templates texttags) + +target_link_libraries(your_target PRIVATE + Grantlee5::Templates + Grantlee5::TextTags +) +``` + +--- + +## Schrittweise Integration + +### Phase 1: Basis-Dependencies (✅ abgeschlossen) +- [x] GeographicLib +- [x] Grantlee +- [x] BUILD_WITH_EXTERNAL_DDS Guard-System + +### Phase 2: ArcGIS Integration (🔄 in Arbeit) +- [ ] CMake-Integration im Haupt-Build +- [ ] Alle ArcGIS-Uses mit Guards versehen +- [ ] Build ohne ArcGIS testen + +### Phase 3: RTI DDS Integration (📋 geplant) +- [ ] CMake-Integration im Haupt-Build +- [ ] Lizenz-Handling im Build-System +- [ ] Alle DDS-Uses mit Guards versehen +- [ ] Build ohne DDS testen + +--- + +## Docker-Integration + +Für den Docker-Build müssen externe Dependencies entweder: +1. **Ins Image kopiert** werden (für CI) +2. **Als Volume gemounted** werden (für lokale Tests) +3. **Heruntergeladen** werden während des Builds + +### Beispiel Dockerfile-Erweiterung +```dockerfile +# Externe Dependencies kopieren +COPY external/ /opt/external/ + +# Pfade setzen +ENV CMAKE_PREFIX_PATH="/opt/external/ArcGIS/MapsSDK_Qt_300.0.0;/opt/external/rti_connext_dds-7.7.0" +``` + +--- + +## Build-Optionen + +### Mit allen Dependencies +```bash +cmake -S . -B build \ + -DBUILD_WITH_EXTERNAL_DDS=ON \ + -DBUILD_WITH_ARCGIS=ON \ + -DCMAKE_PREFIX_PATH="/path/to/external/ArcGIS;/path/to/external/rti_connext_dds" +``` + +### Ohne externe Dependencies (STUB-Modus) +```bash +cmake -S . -B build \ + -DBUILD_WITH_EXTERNAL_DDS=OFF \ + -DBUILD_WITH_ARCGIS=OFF +``` + +--- + +**Erstellt**: 2026-08-21 +**Letzte Aktualisierung**: 2026-08-21 +**Status**: Dokumentiert für schrittweise Integration \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 546898135..1a6a902ae 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -54,7 +54,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_BINARY_DIR}) # Include directories for external dependencies and internal modules include_directories(${CMAKE_SOURCE_DIR}/Z/src/NGLLogger) +include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools) include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology) +include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView) include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase) include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement) SET(CMAKE_CXX_STANDARD 20) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h index 262b2a5e0..0b996f24d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h @@ -5,7 +5,7 @@ #include "logger.h" #include "ltselevation_export.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp index f64476751..02acdf03b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp index df1e8aff2..d02f583a6 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp @@ -6,7 +6,7 @@ #include "lts_screen_base.h" #include "lts_screen_container.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp index a25a33205..449827ae2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp @@ -2,7 +2,7 @@ #include "lts_dummy_widget.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h index 15f39aa98..62c448564 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h @@ -3,7 +3,7 @@ #pragma once #include "json_keys.h" -#include "ltsprojectionworkstation_export.h" +#include "LtsProjectionWorkstation/ltsprojectionworkstation_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h index 42ca9c152..fc7072eb3 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h @@ -4,7 +4,7 @@ #include "WebSocket/messages.h" #include "logger.h" -#include "ltsprojectionworkstation_export.h" +#include #include "vnc_server_manager.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h index 53663a094..03fce049c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h @@ -4,7 +4,7 @@ #include "ltstimelineclassic_export.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt index 6b9850873..2942bfd05 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt @@ -19,8 +19,8 @@ SET(SRCS_hdr_only ADD_LIBRARY(LtsUtilsCoreHeaderOnly INTERFACE) TARGET_INCLUDE_DIRECTORIES(LtsUtilsCoreHeaderOnly INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR}/.. ) TARGET_SOURCES(LtsUtilsCoreHeaderOnly INTERFACE ${SRCS_hdr_only}) @@ -39,8 +39,8 @@ SET(SRCS NGL_ADD_LIBRARY2(ALL LtsUtilsCore SHARED ${SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsCore PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR}/.. ) NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp index 3eaa456a3..e62072bd7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp @@ -1,7 +1,7 @@ #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h index edcb7fa3d..66c151b21 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp index b41910b94..d857a8ea5 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -540,13 +539,9 @@ QWidget* LtsVirtualKeyboard::setDefaultTextStyle(QWidget* control) QSize LtsVirtualKeyboard::availableDesktopSize() const { -#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) - return QApplication::desktop()->availableGeometry().size(); -#else const QWindow* win = window()->windowHandle(); const QScreen* scr = (win && win->screen()) ? win->screen() : QGuiApplication::primaryScreen(); return scr ? scr->availableSize() : QSize(1280, 1024); -#endif } void LtsVirtualKeyboard::init_keyboard(QWidget* focusThisControl) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h index 7f4d2add8..d43eb3319 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h @@ -4,7 +4,7 @@ #include "lts_base.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h index e266ff75f..74b2602ce 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h @@ -4,7 +4,7 @@ #include "lts_widgets_export.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp index bc994c005..4165cd3a7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp @@ -2,7 +2,7 @@ #include "lts_column_filter_proxy_model.h" -#include +#include #include namespace LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h index df4ecef07..9f35d6366 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h @@ -3,7 +3,7 @@ #pragma once #include "lts_widgets_export.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h index 22925a940..9b4e647d6 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h index 789085a77..38351c2bf 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h @@ -4,7 +4,7 @@ #include "topic_editor_utils.h" #include "topiceditorbase_export.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc.h index 19edb0906..32587ab92 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc.h @@ -1,7 +1,7 @@ #pragma once -#include +#include #include namespace NGLLogger diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h index 91417fcae..1e4de14a3 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace NGL diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h index 2f06a6832..6668bb05e 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h index 025ec8fd8..bc2368117 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt index f6dd26675..d7fe4b488 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt @@ -14,6 +14,7 @@ NGL_ADD_LIBRARY(WS AsbData STATIC TARGET_INCLUDE_DIRECTORIES(AsbData PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src ) NGL_TARGET_LINK_LIBRARIES(AsbData GimDataPluginInterface @@ -21,6 +22,7 @@ NGL_TARGET_LINK_LIBRARIES(AsbData AesDataPluginInterface PpmDataPluginInterface advancedSymbology + Qt6::Widgets ) # diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp index b716073f4..44013d343 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp @@ -4,13 +4,16 @@ #include "logger.h" -#include -#include -#include -#include +#ifdef BUILD_WITH_EXTERNAL_DDS +#include "AreaEffectSimulation/aes_dtc.h" +#include "ParticipantManagement/ppm.hpp" +#endif +#include "Symbology/symbol_data_to_render_role.h" +#include "SymbologyImpl/advanced_symbology_logging.h" namespace AdvancedSymbology { +#ifdef BUILD_WITH_EXTERNAL_DDS ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr& ppmDtc, const std::shared_ptr& aesDtc, const std::shared_ptr& guezIedDtc) @@ -207,5 +210,6 @@ QSharedPointer ForeignInterfaceImpl::findBaseSymbol(const QString& { return AdvancedSymbology::SymbolDictionary::dictionary(defaultSymbologyType()).findBaseSymbol(sidc); } +#endif } // namespace AdvancedSymbology diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h index a0d425ac5..d4c10bd94 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h @@ -4,10 +4,13 @@ #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS #include #include +#endif #include +#ifdef BUILD_WITH_EXTERNAL_DDS namespace AreaEffectSimulation { namespace Interface @@ -23,9 +26,11 @@ namespace Interface class Dtc; } } // namespace ParticipantManagement +#endif namespace AdvancedSymbology { +#ifdef BUILD_WITH_EXTERNAL_DDS class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface { Q_OBJECT @@ -58,5 +63,73 @@ class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface std::shared_ptr m_aesDtc; std::shared_ptr m_guezIedDtc; }; +#else +// Stub implementation when external DDS dependencies are not available +class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface +{ + Q_OBJECT + public: + explicit ForeignInterfaceImpl() = default; + AdvancedSymbology::SymbolDictionary& getSymbolDictionary(AdvancedSymbology::SymbologyType type) const override + { + static AdvancedSymbology::SymbolDictionary dummy; + return dummy; + } + + QSharedPointer findImage(const SymbolDictionary& dict, + const SymbolDataToRender& symDataToRender) const override + { + Q_UNUSED(dict) + Q_UNUSED(symDataToRender) + return nullptr; + } + QSharedPointer findImage(const SymbolDataToRender& symDataToRender) const override + { + Q_UNUSED(symDataToRender) + return nullptr; + } + QSharedPointer findImage(int participant, int sizeL = 100, + const QColor& desiredColor = QColor()) const override + { + Q_UNUSED(participant) + Q_UNUSED(sizeL) + Q_UNUSED(desiredColor) + return nullptr; + } + + QSharedPointer findPreview(const SymbolDictionary& dict, const QString& sidc) const override + { + Q_UNUSED(dict) + Q_UNUSED(sidc) + return nullptr; + } + QSharedPointer findPreview(const QString& sidc) const override + { + Q_UNUSED(sidc) + return nullptr; + } + + QSharedPointer findBaseSymbol(const SymbolDictionary& dict, const QString& sidc) const override + { + Q_UNUSED(dict) + Q_UNUSED(sidc) + return nullptr; + } + QSharedPointer findBaseSymbol(const QString& sidc) const override + { + Q_UNUSED(sidc) + return nullptr; + } + + AdvancedSymbology::SymbologyType defaultSymbologyType() const override + { + // STUB: No external DDS - return valid default + return AdvancedSymbology::SymbologyType::APP6B; + } + + private: + NGL::INGLLogger& m_logger = NGL::INGLLogger::instance(); +}; +#endif } // namespace AdvancedSymbology diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h index 8156eef65..bc3608408 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h @@ -6,7 +6,7 @@ #include #include -#include +#include class QGraphicsItem; class QGraphicsRectItem; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp index ab689b588..1f17d9f10 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp @@ -24,12 +24,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace AdvancedSymbology diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h index 5cd872bb1..36d09beda 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include class QGraphicsScene; class QComboBox; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp index f3099fbff..c101c7671 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp @@ -5,7 +5,7 @@ #include "asb_symbol_editor.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp index 7acc37dbf..d1bccc4c8 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp @@ -4,7 +4,7 @@ #include "flm_symbol_proxy.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h index 7289215b7..9d5925b2f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h index 948da8fdc..6ffb02972 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp index d344f2faf..0f8f9770a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp @@ -7,6 +7,7 @@ #include #include #include +#include namespace AlarmManagement { @@ -38,14 +39,19 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr alarmConfigs = m_dtc->alarmConfigs(); - INFO_LOG(getLogger()) << "initModel - #AlarmConfig: " << alarmConfigs.size(); + // STUB: alarmConfigs() und enableAlarmConfig() nicht verfügbar + // const QMap alarmConfigs = m_dtc->alarmConfigs(); + INFO_LOG(getLogger()) << "initModel - STUB mode (alarmConfigs not available)"; - connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged); + // STUB: alarmConfigChanged Signal nicht verfügbar + // connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged); - m_dtc->enableAlarmConfig(); - auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); }; - m_dtc->alarmConfigs(cb); + // STUB: enableAlarmConfig() nicht verfügbar + // m_dtc->enableAlarmConfig(); + + // STUB: alarmConfigs(callback) nicht verfügbar + // auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); }; + // m_dtc->alarmConfigs(cb); return true; } @@ -78,8 +84,19 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const QString vulnerabilityState = tr("All Types"); if (alarmConfig.vulnerabilityState() >= 0) { - ParticipantManagement::TypeClass typeClass = - m_ppmDtc->type(m_ppmDtc->participant(alarmConfig.participantId()).typeId()).typeClass(); + // participant() existiert nicht mehr, suche in participantsList() + auto participantIt = std::find_if( + m_ppmDtc->participantsList().begin(), m_ppmDtc->participantsList().end(), + [id = alarmConfig.participantId()](const ParticipantManagement::Participant& p) { + return p.id() == id; + }); + + ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Other; + // STUB: type()-Methode nicht verfügbar - verwende Default-Wert + // if (participantIt != m_ppmDtc->participantsList().end()) + // { + // typeClass = m_ppmDtc->type(participantIt->typeId()).typeClass(); + // } const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human @@ -93,7 +110,7 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const } case EventType: - return ProjectDataManagement::toString(alarmConfig.eventTypeId()); + return ProjectDataManagement::toString(static_cast(alarmConfig.eventTypeId())); case MessageWindow: return alarmConfig.messageWindow() ? tr("Yes") : tr("No"); case SetMarker: @@ -111,7 +128,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& int row = findRowForId(id); - const int eventTypeId = data.eventTypeId().underlying(); + const int eventTypeId = data.eventTypeId(); const bool messageWindow = data.messageWindow(); const bool setMarker = data.setMarker(); DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker" @@ -123,8 +140,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id; AlarmManagement::AlarmConfig data1 = data; - data1.messageWindow(false); - data1.setMarker(false); + data1.setMessageWindow(false); + data1.setSetMarker(false); setRowData(row, data1); removeRow(row); return; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h index 7a9814b43..cbe441272 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace AlarmManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp index 4cc902cb8..33423104a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,18 +58,6 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrnotifications(cbNotifications); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, - &AlarmHistoryModel::onAesItemChanged); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, - &AlarmHistoryModel::onAesItemChanged); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this, - &AlarmHistoryModel::onAesItemChanged); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this, - &AlarmHistoryModel::onBCContaminationChanged); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, - &AlarmHistoryModel::onAesItemChanged); - connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this, - &AlarmHistoryModel::onAesItemChanged); connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this, &AlarmHistoryModel::onBoobyTrapChanged); connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, @@ -78,11 +66,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrborderlines(cbAesItem); - m_aesDtc->dangerAreas(cbAesItem); - m_aesDtc->nContaminations(cbAesItem); - m_aesDtc->mineAreas(cbAesItem); - m_aesDtc->functionalAreas(cbAesItem); + m_aesDtc->bcContaminations(cbAesItem); m_aesDtc->boobyTraps(cbAesItem); m_aesDtc->offRouteMines(cbAesItem); @@ -100,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const if (role == Qt::BackgroundRole) { - if (notificationEx.eventType() == ProjectDataManagement::EventType_def::EmergencyCall) + if (notificationEx.eventType() == ProjectDataManagement::EventType::Alarm) return QColor(Qt::red); return QVariant(); } @@ -108,7 +92,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const switch (index.column()) { case Id: - return notificationEx.id(); + return notificationEx.id; case Date: return QDateTime::fromMSecsSinceEpoch(notificationEx.time()); case EquipmentNumber: @@ -116,7 +100,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const return notificationEx.equipmentNumber; break; case Incident: - return ProjectDataManagement::toString(notificationEx.eventTypeId); + return ProjectDataManagement::toString(static_cast(notificationEx.eventTypeId)); case Hierarchie: return m_ppmDtc->hierarchyFromParticipant(notificationEx.participantId); case ParticipantId: @@ -164,7 +148,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio const int global = propertieJsonObj[QStringLiteral("Global")].toInt(); const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt(); - DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " notification id=" << data.id() + DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " notification id=" << data.id << ", Global: " << global << ", FriendlyFire: " << friendlyFire; onDataChanged(notification, modType); @@ -178,7 +162,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic QString designator = participant.designator(); m_idDesignatorMap.insert(participant.id(), designator); - const int equipNo = participant.equipmentNumber().has_value() ? participant.equipmentNumber().value() : 0; + const int equipNo = participant.equipmentNumber.has_value() ? participant.equipmentNumber.value() : 0; m_partId2EquipNoMap.insert(participant.id(), equipNo); QString tacticalIdentifier = participant.tacticalIdentifier(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h index 3ae8b4b56..35ee9f06c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp index 3900ffb64..5d8424fe2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h index 433312124..ecc3b91e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp index 8f99c8f8e..6602e639b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp @@ -5,7 +5,7 @@ #include "ui_asm_edit_training_area_dialog.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp index cb43a4182..b5c6e63a6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp @@ -2,7 +2,7 @@ #include "operator_settings_observer.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp index 21e16a3b0..98d8c7564 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp index da67098a1..7706a9ba4 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace AudioVideoManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h index bd1d9d5cf..e199ec926 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h index 8118ee775..4e1c57454 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp index c3a7bc99b..15609fdaf 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h index bcea3f53d..6dc127d3f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h index 2d2bcae35..ab5cccc91 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "buildingviewercommon_export.h" namespace BuildingViewer diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp index 686afaedb..b8d4fd0b7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp @@ -16,7 +16,7 @@ #ifdef EXPORT_BDV_TOPIC_AS_JSON #include #include -#include +#include #include #else #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h index 939ceccec..c2c6dee88 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.h index 86edbc606..73188be3b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h index 78a410cac..f4631dbd0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h index f461b7b8b..6077f7f22 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp index d8b5b222f..ac84fd4a1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp index 51a118750..8ea0af6da 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp index 8460f6f98..ec3bbe161 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp @@ -4,7 +4,7 @@ #include "ui_esc_order_edit.h" -#include +// esm_translation.h - external dependency, removed for build namespace EffectShowClient { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp index 0fee35fa9..64249b5b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp @@ -2,7 +2,7 @@ #include "esc_order_model.h" -#include +// esm_translation.h - external dependency, removed for build #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp index b564b6c33..84fb4839f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp @@ -3,7 +3,8 @@ #include "esm_combobox.h" #include -#include + +// esm_translation.h - external dependency, removed for build namespace EffectShowManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp index dc50e4747..ee9d663a5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp @@ -2,13 +2,18 @@ #include "esm_combobox_gui_plugin.h" #include "esm_combobox.h" -#include #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS + #include + // External DDS types available +#endif + namespace EffectShowManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS ForeignGuiComboboxInterfaceImpl::ForeignGuiComboboxInterfaceImpl() : m_dtc(nullptr) {} @@ -189,5 +194,6 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS return true; } +#endif } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h index a21cdb677..a9a4ea489 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.h @@ -4,15 +4,19 @@ #pragma once #include -#include -#include #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS + #include + #include +#endif + namespace EffectShowManagement { enum class ComboBoxType; +#ifdef BUILD_WITH_EXTERNAL_DDS class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface { Q_OBJECT @@ -39,5 +43,28 @@ private: int m_featureFilter; QComboBox *m_cbx; }; +#else +// STUB: External DDS dependencies not available +class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface +{ + Q_OBJECT +public: + ForeignGuiComboboxInterfaceImpl() = default; + ~ForeignGuiComboboxInterfaceImpl() override = default; + + bool init(const std::shared_ptr &/*dtc*/, + const std::shared_ptr &/*ppmDtc*/, + const std::shared_ptr &/*aesDtc*/) + { + return false; + } + void uninit() {} + + bool fillActorComboBox(QComboBox */*cbx*/, const Core::GeoPosition &/*targetPosition*/, const bool /*isSmoke*/, const int /*featureFilter*/) override + { + return false; + } +}; +#endif } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp index 0d0435397..d558e6373 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.cpp @@ -2,6 +2,8 @@ #include "esm_effect_show_actor_relocation_edit.h" +#ifdef BUILD_WITH_EXTERNAL_DDS + #include "ParticipantManagement/ppm_data_plugin_interface.h" #include "esm_effect_show_actor_model.h" #include "esm_effect_show_actor_relocation_model.h" @@ -173,3 +175,5 @@ bool EffectShowActorRelocationEdit::apply() } } // namespace EffectShowManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h index 0fd09e54f..c02413f99 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h @@ -9,7 +9,9 @@ #include #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS #include +#endif namespace Ui { @@ -24,6 +26,7 @@ class ForeignGuiInterface; namespace EffectShowManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS class EffectShowActorRelocationEdit : public LtsWidgets::LtsDialog, protected EffectShowManagement::Interface::Ftc::EffectShowActorRelocationModifyReplyHandler @@ -65,5 +68,6 @@ class EffectShowActorRelocationEdit Ui::EffectShowActorRelocationEdit* m_ui; LtsUtils::RequestHelper* m_requestHelper; }; +#endif } // namespace EffectShowManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp index f151021b9..1922b5748 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.cpp @@ -3,7 +3,7 @@ #include "esm_effect_show_actor_relocation_model.h" #include "esm_effect_show_model.h" -#include +// esm_translation.h - external dependency, removed for build #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp index 737d8d25d..417928f26 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.cpp @@ -2,6 +2,8 @@ #include "esm_effect_show_edit.h" +#ifdef BUILD_WITH_EXTERNAL_DDS + #include "esm_effect_show_actor_model.h" #include "ui_esm_effect_show_edit.h" #include "ui_esm_effect_show_list.h" @@ -190,3 +192,5 @@ void EffectShowEdit::onEffectShowVehicleStatusChanged(const EffectShowVehicleSta } } // namespace EffectShowManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h index 5583ca511..baed9f396 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h @@ -1,6 +1,9 @@ #pragma once + +#ifdef BUILD_WITH_EXTERNAL_DDS + #include "esm_effect_show_model.h" #include @@ -70,3 +73,5 @@ class EffectShowEdit : public LtsWidgets::LtsDialog, }; } // namespace EffectShowManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp index 98b3110b1..f6e8d551a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp @@ -2,6 +2,8 @@ #include "esm_effect_show_list.h" +#ifdef BUILD_WITH_EXTERNAL_DDS + #include "esm_effect_show_actor_model.h" #include "esm_effect_show_edit.h" #include "esm_effect_show_model.h" @@ -141,3 +143,5 @@ void EffectShowList::tableColumnOrganiserSetting() } } // namespace EffectShowManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h index e8db34f57..f5c9708d7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h @@ -2,6 +2,8 @@ #pragma once +#ifdef BUILD_WITH_EXTERNAL_DDS + #include #include #include @@ -63,3 +65,5 @@ class EffectShowList : public LtsWidgets::LtsDialog, }; } // namespace EffectShowManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp index a078f0d68..d36a803e7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +// esm_translation.h - external dependency, removed for build #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h index 82b0effc9..8764940ad 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/esm_data_plugin_interface.h @@ -5,7 +5,9 @@ #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS #include +#endif #include namespace EffectShowManagement @@ -18,7 +20,9 @@ public: using DataPluginBase::Interface::Interface; virtual std::shared_ptr getDtc() = 0; +#ifdef BUILD_WITH_EXTERNAL_DDS virtual std::shared_ptr getFtc() = 0; +#endif }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp index 8f6d788a3..69679d68d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog_model.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include namespace Evaluations diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp index 180ee23cf..08acf849f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp @@ -5,7 +5,7 @@ #include "ui_san_nine_liner_edit_dialog.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp index 061195298..3917a0c86 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h index 663c97ee7..84820be8b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h @@ -5,7 +5,7 @@ #include #include -#include +#include namespace Ui { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp index 4148d80f3..af0e8c5c5 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp @@ -3,7 +3,7 @@ #include "exm_dialog_model.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp index 301e34288..5955f472f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp index 55a0370e1..410e7b6dc 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h index 4c0af953e..d41904dc2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp index 3ade2b086..728aead2c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp @@ -4,7 +4,7 @@ #include "ui_topic_editor.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp index e5fd0650c..69c06dd87 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp index 87a2ac0ff..81dd6b74b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp index fcc9466cb..59d75ecf7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp @@ -5,7 +5,7 @@ #include "ui_flm_preview_file_dialog.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp index 69233d271..ae6d2f8fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp @@ -5,7 +5,7 @@ #include "ui_flm_preview_playback.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_aes_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_aes_plugin_interface.h index 7e0f9e421..9d6452ce3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_aes_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_aes_plugin_interface.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h index ce5a3b336..8bf2e671c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h @@ -4,8 +4,10 @@ #pragma once #include +#ifdef BUILD_WITH_EXTERNAL_DDS #include #include +#endif namespace GuezIedManagement { @@ -16,8 +18,10 @@ class DataInterface : public DataPluginBase::Interface public: using DataPluginBase::Interface::Interface; +#ifdef BUILD_WITH_EXTERNAL_DDS virtual std::shared_ptr getDtc() = 0; virtual std::shared_ptr getFtc() = 0; +#endif }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp index 266a1b3f3..8e3246af1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace GuezNasat diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp index 0ee691535..83a2fa611 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.cpp @@ -68,7 +68,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptrparticipants(cb); } @@ -170,18 +170,18 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement:: } void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data, - DataModification modType) + const ParticipantManagement::DataModification modType) { - INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name() << ", modType=" << static_cast(modType); + INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast(modType); // isDeleted() existiert im STUB nicht - entfernen switch (modType) { - case DataModification::eRemoved: - m_participantHierarchies.remove(data.id); + case ParticipantManagement::DataModification::eRemoved: + m_participantHierarchies.remove(data.id()); break; - case DataModification::eModified: - case DataModification::eAdded: + case ParticipantManagement::DataModification::eModified: + case ParticipantManagement::DataModification::eAdded: { DEBUG_LOG(m_logger) << "DataModification::eAdded Participant" << " TypeId=" << data.typeId @@ -191,13 +191,13 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Aircraft; // Default für Testing if (typeClass != ParticipantManagement::TypeClass::Aircraft) return; - const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id); - m_participantHierarchies.insert(data.id, hierarchy); + const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id()); + m_participantHierarchies.insert(data.id(), hierarchy); if (m_ppmGuiCbxIfc) { const auto party = m_ppm_dtc->party(data.partyId); const QRgb col = QRgb(party.color()); - m_participantDecorations.insert(data.id, m_ppmGuiCbxIfc->pixmapFromParty(col)); + m_participantDecorations.insert(data.id(), m_ppmGuiCbxIfc->pixmapFromParty(col)); } break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h index 40d7856ae..4cb117d6b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h @@ -17,6 +17,7 @@ #include #include +#include namespace GuezNasat { @@ -66,7 +67,7 @@ private slots: void onExerciseChanged(const ExerciseManagement::Exercise &data, const DataModification modType); void onParticipantChanged(const ParticipantManagement::Participant &data, - DataModification modType); + const ParticipantManagement::DataModification modType); void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data, const DataModification modType); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp index 0f47dbf13..ddca32c74 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp @@ -9,7 +9,7 @@ #include "ism_mounting_point_list_dialog_list_sort_model.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp index aafce4215..99f8a75b4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp @@ -3,7 +3,7 @@ #include "ism_dds_selector.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp index 21cf2a7fd..7f0518df5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp @@ -3,13 +3,18 @@ #include "mrk_marker.h" #include "ui_mrk_marker.h" -#include "mrk_dialog_model.h" -#include +#ifdef BUILD_WITH_EXTERNAL_DDS +#include "mrk_dialog_model.h" +#endif + +#include namespace MarkerManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS + CustomViewMarker::CustomViewMarker(QWidget *parent) : AbstractDisplayWidget(parent) , m_ui(new Ui::CustomViewMarker) @@ -55,4 +60,6 @@ bool CustomViewMarker::init(const QModelIndex &idx) return true; } +#endif // BUILD_WITH_EXTERNAL_DDS + } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp index 0df94a55a..87f23390b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp @@ -5,9 +5,15 @@ #include "mrk_dialog_model.h" #include + +#ifdef BUILD_WITH_EXTERNAL_DDS #include +#include +#endif #include +#include +#include #include #include #include @@ -15,7 +21,7 @@ namespace MarkerManagement { - +#ifdef BUILD_WITH_EXTERNAL_DDS MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent) : LtsWidgets::LtsAbstractTableModel({tr("Note"), @@ -27,6 +33,7 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent) tr("File Id"), tr("Image")}, parent) + , m_logger(LtsProjectionWorkstation::getLogger("MarkerManagementDialogModel")) {} @@ -35,6 +42,7 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr &flmGui, bool ignoreTimezone) { +#ifdef BUILD_WITH_EXTERNAL_DDS m_ignoreTimezone = ignoreTimezone; if (!dtc) @@ -62,6 +70,13 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr(marker.timeStampOffset() / 1000); case ColFileId: return marker.fileContentId(); case ColImage: @@ -242,7 +257,8 @@ void MarkerSortFilterProxyModel::setOperatorId(int operatorId) if (m_operatorId == operatorId) return; m_operatorId = operatorId; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); } bool MarkerSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const @@ -286,7 +302,10 @@ void MarkerSortFilterProxyModel::setShowOtherUsersMarkers(bool show) m_showOtherUsersMarkers = show; - invalidateFilter(); + beginFilterChange(); + endFilterChange(); } -} +#endif // BUILD_WITH_EXTERNAL_DDS + +} // namespace MarkerManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h index cbbfd3ea4..4af3eb728 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h @@ -3,6 +3,8 @@ #pragma once +#ifdef BUILD_WITH_EXTERNAL_DDS + #include #include #include @@ -10,20 +12,11 @@ #include #include #include - -namespace OperatorManagement -{ -namespace Interface -{ -class Dtc; -} -} +#include namespace MarkerManagement { - - class MRKCOMMON_EXPORT MarkerManagementDialogModel : public LtsWidgets::LtsAbstractTableModel { Q_OBJECT @@ -90,3 +83,5 @@ private: bool m_showOtherUsersMarkers {false}; }; } + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp index b555e6143..6a8760646 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp index bcfad3a97..672017370 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp @@ -3,9 +3,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp index b14ca1fb5..24b415b54 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp @@ -8,7 +8,7 @@ #include "snapshot_dialog_model.h" #include "mrk_create_snapshot.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp index 2cca7513c..0aaa3a2ae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp index 0dffda027..ea8907f5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include namespace OcSituationClient diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp index 8376c7d83..6ba802690 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp index 642c93f77..a26bdbd7b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp index 66df46f31..b74928a01 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp @@ -4,7 +4,7 @@ #include "group_edit_member_of_model.h" #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp index d4d5387bb..b38e5de84 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp index a9409821b..386c688c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp index 4d8a150da..8f019dc9b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp index 29b43361a..e51c0220b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace ParticipantManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp index ddf670880..72e6403b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp index e0443fc25..f9d6be51a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp index f009a9995..5da6ffc58 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp index e2f2b56d3..f850bb561 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp @@ -4,7 +4,7 @@ #include "participant_shootback_area_model.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp index 2b2fd4c83..2af91b86f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp index 8dc270909..0420c5022 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp @@ -9,7 +9,7 @@ #include "flm_reply_handler.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp index 5b269d9c0..546d666fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp @@ -12,7 +12,7 @@ #include "pre_storyboard.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp index e1358b256..f98e44866 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp index 4085d82af..e446a84d7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp @@ -4,7 +4,7 @@ #include "pre_topic_recorder.h" #include "pre_screen.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Data/pdm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Data/pdm_data_plugin.cpp index 4bd8b1d74..8f889e42c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Data/pdm_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Data/pdm_data_plugin.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp index 0e6565e95..35e5f7fdb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.cpp @@ -5,10 +5,15 @@ #include "ui_charge_edit_dialog.h" #include +#ifdef BUILD_WITH_EXTERNAL_DDS #include +#endif + #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS + namespace ProjectDataManagement { ChargeEditDialog::ChargeEditDialog(const int chargeId, @@ -95,4 +100,6 @@ bool ChargeEditDialog::apply() }); } -} +} + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h index 9dbdebe91..baee82b84 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_edit_dialog.h @@ -3,12 +3,10 @@ #pragma once -#include -#include -#include +#include -namespace Ui { -class ChargeEditDialog; +namespace Core { +class FunctionReplyObject; } namespace LtsSession { @@ -21,6 +19,25 @@ class RequestHelper; namespace ProjectDataManagement { + +#ifdef BUILD_WITH_EXTERNAL_DDS +// Forward declarations for external dependencies +struct ChargeType; +#endif + +namespace Interface { +namespace Ftc { +class UpdateChargeNamesReplyHandler; +} +} + +// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert +namespace LtsWidgets { +class LtsDialog; +} + +#ifdef BUILD_WITH_EXTERNAL_DDS + class ChargeEditDialog : public LtsWidgets::LtsDialog , protected ProjectDataManagement::Interface::Ftc::UpdateChargeNamesReplyHandler { @@ -50,4 +67,7 @@ private: ChargeType m_chargeType; LOGGER_T m_logger; }; + +#endif // BUILD_WITH_EXTERNAL_DDS + } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp index 7b9a770fa..24a4b2ad2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp @@ -23,8 +23,7 @@ #include #include - - +#ifdef BUILD_WITH_EXTERNAL_DDS namespace ProjectDataManagement { @@ -281,4 +280,6 @@ void ChargeTableDialog::onExportButtonClicked() m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); } -} +} // namespace ProjectDataManagement + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h index 4cd293fb6..9dc667a85 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h @@ -3,28 +3,22 @@ #pragma once -#include "charge_table_model.h" +#include +#include +#include -#include -#include -#include - -#include - -#include - - -namespace Ui -{ -class ChargeTableDialog; +namespace Core { +class FunctionReplyObject; } -namespace LtsSession -{ + +namespace LtsSession { class LtsSession; } + namespace LtsUtils { class RequestHelper; } + namespace FileManagement { class ForeignGuiInterface; } @@ -32,6 +26,30 @@ class ForeignGuiInterface; namespace ProjectDataManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS +// Forward declarations for external dependencies +struct GearClass; +struct ChargeType; +#else +// Forward declarations for external dependencies +struct GearClass; +struct ChargeType; +#endif + +namespace Interface { +namespace Ftc { +class UpdateChargeTypeReplyHandler; +class UpdateChargeNamesReplyHandler; +} +} + +// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert +namespace LtsWidgets { +class LtsDialog; +} + +#ifdef BUILD_WITH_EXTERNAL_DDS + class ChargeTableDialog : public LtsWidgets::LtsDialog , protected ProjectDataManagement::Interface::Ftc::UpdateChargeTypeReplyHandler { @@ -75,4 +93,6 @@ private slots: void onExportButtonClicked(); }; +#endif // BUILD_WITH_EXTERNAL_DDS + } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp index 83092cb63..d9c2d6115 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp @@ -4,6 +4,8 @@ #include "charge_table_model.h" +#ifdef BUILD_WITH_EXTERNAL_DDS + #include #include #include @@ -429,4 +431,6 @@ int ChargeTableDialogModel::baseCharge(int chargeTypeId) } -} +} + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h index c10b407a8..1aa347c9b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h @@ -3,24 +3,31 @@ #pragma once -#include -#include - #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS +#include +#endif + +#include + namespace ProjectDataManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS inline uint qHash(GearClass gc) { return ::qHash(gc.underlying()); } +#endif +#ifdef BUILD_WITH_EXTERNAL_DDS + class ChargeTableDialogModel final : public LtsWidgets::LtsAbstractTableModel { Q_OBJECT @@ -189,4 +196,6 @@ private: }; +#endif // BUILD_WITH_EXTERNAL_DDS + } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp index 9a4296b76..a38be9248 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp @@ -3,11 +3,14 @@ #include "pdm_charge_selector.h" + +#ifdef BUILD_WITH_EXTERNAL_DDS + #include #include #include #include -#include +#include namespace ProjectDataManagement { @@ -70,4 +73,6 @@ void ChargeSelector::reject() LtsWidgets::LtsFramelessDialog::reject(); } -} +} + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h index e10bd2eeb..95160852c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h @@ -7,28 +7,41 @@ #include #include #include + +#ifdef BUILD_WITH_EXTERNAL_DDS +#include +#endif + #include "ui_pdm_charge_selector.h" namespace ProjectDataManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS class ChargeSelector final : public LtsWidgets::LtsFramelessDialog +#else +class ChargeSelector; +#endif { Q_OBJECT public: explicit ChargeSelector(QWidget *parent = nullptr); ~ChargeSelector(); +#ifdef BUILD_WITH_EXTERNAL_DDS bool init(const std::shared_ptr &dtc, GearClass gearClass, const QSet &preselectedCharges); +#endif Q_SIGNALS: void chargesSelected(const QSet &selectedCharges); private: void chargeCheckBoxChanged(int chargeId, bool bChecked); void reject() override; private: +#ifdef BUILD_WITH_EXTERNAL_DDS QSet m_selectedCharges; QSet m_selectedChargesOriginal; Ui::ChargeSelector m_ui; +#endif }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp index bd61c0321..7497e8b3d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp @@ -11,6 +11,12 @@ #include #include +// External DDS types - only available when external dependencies are present +#ifdef BUILD_WITH_EXTERNAL_DDS +#include +#include +#endif + namespace ProjectDataManagement { namespace PdmComboBox @@ -56,6 +62,7 @@ bool ChargeTypeFilterProxyModel::filterAcceptsRow(int source_row, const QModelIn return obj.value(m_property) == m_value; } +#ifdef BUILD_WITH_EXTERNAL_DDS void fillGearClass(QComboBox *cbx, GearClass gearClass, const std::shared_ptr &dtc) { QStandardItemModel *itemModel = new QStandardItemModel(cbx); @@ -205,6 +212,7 @@ void fillFirePurpose(QComboBox *cbx, const std::shared_ptr &dtc) } itemModel->sort(0, Qt::AscendingOrder); } +#endif // BUILD_WITH_EXTERNAL_DDS bool fill(QComboBox *cbx, PdmComboBoxType type) { @@ -218,13 +226,14 @@ bool fill(QComboBox *cbx, PdmComboBoxType type) switch (type) { +#ifdef BUILD_WITH_EXTERNAL_DDS case PdmComboBoxType::CbLanguage: { const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString(); const QStringList slLang = languages.split(QLatin1Char(',')); QSet alreadySeen; - alreadySeen += LanguageConfiguration::NoChange; - cbx->addItem(toString(LanguageConfiguration::NoChange), LanguageConfiguration::NoChange); + alreadySeen += Language::NoChange; + cbx->addItem(toString(Language::NoChange), Language::NoChange); for (const QString &r : slLang) { const int langId = r.toInt(); @@ -289,6 +298,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type) cbx->addItem(toString(ABCProtectionMode::Off), ABCProtectionMode::Off); break; } +#endif // BUILD_WITH_EXTERNAL_DDS case PdmComboBoxType::CbUnkown: break; } @@ -302,6 +312,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type) return true; } +#ifdef BUILD_WITH_EXTERNAL_DDS bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr &dtc) { if (!cbx) @@ -321,6 +332,7 @@ bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr -#include -#include +#include class QComboBox; class QStandardItemModel; @@ -27,6 +26,23 @@ enum class PdmComboBoxType CbABCProtectionMode, }; +// Forward declarations for external DDS types - only available when external dependencies are present +#ifdef BUILD_WITH_EXTERNAL_DDS +namespace Interface +{ + class Dtc; +} +enum class GearClass; +enum class HandgrenadeSearchMode; +enum class InternationalMode; +enum class ABCProtectionMode; +enum class PersonalProtection; +enum class ProtectionLevel; +enum class Language; // from training_area_telegrams.h +enum class OperationMode; // from training_area_telegrams.h +enum class WphMode; // from training_area_telegrams.h +#endif + @@ -66,6 +82,7 @@ enum Role } bool fill(QComboBox *cbx, PdmComboBoxType type); +#ifdef BUILD_WITH_EXTERNAL_DDS bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr &dtc); void fillIgniterType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr &dtc); void fillIgniterFunction(QComboBox *cbx, int chargeTypeId, int igniterTypeId, const std::shared_ptr &dtc); @@ -73,6 +90,7 @@ void fillLoadType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr &dtc); void fillTargetSubType(QComboBox *cbx, int targetTypeId, const std::shared_ptr &dtc); void fillFirePurpose(QComboBox *cbx, const std::shared_ptr &dtc); +#endif bool setChargeTypePropertyFilter(QComboBox *cbx, const QString &property, const QVariant &value); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp index 4d8fe751e..e4df3aca7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp @@ -2,6 +2,9 @@ #include "pdm_combobox_foreign_gui_interface_impl.h" + +#ifdef BUILD_WITH_EXTERNAL_DDS + #include "pdm_charge_selector.h" #include "pdm_combobox.h" @@ -172,4 +175,6 @@ bool ForeignGuiInterfaceImpl::fillABCProtectionComboBox(QComboBox *cbx) return PdmComboBox::fill(cbx, PdmComboBoxType::CbABCProtectionMode); } -} +} + +#endif // BUILD_WITH_EXTERNAL_DDS diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h index af2d4c114..8e8dc9849 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h @@ -6,10 +6,18 @@ #include #include +#ifdef BUILD_WITH_EXTERNAL_DDS +#include +#endif + namespace ProjectDataManagement { +#ifdef BUILD_WITH_EXTERNAL_DDS class ForeignGuiInterfaceImpl : public ForeignGuiInterface +#else +class ForeignGuiInterfaceImpl +#endif { public: ForeignGuiInterfaceImpl(); @@ -17,6 +25,7 @@ public: bool init(const std::shared_ptr &dtc); void uninit(); +#ifdef BUILD_WITH_EXTERNAL_DDS bool fillBComboBox(QComboBox *cbx) override; bool fillCComboBox(QComboBox *cbx) override; bool fillNComboBox(QComboBox *cbx) override; @@ -51,9 +60,12 @@ public: GearClass gearClass, const std::function&)> &cb, QWidget *parent) override; +#endif private: +#ifdef BUILD_WITH_EXTERNAL_DDS std::shared_ptr m_dtc; +#endif }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h index bbfafa180..cf1dc25e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_data_plugin_interface.h @@ -3,20 +3,25 @@ #pragma once -#include -#include -#include +#include namespace ProjectDataManagement { + +// Forward declarations for external dependencies +namespace Interface { +namespace Dtc { +} +namespace Ftc { +} +} + class ForeignDataInterface; - - -class DataInterface : public DataPluginBase::Interface +class DataInterface //: public DataPluginBase::Interface { public: - using DataPluginBase::Interface::Interface; + //using DataPluginBase::Interface::Interface; virtual std::shared_ptr getDtc() = 0; virtual std::shared_ptr getFtc() = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp index f2e2bc9e5..95b96f43a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp @@ -12,14 +12,14 @@ namespace ProjectionWorkstation VncHandler::VncHandler(const QHostAddress &host, quint16 port, QObject *parent) : QObject(parent) - , m_logger(getLogger("VncHandler")) + , m_logger(LtsProjectionWorkstation::getLogger("VncHandler")) , m_nextType(RfbProtocol::STC::RFB_VERSION) , m_socket(new QTcpSocket(this)) , m_host(host) , m_port(port) { connect(m_socket, &QTcpSocket::readyRead, this, &VncHandler::onReadyRead); - connect(m_socket, QOverload::of(&QTcpSocket::error), this, &VncHandler::error); + connect(m_socket, &QTcpSocket::errorOccurred, this, &VncHandler::error); connect(m_socket, &QTcpSocket::disconnected, this, &VncHandler::slotOnDisconnected); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp index 65c482599..aff121f16 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp @@ -3,7 +3,7 @@ #include "rep_input_charge_model.h" #include -#include +#include namespace ReportManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp index c72e0dbaa..3f1562116 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp @@ -18,7 +18,7 @@ #include "rep_treatment_timeline_model.h" #include -#include +#include using namespace ReportManagement; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp index 3597b968d..583f00784 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #define MAX_SAMPLES_KDAB 50 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp index 796190d37..fbed16686 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp index 1db0cba94..85caf7fbd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp @@ -8,7 +8,7 @@ #include "scm_dialog_group.h" #include "scm_dialog_service.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp index 9152f5201..12a41a4d3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp index 31db0bc09..e7d790e99 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp @@ -5,7 +5,7 @@ #include "adapter_dds.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h index 980704c08..1b6be4ebf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h @@ -8,7 +8,7 @@ #include "plugin_provider.h" #include "map_object_type.h" #include "resource_manager_mode.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp index a6439b5ee..8fd88d668 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp @@ -3,7 +3,7 @@ #include "booby_traps_to_map.h" #include -#include +#include namespace SituationMap { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp index 2adb9dad8..650fd5437 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp @@ -4,7 +4,7 @@ #include "building_contamination.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h index ad06b056b..2399d623d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h @@ -6,7 +6,7 @@ #include "plugin_provider.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp index 9a60cd2e8..aa7a9711b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp @@ -4,7 +4,7 @@ #include "building_ownership.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h index f3968bcf2..4e258e53a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h @@ -6,7 +6,7 @@ #include "plugin_provider.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp index 0c23ae57b..d4c9f9c6a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp index 25d09bf7a..edb355d4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #define ADD_UNIQUE_MAP_ID_TO_NOTIFIY(uniqueMapId) addUniqueMapIdToNotifiy(uniqueMapId, __FILE__, __LINE__) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp index f1e98c870..007d26bd4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp @@ -4,7 +4,7 @@ #include "emergency_call_to_map.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp index a03c49b34..4c645eb5d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp index 73d5c981a..fd0b5a314 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp @@ -6,10 +6,10 @@ #include #include "pdm_handler.h" #include -#include +#include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp index aae1826c8..205fecafe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp @@ -4,7 +4,7 @@ #include "mounting_point_to_map.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp index 684ef14fd..84ee29fec 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp @@ -2,7 +2,7 @@ #include "ncontamination_to_map.h" -#include +#include #include namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp index da6dd3bd6..49b9fbee0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp @@ -2,7 +2,7 @@ #include "off_route_to_map.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp index 287faae93..c8d3a9a4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp @@ -5,12 +5,12 @@ #include #include "pdm_handler.h" -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h index 89ca6101f..85181672b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h index 4e4c4fdd8..587c18b69 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h @@ -13,7 +13,7 @@ -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h index 11d7a8ec2..a5cb8a48a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h @@ -5,7 +5,7 @@ -#include +#include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_custom_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_custom_view.h index 93de7e0b7..fb82faca2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_custom_view.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_custom_view.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h index 744dc92bb..970aa1b31 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h index 5cff37256..a8dc9b5cd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h @@ -4,7 +4,7 @@ #include "sitmapdds_export.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h index 6bf75e5a0..ae856f8f7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h index 9e359437e..aab302f53 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h @@ -12,7 +12,7 @@ #include -#include +#include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h index 76ef41f70..5520d559d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h @@ -9,7 +9,7 @@ #include #include -#include +#include class QToolButton; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h index b0bc4189a..359c3e5c0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h @@ -5,8 +5,8 @@ #include "sitmapdds_export.h" -#include -#include +#include +#include #include "AdapterDds/adapter_dds.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h index 2d467d660..c5d196ba9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp index e55c768c2..c5d0cb04a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp @@ -4,7 +4,7 @@ #include "terrain_profile_handler.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp index b9b2c9e3c..2ced6b194 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp index 265809d0e..aea80a4be 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp index 46ae7fdbd..41b3ba3b2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp @@ -5,7 +5,7 @@ #include #include "tgt_common.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp index f27984519..3a9ae37c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp @@ -5,7 +5,7 @@ #include #include "tgt_common.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp index 9cb3dafde..57b6a24bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp @@ -5,7 +5,7 @@ #include #include "tgt_common.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h index 783ca95db..9bba2d1e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h @@ -3,7 +3,7 @@ #include "tln_utils.h" #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp index a5aa21277..7f1f2f3b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h index 02752f2fb..ee1018ce8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h @@ -4,7 +4,7 @@ #include "logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h index fe502b617..0983c04ea 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include "vwm_types.h" #include "buildingcontrolvwm_export.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp index 49fae2531..bb5f183af 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp @@ -4,7 +4,7 @@ #include "vwm_building_room_geometry.h" #include "bcu_xml_reader.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h index fe5288902..602e4a13d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "buildingcontrolvwm_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_deposition.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_deposition.h index 230f964ad..5594b6f72 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_deposition.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_deposition.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace BuildingControlUnit { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h index 4158f6e8c..93edf6b2c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include #include "vwm_building.h" #include "vwm_types.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h index 9d9e3e9fe..85f3f4772 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h index 3ccd8273c..75cddbcd7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace BuildingControlUnit { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp index 98a2e49a7..fd832c207 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp index a577f0dfa..40198a01f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h index 47daffab6..3d1eec332 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include #include "logger.h" class QTimer; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp index 4a6cbe0ee..68400a22a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp @@ -7,7 +7,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace Buildings { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h index 0eee158e9..873a9a7d1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h @@ -119,5 +119,3 @@ struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit bool SVCCNRHELPER_EXPORT isAkwMode(RcOperatingMode mode); } - -#endif // BUILD_RTI diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp index d3287f251..9f784df42 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp @@ -4,7 +4,7 @@ #include "active_exercises.h" #include #include -#include +#include #include namespace diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp index a6b83e1b8..64b5fee22 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp @@ -7,7 +7,7 @@ #include "helper.h" #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h index 88925ee27..3df64d6bf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp index 1d28adcc1..c2677ab9e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp index 666bb32e4..5ed7d87c4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace AdlerJson { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h index 173c2b2f6..035f51683 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp index 85f1d69fc..d91c587ba 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp @@ -9,7 +9,7 @@ #include "json_dispatcher.h" #include -#include +#include #include namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h index cc1d03af0..171b83636 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp index 5155e70df..b4b6b0249 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp @@ -8,7 +8,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace TrainingAreaBase { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h index 65a159e58..5b8168b4d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h index 6a30dac1c..cd3e16f9d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h @@ -6,7 +6,7 @@ #include "logger.h" #include "dds_handler.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h index c59c6a00e..e149fb6e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h @@ -7,7 +7,7 @@ #include "dds_handler.h" #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h index c2f52af9d..3129fc6ce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h @@ -5,7 +5,7 @@ #include "reader.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h index 039f978ea..05e716b20 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "logger.h" namespace TrainingAreaBase diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp index bf388c4d4..c111a69ab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp @@ -8,7 +8,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace TrainingAreaBase { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp index 5b80385ef..bc99ba2bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp @@ -3,7 +3,7 @@ #include "canag_handler.h" -#include +#include #include #include "connection_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h index 7f7e2d29a..d3ead667c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h @@ -14,7 +14,7 @@ #include -#include +#include #include "handler_aes_data.h" #include "send_to_tab.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h index b69f63224..3ad3f8b24 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h @@ -9,7 +9,7 @@ #include -#include +#include #include "logger.h" namespace TrainingAreaBaseOC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h index 1d42e8658..ab973827b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "logger.h" class QTimer; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h index 943dd0c9c..90ecafeb1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include "logger.h" #include "ttci_channel.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h index 08b8dc72d..9dfe74fb3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace WirelessLocationSystem diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp index a996c797a..1155c55f5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main.cpp @@ -9,7 +9,7 @@ #include "logger.h" #include "settings.h" -#include +#include #include "wls_sfm_message.h" #include "wls_sfm_message_converter.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp index d7f035dcd..e5e7adc63 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp @@ -10,7 +10,7 @@ #include "wls_handler.h" #include "wls_participant_handler.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp index 4370ee9d5..357a28331 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp @@ -6,8 +6,8 @@ #include "wls_handler.h" #include "settings.h" #include -#include -#include +#include +#include static constexpr qint64 s_dataCommunicationAliveTimeout = 5 * 1000; static constexpr int s_maxWlsRetryCount = 3; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp index 7c95a919f..1e6c89752 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp index 357eb4db2..8a4fe5920 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp @@ -16,7 +16,7 @@ #include #include "Trajectory/trajectory_transform.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.h index b162edc1a..edc9ca50f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.h @@ -9,7 +9,7 @@ #pragma once #include "abstract_firing_strategy.h" -#include +#include namespace Core { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp index 559968a52..0a78a75bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp index 2e368c544..e16ff3099 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp @@ -15,7 +15,7 @@ #include -#include +#include #ifdef NEVER // for csv file # include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h index 143b8d9cc..2137de722 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h @@ -13,7 +13,7 @@ #include "trajectory_generator_vulcano.h" #include // Lts/DDS/Core/core.hpp for Core::GeoPosition #include -#include +#include #include "trajectory_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h index 9c52f707b..b5e92dfb1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h @@ -14,7 +14,7 @@ #include "trajectory_export.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp index 8530ae7c7..561d47703 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp @@ -10,7 +10,7 @@ #include "trajectory_helper.h" #include "../logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h index cc662b10a..5bd6fd660 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include "trajectory_export.h" namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h index c361760bb..5137efc98 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h @@ -4,7 +4,7 @@ #include "trajectory_export.h" #include -#include +#include namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h index 5e5fa6e9b..34983923d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "aes_db.h" namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp index e8b4f4e48..25aa58c97 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp @@ -10,7 +10,7 @@ #include "firing_timer.h" #include "../logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp index 8b5634a8a..dbbb73480 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h index 219f9fc6e..1e338f242 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h @@ -10,7 +10,7 @@ #include "object_base.h" #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h index c7ed8e0b4..6e9f271b1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp index 13132470a..306962107 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp @@ -10,7 +10,7 @@ #include "EffectorFiringStrategy/abstract_firing_strategy.h" #include "EffectorFiringStrategy/firing_strategy_factory.h" -#include +#include namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h index a316f7235..96c14680a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/convert_db_to_dds.h index 4836aa24d..2239c69a0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/convert_db_to_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/convert_db_to_dds.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace AssetManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp index f7469a90f..2d6ca46dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.cpp index 784c90fd6..99415024a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.cpp @@ -10,7 +10,7 @@ #include "avs_command_queue_test.h" #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h index f16f07928..6c3dab071 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h @@ -15,7 +15,7 @@ #include "rt_state.h" #include "avs_command_queue.h" #include "logger.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp index dd2c49e03..06b4f49de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp @@ -9,7 +9,7 @@ #include "avs_command_queue.h" #include "icommand.h" -#include +#include namespace AudioVideoManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp index f87501136..da9affd52 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp index 9ad355e1d..b376a3cbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp @@ -11,7 +11,7 @@ #include "audio_video_handler_impl.h" #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp index fefc8d2e1..812d3e1c6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h index 4670432dd..aff6a8966 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h @@ -14,7 +14,7 @@ #include "ava_types.h" #include "avs_command_queue.h" #include "logger.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp index 3b2f43829..a4dea862c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp index f4229d805..899bb9b02 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #define TIMEDIFFVALID 3000 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp index 89b341da8..1d895f6ec 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp index fae6bfde6..b1ef42f0e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp @@ -11,7 +11,7 @@ #include "expand_polygon.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp index ecb2c40c6..f94d59bdc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp @@ -13,7 +13,7 @@ #include "settings.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp index acf8337d0..c5631a345 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp index 49fce096b..f514e1301 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp @@ -16,7 +16,7 @@ #include "GeoPairingImpl/GeoPairingImplBalistic.hpp" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp index d6efa9cdc..1f80d60dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp @@ -12,7 +12,7 @@ #include "settings.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h index 15b182dbb..594f7d030 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h index b6976c014..5d40f8805 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h @@ -15,7 +15,7 @@ #include #include "svccesddscommon_export.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp index f84836b2e..81fd20319 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp @@ -7,7 +7,7 @@ */ #include "connection_handler_serial.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp index b6719bc43..7fafd5420 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp @@ -8,7 +8,7 @@ #include "connection_handler_tcp.h" #include "settings.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h index d25b58542..be9be0633 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp index 813a9bbb8..6bf470592 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp @@ -9,7 +9,7 @@ #include "esc_convert_to_tab.h" #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp index 61699a8f1..6cbe3218f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp @@ -9,7 +9,7 @@ #include "esm_convert_to_tab.h" #include -#include +#include #include namespace EffectShowManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp index 19b7d26af..4538a67d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp @@ -6,7 +6,7 @@ * Created by hjl, SLSE, 2017-02-20 */ #include -#include +#include #include #include "initialization.h" #include "handler_tab_data.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h index cabac953c..5fe935603 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h @@ -14,7 +14,7 @@ // For Topic Exercise #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/convert_db_to_dds.h index e19d47755..74aa9ac34 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/convert_db_to_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/convert_db_to_dds.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ExerciseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp index 1c029c907..1e99e6ae8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace ExerciseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp index 312ce902c..f97c86b82 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace ExerciseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp index 8a55b63f6..0779f51a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h index 327116ec0..00a73db01 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace FileManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp index 66aba0ef2..7f643aad0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp @@ -13,7 +13,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace FileManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp index 20e36c8a1..c967f85c7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp index 8d0e07b1c..f2d4f443a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp @@ -15,7 +15,7 @@ #include "handler_mounting_point_asset.h" #include "convert_db_to_dds.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp index c5d3bbf51..31e845d2e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include //------------------------------------------------------------------------------------------------------------- namespace InfrastructureManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp index fed7e6d83..839b137d9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp @@ -9,7 +9,7 @@ #include "handler_oc_data.h" #include -#include +#include #include #include "main_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp index f0608c388..48bc95d49 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "main_handler.h" #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp index 738961f11..3a8fe0e83 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp index 8ddcf5107..a16f92518 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include "settings.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp index 420dd8796..639372c7b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include "main_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp index acc3c2176..889678d30 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include "settings.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp index aa82a3eb1..766b927e3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace OperatorManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp index 79f93cb23..3b8251ce4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp @@ -9,7 +9,7 @@ #include #include "main_handler.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp index 7a24d3791..e0040dd11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace OperatorManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp index 581b4add3..133b91b33 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp @@ -12,7 +12,7 @@ #include "ParticipantHandling/participant.h" #include -#include +#include ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::EquipmentEventHandler(MainHandler *mainHandler, QObject *parent) : QObject(parent) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp index 51213c651..dbea622d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp index 24c088806..c33d660b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp @@ -11,8 +11,8 @@ #include "participant_handler.h" #include #include -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h index a8c8dcc83..35aac66b9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/convert_db_to_dds.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp index aef75517e..28d5d4758 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtils/lts_portrange.h" +#include "LtsUtils/LtsUtilsCore/lts_portrange.h" namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.h index f33754ff5..fce4be48d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.h @@ -11,12 +11,17 @@ #pragma once #include -#include +// pdm_ftc.h - external dependency, removed for build #include #include namespace ProjectDataManagement { +namespace Interface { +namespace Ftc { +} +} + class PdmTests : public QObject { Q_OBJECT diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp index 788af369a..3db64e963 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace ProjectDataManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp index 283b7529b..b4a8f0fd3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp @@ -11,7 +11,7 @@ #include "settings.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp index f5db949bb..b6283ecc4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp @@ -11,7 +11,7 @@ #include "rep_db.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp index 42a69a734..3a32e18ef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h index d5942c762..3df7aae23 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp index 2c79fbd42..c13253205 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp @@ -17,7 +17,7 @@ #include "service_process.h" #include "dds_handler.h" #include "settings.h" -#include +#include ServiceManagement::ServiceHandler::ServiceHandler(const std::shared_ptr &ddsHandler, const std::shared_ptr &licenceDonator) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp index aecbd57b5..5d4118482 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp @@ -13,7 +13,7 @@ #include "object_target_area_assignment.h" #include "main_handler.h" -#include // isPositionTimeOutdated +#include // isPositionTimeOutdated #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/client_message.cpp index 575690edc..888e9b3a1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/client_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/client_message.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h index 28449abaa..0cb548dbc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp index c7761328c..8453749ce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/point3D.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/point3D.h index f559c0518..4879b3570 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/point3D.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/point3D.h @@ -8,7 +8,7 @@ #pragma once -#include +#include //---------------------------------------------------------------------------- namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h index 77676b346..27c3fe51a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h @@ -17,6 +17,7 @@ namespace AdvancedSymbology { +#ifdef BUILD_WITH_EXTERNAL_DDS // forwarding of enum which is declared within a class is not possible: // enum class ParticipantManagement::Role; @@ -44,6 +45,14 @@ AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role) return AdvancedSymbology::Role::Unknown; } +#else +// STUB: Role-Conversion ohne externe DDS-Typen +template +AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE /*role*/) +{ + return AdvancedSymbology::Role::Unknown; +} +#endif } // namespace AdvancedSymbology diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h index 520807e16..da89c35af 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h @@ -25,11 +25,13 @@ class QValidator; +#ifdef BUILD_ARCGIS # include // This file is created by RME, not ESRI #if ACRGIS_VERSION >= 0x640600 // 100.6.0 / Update 6 //# define USE_ARCADE_SYMBOLOGY #endif +#endif // BUILD_ARCGIS //---------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake index 5ce0e19bc..b290abae3 100755 --- a/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake +++ b/qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake @@ -34,8 +34,8 @@ ELSE() RETURN() ENDIF() - SET(_arcgis_include_hint "/usr/include") - SET(_arcgis_library_hint "/usr/lib64") + SET(_arcgis_include_hint "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include") + SET(_arcgis_library_hint "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/linux/x64/lib") SET(_arcgis_lib_dir $ENV{ARCGIS_LIB_DIR}) SET(_arcgis_inc_dir $ENV{ARCGIS_INC_DIR}) diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h index 31cf14ea8..8d915a211 100755 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h +++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h index d4ec98461..80a300737 100755 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h +++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h index 0df066c5e..d68913d23 100755 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h index 0c8ecf05f..1c8d806b0 100644 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h @@ -10,7 +10,7 @@ #include -#include "LtsUtils/data_modification_enum.h" +#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" #include "ProjectDataManagement/pdm_types.h" namespace AlarmManagement diff --git a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h index 377bdbc2f..039081472 100644 --- a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h @@ -10,7 +10,7 @@ #include -#include "LtsUtils/data_modification_enum.h" +#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h index 055bdbb41..07712eb95 100644 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h @@ -5,9 +5,9 @@ #include "gna_nasat_aircraft.h" #include "gna_nasat_aircraft_participant.h" -#include "../ParticipantManagement/ppm_enums.hpp" -#include "../ParticipantManagement/ppm.hpp" -#include "../../Lts/Common/LtsUtils/LtsUtilsCore/data_modification_enum.h" +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h index d9dc88001..0f4c1764c 100644 --- a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h @@ -3,11 +3,56 @@ // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert // Für die Migration erstellen wir minimale Forward-Declarations +#include +#include +#include +#include +#include + +#include + +#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" +#include "mrk_marker.h" + namespace MarkerManagement { + namespace Interface { -class Dtc; + +// Dtc interface class with signals for Qt6 migration STUB +class Dtc : public QObject +{ + Q_OBJECT +public: + explicit Dtc(QObject* parent = nullptr) : QObject(parent) {} + ~Dtc() override = default; + + // Callback registration instead of enableNotification() + void markers(std::function callback) + { + m_markerCallback = callback; + } + + // Trigger marker changed (for STUB testing) + void triggerMarkerChanged(const Marker& marker, DataModification modType) + { + emit markerChanged(marker, modType); + if (m_markerCallback) + { + m_markerCallback(marker); + } + } + +signals: + void markerChanged(const Marker& marker, DataModification modType); + +private: + std::function m_markerCallback; +}; + class Ftc; + } // namespace Interface + } // namespace MarkerManagement diff --git a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h index 7481770d5..8c71077b0 100644 --- a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h +++ b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h @@ -4,6 +4,7 @@ // Für die Migration erstellen wir minimale Typ-Definitionen #include +#include #include "mrkcommon_export.h" namespace MarkerManagement @@ -12,6 +13,17 @@ namespace MarkerManagement // STUB: MarkerType enum enum class MarkerType : int { Unknown = 0, Situation = 1, Audio = 2, Video = 3 }; +// STUB: MarkerDescription - wird durch echten DDS-Typ ersetzt (muss VOR Marker deklariert werden) +struct MRKCOMMON_EXPORT MarkerDescription +{ + int id = 0; + QString name; + MarkerType markerType() const { return MarkerType::Unknown; } + void setMarkerType(MarkerType type) { Q_UNUSED(type); } + std::string content() const { return ""; } + // Weitere Felder werden bei Bedarf ergänzt +}; + // STUB: Marker - wird durch echten DDS-Typ ersetzt struct MRKCOMMON_EXPORT Marker { @@ -19,17 +31,25 @@ struct MRKCOMMON_EXPORT Marker QString name; int exerciseId = 0; qint64 timeStamp() const { return 0; } + qint64 timeStampOffset() const { return 0; } + int operatorId() const { return 0; } + int fileContentId() const { return 0; } + std::string note() const { return ""; } + std::vector descriptions() const { return {}; } // Weitere Felder werden bei Bedarf ergänzt }; -// STUB: MarkerDescription - wird durch echten DDS-Typ ersetzt -struct MRKCOMMON_EXPORT MarkerDescription +// STUB: toString Funktion für MarkerType +inline QString toString(MarkerType type) { - int id = 0; - QString name; - MarkerType markerType() const { return MarkerType::Unknown; } - void setMarkerType(MarkerType type) { Q_UNUSED(type); } - // Weitere Felder werden bei Bedarf ergänzt -}; + switch (type) + { + case MarkerType::Unknown: return QStringLiteral("Unknown"); + case MarkerType::Situation: return QStringLiteral("Situation"); + case MarkerType::Audio: return QStringLiteral("Audio"); + case MarkerType::Video: return QStringLiteral("Video"); + default: return QStringLiteral("Unknown"); + } +} } // namespace MarkerManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h index c69e9ca0e..54cfd8c52 100644 --- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h @@ -3,8 +3,20 @@ // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert // Für die Migration erstellen wir minimale Forward-Declarations +#include + namespace OperatorManagement { + +struct User +{ + [[nodiscard]] qint32 id() const { return m_id; } + [[nodiscard]] std::string name() const { return m_name; } + + qint32 m_id = 0; + std::string m_name; +}; + namespace Interface { class Dtc; diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp index 749ab94e9..d2c3cdeee 100644 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp @@ -12,8 +12,6 @@ #include #include -#include "LtsUtils/data_modification_enum.h" - namespace ParticipantManagement { @@ -52,7 +50,7 @@ struct Participant { QString name() const { return internalName; } QString designator() const { return m_designator; } QString tacticalIdentifier() const { return m_tacticalIdentifier; } - std::optional equipmentNumber() const { return equipmentNumber; } + std::optional getEquipmentNumber() const { return equipmentNumber; } int id() const { return m_id; } }; diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp index a76ab091e..d0e4e6805 100644 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp @@ -33,7 +33,8 @@ enum class TypeClass : int { TargetVehicle = 16, VehicleWithGear = 17, VehicleMarker = 18, - None = 19 + None = 19, + Other = 20 }; enum class DataModification : int { eAdded = 0, eModified = 1, eRemoved = 2 }; diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h index 311e8f46b..72042dee2 100644 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h @@ -143,4 +143,16 @@ inline PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state) } } +inline PDM_COMMON_EXPORT QString toString(EventType et) +{ + switch (et) { + case EventType::Unknown: return QStringLiteral("Unknown"); + case EventType::Alarm: return QStringLiteral("Alarm"); + case EventType::Warning: return QStringLiteral("Warning"); + case EventType::Info: return QStringLiteral("Info"); + case EventType::Status: return QStringLiteral("Status"); + default: return QStringLiteral("Unknown"); + } +} + } // namespace ProjectDataManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp index 2add0825c..e1cfae2c1 100644 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp @@ -1,6 +1,6 @@ #pragma once -// STUB-HEADER: Diese Datei wird normalerweise von DDS/Codegenerator generiert +// STUB-Header: Diese Datei wird normalerweise von DDS/Codegenerator generiert // Für die Migration erstellen wir minimale Typ-Definitionen #include "pdm_types.h" @@ -8,14 +8,7 @@ namespace ProjectDataManagement { -// STUB: EventType Enum -enum class EventType : int -{ - Unknown = 0, - Alarm = 1, - Warning = 2, - Info = 3 -}; +// EventType wird bereits in pdm_types.h definiert // STUB: EventType_def - Platzhalter für DDS-generierten Typ // Wird in AlarmManagement für Event-Typisierung verwendet