From 9ab9d653a12517a6c8ccc059ea057733db7b3ee5 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 14 Feb 2025 11:01:17 -0800 Subject: [PATCH] Components renamed to ComponentInformation Better reflects actual code. Also reduces confusing with things like VehicleComponent --- src/FactSystem/CMakeLists.txt | 2 +- src/Vehicle/CMakeLists.txt | 4 ++-- .../{Components => ComponentInformation}/CMakeLists.txt | 6 +++--- .../{Components => ComponentInformation}/CompInfo.cc | 0 src/Vehicle/{Components => ComponentInformation}/CompInfo.h | 0 .../CompInfoActuators.cc | 0 .../CompInfoActuators.h | 0 .../{Components => ComponentInformation}/CompInfoEvents.cc | 0 .../{Components => ComponentInformation}/CompInfoEvents.h | 0 .../{Components => ComponentInformation}/CompInfoGeneral.cc | 0 .../{Components => ComponentInformation}/CompInfoGeneral.h | 0 .../{Components => ComponentInformation}/CompInfoParam.cc | 0 .../{Components => ComponentInformation}/CompInfoParam.h | 0 .../ComponentInformationCache.cc | 0 .../ComponentInformationCache.h | 0 .../ComponentInformationManager.cc | 0 .../ComponentInformationManager.h | 0 .../ComponentInformationTranslation.cc | 0 .../ComponentInformationTranslation.h | 0 src/VehicleSetup/CMakeLists.txt | 2 +- test/UnitTest.qrc | 4 ++-- test/Vehicle/CMakeLists.txt | 2 +- .../{Components => ComponentInformation}/CMakeLists.txt | 2 +- .../ComponentInformationCacheTest.cc | 0 .../ComponentInformationCacheTest.h | 0 .../ComponentInformationTranslationTest.cc | 0 .../ComponentInformationTranslationTest.h | 0 .../TranslationTest.json | 0 .../TranslationTest_de_DE.ts | 0 test/qgcunittest/CMakeLists.txt | 2 +- 30 files changed, 12 insertions(+), 12 deletions(-) rename src/Vehicle/{Components => ComponentInformation}/CMakeLists.txt (78%) rename src/Vehicle/{Components => ComponentInformation}/CompInfo.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfo.h (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoActuators.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoActuators.h (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoEvents.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoEvents.h (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoGeneral.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoGeneral.h (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoParam.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/CompInfoParam.h (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationCache.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationCache.h (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationManager.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationManager.h (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationTranslation.cc (100%) rename src/Vehicle/{Components => ComponentInformation}/ComponentInformationTranslation.h (100%) rename test/Vehicle/{Components => ComponentInformation}/CMakeLists.txt (95%) rename test/Vehicle/{Components => ComponentInformation}/ComponentInformationCacheTest.cc (100%) rename test/Vehicle/{Components => ComponentInformation}/ComponentInformationCacheTest.h (100%) rename test/Vehicle/{Components => ComponentInformation}/ComponentInformationTranslationTest.cc (100%) rename test/Vehicle/{Components => ComponentInformation}/ComponentInformationTranslationTest.h (100%) rename test/Vehicle/{Components => ComponentInformation}/TranslationTest.json (100%) rename test/Vehicle/{Components => ComponentInformation}/TranslationTest_de_DE.ts (100%) diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt index 6a33fe4c0..e1aa5f7ea 100644 --- a/src/FactSystem/CMakeLists.txt +++ b/src/FactSystem/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(FactSystem Settings Utilities Vehicle - VehicleComponents + ComponentInformation PUBLIC Qt6::Core MAVLink diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt index ccc239229..1d45aee37 100644 --- a/src/Vehicle/CMakeLists.txt +++ b/src/Vehicle/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(Actuators) -add_subdirectory(Components) +add_subdirectory(ComponentInformation) add_subdirectory(FactGroups) find_package(Qt6 REQUIRED COMPONENTS Core Gui Positioning Qml) @@ -35,7 +35,7 @@ target_link_libraries(Vehicle PRIVATE Qt6::Qml VehicleActuators - VehicleComponents + ComponentInformation ADSB API Audio diff --git a/src/Vehicle/Components/CMakeLists.txt b/src/Vehicle/ComponentInformation/CMakeLists.txt similarity index 78% rename from src/Vehicle/Components/CMakeLists.txt rename to src/Vehicle/ComponentInformation/CMakeLists.txt index 6dc3ec561..dfb607e5b 100644 --- a/src/Vehicle/Components/CMakeLists.txt +++ b/src/Vehicle/ComponentInformation/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core) -qt_add_library(VehicleComponents STATIC +qt_add_library(ComponentInformation STATIC CompInfo.cc CompInfo.h CompInfoActuators.cc @@ -19,7 +19,7 @@ qt_add_library(VehicleComponents STATIC ComponentInformationTranslation.h ) -target_link_libraries(VehicleComponents +target_link_libraries(ComponentInformation PRIVATE Compression FirmwarePlugin @@ -32,4 +32,4 @@ target_link_libraries(VehicleComponents Utilities ) -target_include_directories(VehicleComponents PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(ComponentInformation PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/Vehicle/Components/CompInfo.cc b/src/Vehicle/ComponentInformation/CompInfo.cc similarity index 100% rename from src/Vehicle/Components/CompInfo.cc rename to src/Vehicle/ComponentInformation/CompInfo.cc diff --git a/src/Vehicle/Components/CompInfo.h b/src/Vehicle/ComponentInformation/CompInfo.h similarity index 100% rename from src/Vehicle/Components/CompInfo.h rename to src/Vehicle/ComponentInformation/CompInfo.h diff --git a/src/Vehicle/Components/CompInfoActuators.cc b/src/Vehicle/ComponentInformation/CompInfoActuators.cc similarity index 100% rename from src/Vehicle/Components/CompInfoActuators.cc rename to src/Vehicle/ComponentInformation/CompInfoActuators.cc diff --git a/src/Vehicle/Components/CompInfoActuators.h b/src/Vehicle/ComponentInformation/CompInfoActuators.h similarity index 100% rename from src/Vehicle/Components/CompInfoActuators.h rename to src/Vehicle/ComponentInformation/CompInfoActuators.h diff --git a/src/Vehicle/Components/CompInfoEvents.cc b/src/Vehicle/ComponentInformation/CompInfoEvents.cc similarity index 100% rename from src/Vehicle/Components/CompInfoEvents.cc rename to src/Vehicle/ComponentInformation/CompInfoEvents.cc diff --git a/src/Vehicle/Components/CompInfoEvents.h b/src/Vehicle/ComponentInformation/CompInfoEvents.h similarity index 100% rename from src/Vehicle/Components/CompInfoEvents.h rename to src/Vehicle/ComponentInformation/CompInfoEvents.h diff --git a/src/Vehicle/Components/CompInfoGeneral.cc b/src/Vehicle/ComponentInformation/CompInfoGeneral.cc similarity index 100% rename from src/Vehicle/Components/CompInfoGeneral.cc rename to src/Vehicle/ComponentInformation/CompInfoGeneral.cc diff --git a/src/Vehicle/Components/CompInfoGeneral.h b/src/Vehicle/ComponentInformation/CompInfoGeneral.h similarity index 100% rename from src/Vehicle/Components/CompInfoGeneral.h rename to src/Vehicle/ComponentInformation/CompInfoGeneral.h diff --git a/src/Vehicle/Components/CompInfoParam.cc b/src/Vehicle/ComponentInformation/CompInfoParam.cc similarity index 100% rename from src/Vehicle/Components/CompInfoParam.cc rename to src/Vehicle/ComponentInformation/CompInfoParam.cc diff --git a/src/Vehicle/Components/CompInfoParam.h b/src/Vehicle/ComponentInformation/CompInfoParam.h similarity index 100% rename from src/Vehicle/Components/CompInfoParam.h rename to src/Vehicle/ComponentInformation/CompInfoParam.h diff --git a/src/Vehicle/Components/ComponentInformationCache.cc b/src/Vehicle/ComponentInformation/ComponentInformationCache.cc similarity index 100% rename from src/Vehicle/Components/ComponentInformationCache.cc rename to src/Vehicle/ComponentInformation/ComponentInformationCache.cc diff --git a/src/Vehicle/Components/ComponentInformationCache.h b/src/Vehicle/ComponentInformation/ComponentInformationCache.h similarity index 100% rename from src/Vehicle/Components/ComponentInformationCache.h rename to src/Vehicle/ComponentInformation/ComponentInformationCache.h diff --git a/src/Vehicle/Components/ComponentInformationManager.cc b/src/Vehicle/ComponentInformation/ComponentInformationManager.cc similarity index 100% rename from src/Vehicle/Components/ComponentInformationManager.cc rename to src/Vehicle/ComponentInformation/ComponentInformationManager.cc diff --git a/src/Vehicle/Components/ComponentInformationManager.h b/src/Vehicle/ComponentInformation/ComponentInformationManager.h similarity index 100% rename from src/Vehicle/Components/ComponentInformationManager.h rename to src/Vehicle/ComponentInformation/ComponentInformationManager.h diff --git a/src/Vehicle/Components/ComponentInformationTranslation.cc b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc similarity index 100% rename from src/Vehicle/Components/ComponentInformationTranslation.cc rename to src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc diff --git a/src/Vehicle/Components/ComponentInformationTranslation.h b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.h similarity index 100% rename from src/Vehicle/Components/ComponentInformationTranslation.h rename to src/Vehicle/ComponentInformation/ComponentInformationTranslation.h diff --git a/src/VehicleSetup/CMakeLists.txt b/src/VehicleSetup/CMakeLists.txt index 2ce3abb41..317d7f9d4 100644 --- a/src/VehicleSetup/CMakeLists.txt +++ b/src/VehicleSetup/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(VehicleSetup Settings Utilities Vehicle - VehicleComponents + ComponentInformation PUBLIC Qt6::Core Qt6::Gui diff --git a/test/UnitTest.qrc b/test/UnitTest.qrc index c8aa3a577..25f481c46 100644 --- a/test/UnitTest.qrc +++ b/test/UnitTest.qrc @@ -13,8 +13,8 @@ MissionManager/PolygonGood.kml MissionManager/PolygonMissingNode.kml MissionManager/SectionTest.plan - Vehicle/Components/TranslationTest.json - Vehicle/Components/TranslationTest_de_DE.ts + Vehicle/ComponentInformation/TranslationTest.json + Vehicle/ComponentInformation/TranslationTest_de_DE.ts FactSystem/FactSystemTest.qml MissionManager/MissionPlanner.waypoints MissionManager/OldFileFormat.mission diff --git a/test/Vehicle/CMakeLists.txt b/test/Vehicle/CMakeLists.txt index 362a55f4b..a0f4bd1fc 100644 --- a/test/Vehicle/CMakeLists.txt +++ b/test/Vehicle/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(Components) +add_subdirectory(ComponentInformation) find_package(Qt6 REQUIRED COMPONENTS Core Test) diff --git a/test/Vehicle/Components/CMakeLists.txt b/test/Vehicle/ComponentInformation/CMakeLists.txt similarity index 95% rename from test/Vehicle/Components/CMakeLists.txt rename to test/Vehicle/ComponentInformation/CMakeLists.txt index 1e7657162..3be7dfd82 100644 --- a/test/Vehicle/Components/CMakeLists.txt +++ b/test/Vehicle/ComponentInformation/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(VehicleComponentsTest PRIVATE Qt6::Test Utilities - VehicleComponents + ComponentInformation PUBLIC Qt6::Core qgcunittest diff --git a/test/Vehicle/Components/ComponentInformationCacheTest.cc b/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.cc similarity index 100% rename from test/Vehicle/Components/ComponentInformationCacheTest.cc rename to test/Vehicle/ComponentInformation/ComponentInformationCacheTest.cc diff --git a/test/Vehicle/Components/ComponentInformationCacheTest.h b/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h similarity index 100% rename from test/Vehicle/Components/ComponentInformationCacheTest.h rename to test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h diff --git a/test/Vehicle/Components/ComponentInformationTranslationTest.cc b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc similarity index 100% rename from test/Vehicle/Components/ComponentInformationTranslationTest.cc rename to test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc diff --git a/test/Vehicle/Components/ComponentInformationTranslationTest.h b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h similarity index 100% rename from test/Vehicle/Components/ComponentInformationTranslationTest.h rename to test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h diff --git a/test/Vehicle/Components/TranslationTest.json b/test/Vehicle/ComponentInformation/TranslationTest.json similarity index 100% rename from test/Vehicle/Components/TranslationTest.json rename to test/Vehicle/ComponentInformation/TranslationTest.json diff --git a/test/Vehicle/Components/TranslationTest_de_DE.ts b/test/Vehicle/ComponentInformation/TranslationTest_de_DE.ts similarity index 100% rename from test/Vehicle/Components/TranslationTest_de_DE.ts rename to test/Vehicle/ComponentInformation/TranslationTest_de_DE.ts diff --git a/test/qgcunittest/CMakeLists.txt b/test/qgcunittest/CMakeLists.txt index b1919e6e2..6a4e0f771 100644 --- a/test/qgcunittest/CMakeLists.txt +++ b/test/qgcunittest/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(qgcunittest MissionManager Settings Vehicle - VehicleComponents + ComponentInformation Qt6::Test PUBLIC Qt6::Core