From e30b5d7fa743654eac42cb574b7808f6a5f11806 Mon Sep 17 00:00:00 2001 From: FrogTheFrog Date: Wed, 17 Jul 2024 21:40:55 +0300 Subject: [PATCH] feat: Rename displaydevice directory to display_device --- src/CMakeLists.txt | 2 +- src/common/CMakeLists.txt | 4 ++-- src/common/file_settings_persistence.cpp | 4 ++-- .../audio_context_interface.h | 0 .../detail/json_converter.h | 0 .../detail/json_serializer.h | 0 .../detail/json_serializer_details.h | 0 .../file_settings_persistence.h | 0 .../include/{displaydevice => display_device}/json.h | 0 .../include/{displaydevice => display_device}/logging.h | 0 .../noop_audio_context.h | 0 .../noop_settings_persistence.h | 0 .../{displaydevice => display_device}/retry_scheduler.h | 0 .../settings_manager_interface.h | 0 .../settings_persistence_interface.h | 0 .../include/{displaydevice => display_device}/types.h | 0 src/common/json.cpp | 6 +++--- src/common/json_serializer.cpp | 4 ++-- src/common/logging.cpp | 2 +- src/common/noop_audio_context.cpp | 2 +- src/common/noop_settings_persistence.cpp | 2 +- src/common/retry_scheduler.cpp | 2 +- src/common/types.cpp | 2 +- src/{displaydevice => display_device}/CMakeLists.txt | 2 +- .../include/display_device}/libddplaceholder.h | 0 src/display_device/libddplaceholder.cpp | 6 ++++++ src/displaydevice/libddplaceholder.cpp | 6 ------ src/platf/CMakeLists.txt | 2 +- .../libplatfplaceholder.h | 0 src/platf/libplatfplaceholder.cpp | 2 +- src/windows/CMakeLists.txt | 4 ++-- .../windows/detail/json_serializer.h | 2 +- .../{displaydevice => display_device}/windows/json.h | 2 +- .../windows/persistent_state.h | 4 ++-- .../windows/settings_manager.h | 6 +++--- .../windows/settings_utils.h | 0 .../{displaydevice => display_device}/windows/types.h | 2 +- .../windows/win_api_layer.h | 0 .../windows/win_api_layer_interface.h | 0 .../windows/win_api_utils.h | 0 .../windows/win_display_device.h | 0 .../windows/win_display_device_interface.h | 2 +- src/windows/json.cpp | 6 +++--- src/windows/json_serializer.cpp | 4 ++-- src/windows/persistent_state.cpp | 8 ++++---- src/windows/settings_manager_apply.cpp | 8 ++++---- src/windows/settings_manager_general.cpp | 6 +++--- src/windows/settings_manager_revert.cpp | 8 ++++---- src/windows/settings_utils.cpp | 6 +++--- src/windows/types.cpp | 2 +- src/windows/win_api_layer.cpp | 4 ++-- src/windows/win_api_utils.cpp | 4 ++-- src/windows/win_display_device_general.cpp | 6 +++--- src/windows/win_display_device_hdr.cpp | 6 +++--- src/windows/win_display_device_modes.cpp | 6 +++--- src/windows/win_display_device_primary.cpp | 6 +++--- src/windows/win_display_device_topology.cpp | 6 +++--- tests/fixtures/include/fixtures/fixtures.h | 2 +- tests/fixtures/include/fixtures/json_converter_test.h | 2 +- tests/fixtures/include/fixtures/mock_audio_context.h | 2 +- .../fixtures/include/fixtures/mock_settings_persistence.h | 2 +- tests/unit/general/test_comparison.cpp | 2 +- tests/unit/general/test_file_settings_persistence.cpp | 2 +- tests/unit/general/test_json.cpp | 6 +++--- tests/unit/general/test_logging.cpp | 2 +- tests/unit/general/test_noop_audio_context.cpp | 2 +- tests/unit/general/test_noop_settings_persistence.cpp | 2 +- tests/unit/general/test_retry_scheduler.cpp | 2 +- tests/unit/windows/test_comparison.cpp | 2 +- tests/unit/windows/test_json_converter.cpp | 2 +- tests/unit/windows/test_persistent_state.cpp | 4 ++-- tests/unit/windows/test_settings_manager_apply.cpp | 4 ++-- tests/unit/windows/test_settings_manager_general.cpp | 6 +++--- tests/unit/windows/test_settings_manager_revert.cpp | 4 ++-- tests/unit/windows/test_settings_utils.cpp | 2 +- tests/unit/windows/test_win_api_layer.cpp | 2 +- tests/unit/windows/test_win_api_utils.cpp | 2 +- tests/unit/windows/test_win_display_device_general.cpp | 8 ++++---- tests/unit/windows/test_win_display_device_hdr.cpp | 6 +++--- tests/unit/windows/test_win_display_device_modes.cpp | 8 ++++---- tests/unit/windows/test_win_display_device_primary.cpp | 8 ++++---- tests/unit/windows/test_win_display_device_topology.cpp | 8 ++++---- tests/unit/windows/test_win_playground.cpp | 8 ++++---- tests/unit/windows/utils/comparison.h | 2 +- tests/unit/windows/utils/guards.cpp | 2 +- tests/unit/windows/utils/guards.h | 2 +- tests/unit/windows/utils/helpers.cpp | 2 +- tests/unit/windows/utils/helpers.h | 4 ++-- tests/unit/windows/utils/mock_win_api_layer.h | 2 +- tests/unit/windows/utils/mock_win_display_device.h | 2 +- 90 files changed, 136 insertions(+), 136 deletions(-) rename src/common/include/{displaydevice => display_device}/audio_context_interface.h (100%) rename src/common/include/{displaydevice => display_device}/detail/json_converter.h (100%) rename src/common/include/{displaydevice => display_device}/detail/json_serializer.h (100%) rename src/common/include/{displaydevice => display_device}/detail/json_serializer_details.h (100%) rename src/common/include/{displaydevice => display_device}/file_settings_persistence.h (100%) rename src/common/include/{displaydevice => display_device}/json.h (100%) rename src/common/include/{displaydevice => display_device}/logging.h (100%) rename src/common/include/{displaydevice => display_device}/noop_audio_context.h (100%) rename src/common/include/{displaydevice => display_device}/noop_settings_persistence.h (100%) rename src/common/include/{displaydevice => display_device}/retry_scheduler.h (100%) rename src/common/include/{displaydevice => display_device}/settings_manager_interface.h (100%) rename src/common/include/{displaydevice => display_device}/settings_persistence_interface.h (100%) rename src/common/include/{displaydevice => display_device}/types.h (100%) rename src/{displaydevice => display_device}/CMakeLists.txt (87%) rename src/{displaydevice/include/displaydevice => display_device/include/display_device}/libddplaceholder.h (100%) create mode 100644 src/display_device/libddplaceholder.cpp delete mode 100644 src/displaydevice/libddplaceholder.cpp rename src/platf/include/{displaydevice => display_device}/libplatfplaceholder.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/detail/json_serializer.h (88%) rename src/windows/include/{displaydevice => display_device}/windows/json.h (91%) rename src/windows/include/{displaydevice => display_device}/windows/persistent_state.h (92%) rename src/windows/include/{displaydevice => display_device}/windows/settings_manager.h (97%) rename src/windows/include/{displaydevice => display_device}/windows/settings_utils.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/types.h (99%) rename src/windows/include/{displaydevice => display_device}/windows/win_api_layer.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/win_api_layer_interface.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/win_api_utils.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/win_display_device.h (100%) rename src/windows/include/{displaydevice => display_device}/windows/win_display_device_interface.h (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 984f6efc..af33d9ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,4 +16,4 @@ endif() add_subdirectory(platf) # This is the main library -add_subdirectory(displaydevice) +add_subdirectory(display_device) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 2bf3c544..9177bbb7 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -2,8 +2,8 @@ set(MODULE libcommon) # Globing headers (so that they appear in some IDEs) and sources -file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h") -file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h") +file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h") +file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h") file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp") # Automatic library - will be static or dynamic based on user setting diff --git a/src/common/file_settings_persistence.cpp b/src/common/file_settings_persistence.cpp index 5c59c80a..d28fd134 100644 --- a/src/common/file_settings_persistence.cpp +++ b/src/common/file_settings_persistence.cpp @@ -1,5 +1,5 @@ // class header include -#include "displaydevice/file_settings_persistence.h" +#include "display_device/file_settings_persistence.h" // system includes #include @@ -7,7 +7,7 @@ #include // local includes -#include "displaydevice/logging.h" +#include "display_device/logging.h" namespace display_device { FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath): diff --git a/src/common/include/displaydevice/audio_context_interface.h b/src/common/include/display_device/audio_context_interface.h similarity index 100% rename from src/common/include/displaydevice/audio_context_interface.h rename to src/common/include/display_device/audio_context_interface.h diff --git a/src/common/include/displaydevice/detail/json_converter.h b/src/common/include/display_device/detail/json_converter.h similarity index 100% rename from src/common/include/displaydevice/detail/json_converter.h rename to src/common/include/display_device/detail/json_converter.h diff --git a/src/common/include/displaydevice/detail/json_serializer.h b/src/common/include/display_device/detail/json_serializer.h similarity index 100% rename from src/common/include/displaydevice/detail/json_serializer.h rename to src/common/include/display_device/detail/json_serializer.h diff --git a/src/common/include/displaydevice/detail/json_serializer_details.h b/src/common/include/display_device/detail/json_serializer_details.h similarity index 100% rename from src/common/include/displaydevice/detail/json_serializer_details.h rename to src/common/include/display_device/detail/json_serializer_details.h diff --git a/src/common/include/displaydevice/file_settings_persistence.h b/src/common/include/display_device/file_settings_persistence.h similarity index 100% rename from src/common/include/displaydevice/file_settings_persistence.h rename to src/common/include/display_device/file_settings_persistence.h diff --git a/src/common/include/displaydevice/json.h b/src/common/include/display_device/json.h similarity index 100% rename from src/common/include/displaydevice/json.h rename to src/common/include/display_device/json.h diff --git a/src/common/include/displaydevice/logging.h b/src/common/include/display_device/logging.h similarity index 100% rename from src/common/include/displaydevice/logging.h rename to src/common/include/display_device/logging.h diff --git a/src/common/include/displaydevice/noop_audio_context.h b/src/common/include/display_device/noop_audio_context.h similarity index 100% rename from src/common/include/displaydevice/noop_audio_context.h rename to src/common/include/display_device/noop_audio_context.h diff --git a/src/common/include/displaydevice/noop_settings_persistence.h b/src/common/include/display_device/noop_settings_persistence.h similarity index 100% rename from src/common/include/displaydevice/noop_settings_persistence.h rename to src/common/include/display_device/noop_settings_persistence.h diff --git a/src/common/include/displaydevice/retry_scheduler.h b/src/common/include/display_device/retry_scheduler.h similarity index 100% rename from src/common/include/displaydevice/retry_scheduler.h rename to src/common/include/display_device/retry_scheduler.h diff --git a/src/common/include/displaydevice/settings_manager_interface.h b/src/common/include/display_device/settings_manager_interface.h similarity index 100% rename from src/common/include/displaydevice/settings_manager_interface.h rename to src/common/include/display_device/settings_manager_interface.h diff --git a/src/common/include/displaydevice/settings_persistence_interface.h b/src/common/include/display_device/settings_persistence_interface.h similarity index 100% rename from src/common/include/displaydevice/settings_persistence_interface.h rename to src/common/include/display_device/settings_persistence_interface.h diff --git a/src/common/include/displaydevice/types.h b/src/common/include/display_device/types.h similarity index 100% rename from src/common/include/displaydevice/types.h rename to src/common/include/display_device/types.h diff --git a/src/common/json.cpp b/src/common/json.cpp index 3fb8a576..6cd82c04 100644 --- a/src/common/json.cpp +++ b/src/common/json.cpp @@ -1,11 +1,11 @@ // header include -#include "displaydevice/json.h" +#include "display_device/json.h" // special ordered include of details #define DD_JSON_DETAIL // clang-format off -#include "displaydevice/detail/json_serializer.h" -#include "displaydevice/detail/json_converter.h" +#include "display_device/detail/json_serializer.h" +#include "display_device/detail/json_converter.h" // clang-format on namespace display_device { diff --git a/src/common/json_serializer.cpp b/src/common/json_serializer.cpp index d8367d35..38849b8e 100644 --- a/src/common/json_serializer.cpp +++ b/src/common/json_serializer.cpp @@ -1,8 +1,8 @@ // special ordered include of details #define DD_JSON_DETAIL // clang-format off -#include "displaydevice/types.h" -#include "displaydevice/detail/json_serializer.h" +#include "display_device/types.h" +#include "display_device/detail/json_serializer.h" // clang-format on namespace display_device { diff --git a/src/common/logging.cpp b/src/common/logging.cpp index 6bee411e..6c5f8fd7 100644 --- a/src/common/logging.cpp +++ b/src/common/logging.cpp @@ -1,5 +1,5 @@ // class header include -#include "displaydevice/logging.h" +#include "display_device/logging.h" // system includes #include diff --git a/src/common/noop_audio_context.cpp b/src/common/noop_audio_context.cpp index 36d44156..847799e3 100644 --- a/src/common/noop_audio_context.cpp +++ b/src/common/noop_audio_context.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/noop_audio_context.h" +#include "display_device/noop_audio_context.h" namespace display_device { bool diff --git a/src/common/noop_settings_persistence.cpp b/src/common/noop_settings_persistence.cpp index 4551884c..ef48454d 100644 --- a/src/common/noop_settings_persistence.cpp +++ b/src/common/noop_settings_persistence.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/noop_settings_persistence.h" +#include "display_device/noop_settings_persistence.h" namespace display_device { bool diff --git a/src/common/retry_scheduler.cpp b/src/common/retry_scheduler.cpp index 89e0c60a..1bda8abb 100644 --- a/src/common/retry_scheduler.cpp +++ b/src/common/retry_scheduler.cpp @@ -1,5 +1,5 @@ // header include -#include "displaydevice/retry_scheduler.h" +#include "display_device/retry_scheduler.h" namespace display_device { SchedulerStopToken::SchedulerStopToken(std::function cleanup): diff --git a/src/common/types.cpp b/src/common/types.cpp index 1ea065a7..e9c8a6f3 100644 --- a/src/common/types.cpp +++ b/src/common/types.cpp @@ -1,5 +1,5 @@ // header include -#include "displaydevice/types.h" +#include "display_device/types.h" namespace { bool diff --git a/src/displaydevice/CMakeLists.txt b/src/display_device/CMakeLists.txt similarity index 87% rename from src/displaydevice/CMakeLists.txt rename to src/display_device/CMakeLists.txt index 223d6601..3ae6b4b7 100644 --- a/src/displaydevice/CMakeLists.txt +++ b/src/display_device/CMakeLists.txt @@ -2,7 +2,7 @@ set(MODULE libdisplaydevice) # Globing headers (so that they appear in some IDEs) and sources -file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h") +file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h") file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp") # Automatic library - will be static or dynamic based on user setting diff --git a/src/displaydevice/include/displaydevice/libddplaceholder.h b/src/display_device/include/display_device/libddplaceholder.h similarity index 100% rename from src/displaydevice/include/displaydevice/libddplaceholder.h rename to src/display_device/include/display_device/libddplaceholder.h diff --git a/src/display_device/libddplaceholder.cpp b/src/display_device/libddplaceholder.cpp new file mode 100644 index 00000000..b85491ce --- /dev/null +++ b/src/display_device/libddplaceholder.cpp @@ -0,0 +1,6 @@ +#include "display_device/libddplaceholder.h" + +int +ddplaceholder() { + return 0; +} diff --git a/src/displaydevice/libddplaceholder.cpp b/src/displaydevice/libddplaceholder.cpp deleted file mode 100644 index d1f244d5..00000000 --- a/src/displaydevice/libddplaceholder.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "displaydevice/libddplaceholder.h" - -int -ddplaceholder() { - return 0; -} diff --git a/src/platf/CMakeLists.txt b/src/platf/CMakeLists.txt index be702ceb..892064e6 100644 --- a/src/platf/CMakeLists.txt +++ b/src/platf/CMakeLists.txt @@ -2,7 +2,7 @@ set(MODULE libplatf) # Globing headers (so that they appear in some IDEs) and sources -file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h") +file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h") file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp") # Automatic library - will be static or dynamic based on user setting diff --git a/src/platf/include/displaydevice/libplatfplaceholder.h b/src/platf/include/display_device/libplatfplaceholder.h similarity index 100% rename from src/platf/include/displaydevice/libplatfplaceholder.h rename to src/platf/include/display_device/libplatfplaceholder.h diff --git a/src/platf/libplatfplaceholder.cpp b/src/platf/libplatfplaceholder.cpp index 8754fc46..0e70e5dc 100644 --- a/src/platf/libplatfplaceholder.cpp +++ b/src/platf/libplatfplaceholder.cpp @@ -1,4 +1,4 @@ -#include "displaydevice/libplatfplaceholder.h" +#include "display_device/libplatfplaceholder.h" int plaftplaceholder() { diff --git a/src/windows/CMakeLists.txt b/src/windows/CMakeLists.txt index 8e56f93c..b483f6da 100644 --- a/src/windows/CMakeLists.txt +++ b/src/windows/CMakeLists.txt @@ -2,8 +2,8 @@ set(MODULE libwindows) # Globing headers (so that they appear in some IDEs) and sources -file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h") -file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h") +file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h") +file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h") file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp") # Automatic library - will be static or dynamic based on user setting diff --git a/src/windows/include/displaydevice/windows/detail/json_serializer.h b/src/windows/include/display_device/windows/detail/json_serializer.h similarity index 88% rename from src/windows/include/displaydevice/windows/detail/json_serializer.h rename to src/windows/include/display_device/windows/detail/json_serializer.h index 2a6ba5e7..2f26ebea 100644 --- a/src/windows/include/displaydevice/windows/detail/json_serializer.h +++ b/src/windows/include/display_device/windows/detail/json_serializer.h @@ -1,7 +1,7 @@ #pragma once // local includes -#include "displaydevice/detail/json_serializer.h" +#include "display_device/detail/json_serializer.h" #ifdef DD_JSON_DETAIL namespace display_device { diff --git a/src/windows/include/displaydevice/windows/json.h b/src/windows/include/display_device/windows/json.h similarity index 91% rename from src/windows/include/displaydevice/windows/json.h rename to src/windows/include/display_device/windows/json.h index 2a48ecde..fac992be 100644 --- a/src/windows/include/displaydevice/windows/json.h +++ b/src/windows/include/display_device/windows/json.h @@ -1,7 +1,7 @@ #pragma once // local includes -#include "displaydevice/json.h" +#include "display_device/json.h" #include "types.h" // Windows' converters (add as needed) diff --git a/src/windows/include/displaydevice/windows/persistent_state.h b/src/windows/include/display_device/windows/persistent_state.h similarity index 92% rename from src/windows/include/displaydevice/windows/persistent_state.h rename to src/windows/include/display_device/windows/persistent_state.h index c1524f5a..0b213b88 100644 --- a/src/windows/include/displaydevice/windows/persistent_state.h +++ b/src/windows/include/display_device/windows/persistent_state.h @@ -4,8 +4,8 @@ #include // local includes -#include "displaydevice/settings_persistence_interface.h" -#include "displaydevice/windows/win_display_device_interface.h" +#include "display_device/settings_persistence_interface.h" +#include "display_device/windows/win_display_device_interface.h" namespace display_device { /** diff --git a/src/windows/include/displaydevice/windows/settings_manager.h b/src/windows/include/display_device/windows/settings_manager.h similarity index 97% rename from src/windows/include/displaydevice/windows/settings_manager.h rename to src/windows/include/display_device/windows/settings_manager.h index bc19d4df..e729e106 100644 --- a/src/windows/include/displaydevice/windows/settings_manager.h +++ b/src/windows/include/display_device/windows/settings_manager.h @@ -5,9 +5,9 @@ #include // local includes -#include "displaydevice/audio_context_interface.h" -#include "displaydevice/settings_manager_interface.h" -#include "displaydevice/windows/win_display_device_interface.h" +#include "display_device/audio_context_interface.h" +#include "display_device/settings_manager_interface.h" +#include "display_device/windows/win_display_device_interface.h" #include "persistent_state.h" namespace display_device { diff --git a/src/windows/include/displaydevice/windows/settings_utils.h b/src/windows/include/display_device/windows/settings_utils.h similarity index 100% rename from src/windows/include/displaydevice/windows/settings_utils.h rename to src/windows/include/display_device/windows/settings_utils.h diff --git a/src/windows/include/displaydevice/windows/types.h b/src/windows/include/display_device/windows/types.h similarity index 99% rename from src/windows/include/displaydevice/windows/types.h rename to src/windows/include/display_device/windows/types.h index ee6ea78b..0d2ad321 100644 --- a/src/windows/include/displaydevice/windows/types.h +++ b/src/windows/include/display_device/windows/types.h @@ -9,7 +9,7 @@ #include // local includes -#include "displaydevice/types.h" +#include "display_device/types.h" namespace display_device { /** diff --git a/src/windows/include/displaydevice/windows/win_api_layer.h b/src/windows/include/display_device/windows/win_api_layer.h similarity index 100% rename from src/windows/include/displaydevice/windows/win_api_layer.h rename to src/windows/include/display_device/windows/win_api_layer.h diff --git a/src/windows/include/displaydevice/windows/win_api_layer_interface.h b/src/windows/include/display_device/windows/win_api_layer_interface.h similarity index 100% rename from src/windows/include/displaydevice/windows/win_api_layer_interface.h rename to src/windows/include/display_device/windows/win_api_layer_interface.h diff --git a/src/windows/include/displaydevice/windows/win_api_utils.h b/src/windows/include/display_device/windows/win_api_utils.h similarity index 100% rename from src/windows/include/displaydevice/windows/win_api_utils.h rename to src/windows/include/display_device/windows/win_api_utils.h diff --git a/src/windows/include/displaydevice/windows/win_display_device.h b/src/windows/include/display_device/windows/win_display_device.h similarity index 100% rename from src/windows/include/displaydevice/windows/win_display_device.h rename to src/windows/include/display_device/windows/win_display_device.h diff --git a/src/windows/include/displaydevice/windows/win_display_device_interface.h b/src/windows/include/display_device/windows/win_display_device_interface.h similarity index 99% rename from src/windows/include/displaydevice/windows/win_display_device_interface.h rename to src/windows/include/display_device/windows/win_display_device_interface.h index 8b06dc1b..e61caf20 100644 --- a/src/windows/include/displaydevice/windows/win_display_device_interface.h +++ b/src/windows/include/display_device/windows/win_display_device_interface.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/windows/types.h" +#include "display_device/windows/types.h" namespace display_device { /** diff --git a/src/windows/json.cpp b/src/windows/json.cpp index c230bf46..602d7d10 100644 --- a/src/windows/json.cpp +++ b/src/windows/json.cpp @@ -1,11 +1,11 @@ // header include -#include "displaydevice/windows/json.h" +#include "display_device/windows/json.h" // special ordered include of details #define DD_JSON_DETAIL // clang-format off -#include "displaydevice/windows/detail/json_serializer.h" -#include "displaydevice/detail/json_converter.h" +#include "display_device/windows/detail/json_serializer.h" +#include "display_device/detail/json_converter.h" // clang-format on namespace display_device { diff --git a/src/windows/json_serializer.cpp b/src/windows/json_serializer.cpp index 180b948c..5146ffc3 100644 --- a/src/windows/json_serializer.cpp +++ b/src/windows/json_serializer.cpp @@ -1,8 +1,8 @@ // special ordered include of details #define DD_JSON_DETAIL // clang-format off -#include "displaydevice/windows/types.h" -#include "displaydevice/windows/detail/json_serializer.h" +#include "display_device/windows/types.h" +#include "display_device/windows/detail/json_serializer.h" // clang-format on namespace display_device { diff --git a/src/windows/persistent_state.cpp b/src/windows/persistent_state.cpp index 28ed2679..02e8f696 100644 --- a/src/windows/persistent_state.cpp +++ b/src/windows/persistent_state.cpp @@ -1,10 +1,10 @@ // class header include -#include "displaydevice/windows/persistent_state.h" +#include "display_device/windows/persistent_state.h" // local includes -#include "displaydevice/logging.h" -#include "displaydevice/noop_settings_persistence.h" -#include "displaydevice/windows/json.h" +#include "display_device/logging.h" +#include "display_device/noop_settings_persistence.h" +#include "display_device/windows/json.h" namespace display_device { PersistentState::PersistentState(std::shared_ptr settings_persistence_api, const std::optional &fallback_state): diff --git a/src/windows/settings_manager_apply.cpp b/src/windows/settings_manager_apply.cpp index 9f897dad..30b5a418 100644 --- a/src/windows/settings_manager_apply.cpp +++ b/src/windows/settings_manager_apply.cpp @@ -1,14 +1,14 @@ // class header include -#include "displaydevice/windows/settings_manager.h" +#include "display_device/windows/settings_manager.h" // system includes #include #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/json.h" -#include "displaydevice/windows/settings_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/json.h" +#include "display_device/windows/settings_utils.h" namespace display_device { namespace { diff --git a/src/windows/settings_manager_general.cpp b/src/windows/settings_manager_general.cpp index e6e87983..800d9720 100644 --- a/src/windows/settings_manager_general.cpp +++ b/src/windows/settings_manager_general.cpp @@ -1,9 +1,9 @@ // class header include -#include "displaydevice/windows/settings_manager.h" +#include "display_device/windows/settings_manager.h" // local includes -#include "displaydevice/logging.h" -#include "displaydevice/noop_audio_context.h" +#include "display_device/logging.h" +#include "display_device/noop_audio_context.h" namespace display_device { SettingsManager::SettingsManager( diff --git a/src/windows/settings_manager_revert.cpp b/src/windows/settings_manager_revert.cpp index 746dda61..61dce97c 100644 --- a/src/windows/settings_manager_revert.cpp +++ b/src/windows/settings_manager_revert.cpp @@ -1,13 +1,13 @@ // class header include -#include "displaydevice/windows/settings_manager.h" +#include "display_device/windows/settings_manager.h" // system includes #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/json.h" -#include "displaydevice/windows/settings_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/json.h" +#include "display_device/windows/settings_utils.h" namespace display_device { namespace { diff --git a/src/windows/settings_utils.cpp b/src/windows/settings_utils.cpp index cd86dd8b..287656e6 100644 --- a/src/windows/settings_utils.cpp +++ b/src/windows/settings_utils.cpp @@ -1,5 +1,5 @@ // header include -#include "displaydevice/windows/settings_utils.h" +#include "display_device/windows/settings_utils.h" // system includes #include @@ -7,8 +7,8 @@ #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/json.h" +#include "display_device/logging.h" +#include "display_device/windows/json.h" namespace display_device::win_utils { namespace { diff --git a/src/windows/types.cpp b/src/windows/types.cpp index 7ed9808a..64b6dda7 100644 --- a/src/windows/types.cpp +++ b/src/windows/types.cpp @@ -1,5 +1,5 @@ // header include -#include "displaydevice/windows/types.h" +#include "display_device/windows/types.h" namespace display_device { bool diff --git a/src/windows/win_api_layer.cpp b/src/windows/win_api_layer.cpp index cdedbe39..51248669 100644 --- a/src/windows/win_api_layer.cpp +++ b/src/windows/win_api_layer.cpp @@ -1,5 +1,5 @@ // class header include -#include "displaydevice/windows/win_api_layer.h" +#include "display_device/windows/win_api_layer.h" // system includes #include @@ -12,7 +12,7 @@ #include // local includes -#include "displaydevice/logging.h" +#include "display_device/logging.h" // Windows includes after "windows.h" #include diff --git a/src/windows/win_api_utils.cpp b/src/windows/win_api_utils.cpp index 36af52c9..158e1480 100644 --- a/src/windows/win_api_utils.cpp +++ b/src/windows/win_api_utils.cpp @@ -1,11 +1,11 @@ // header include -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/windows/win_api_utils.h" // system includes #include // local includes -#include "displaydevice/logging.h" +#include "display_device/logging.h" namespace { /** diff --git a/src/windows/win_display_device_general.cpp b/src/windows/win_display_device_general.cpp index 40db35bc..db91c51e 100644 --- a/src/windows/win_display_device_general.cpp +++ b/src/windows/win_display_device_general.cpp @@ -1,9 +1,9 @@ // class header include -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/win_api_utils.h" namespace display_device { WinDisplayDevice::WinDisplayDevice(std::shared_ptr w_api): diff --git a/src/windows/win_display_device_hdr.cpp b/src/windows/win_display_device_hdr.cpp index 2f702ad2..ac97588b 100644 --- a/src/windows/win_display_device_hdr.cpp +++ b/src/windows/win_display_device_hdr.cpp @@ -1,12 +1,12 @@ // class header include -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" // system includes #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/win_api_utils.h" namespace display_device { namespace { diff --git a/src/windows/win_display_device_modes.cpp b/src/windows/win_display_device_modes.cpp index 01c2c5f3..8ec5fcbc 100644 --- a/src/windows/win_display_device_modes.cpp +++ b/src/windows/win_display_device_modes.cpp @@ -1,12 +1,12 @@ // class header include -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" // system includes #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/win_api_utils.h" namespace display_device { namespace { diff --git a/src/windows/win_display_device_primary.cpp b/src/windows/win_display_device_primary.cpp index c009cdbd..9a46d5f0 100644 --- a/src/windows/win_display_device_primary.cpp +++ b/src/windows/win_display_device_primary.cpp @@ -1,9 +1,9 @@ // class header include -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/win_api_utils.h" namespace display_device { bool diff --git a/src/windows/win_display_device_topology.cpp b/src/windows/win_display_device_topology.cpp index 767c7175..7c013639 100644 --- a/src/windows/win_display_device_topology.cpp +++ b/src/windows/win_display_device_topology.cpp @@ -1,13 +1,13 @@ // class header include -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" // system includes #include #include // local includes -#include "displaydevice/logging.h" -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/logging.h" +#include "display_device/windows/win_api_utils.h" namespace display_device { namespace { diff --git a/tests/fixtures/include/fixtures/fixtures.h b/tests/fixtures/include/fixtures/fixtures.h index 1f987bae..8992a9c7 100644 --- a/tests/fixtures/include/fixtures/fixtures.h +++ b/tests/fixtures/include/fixtures/fixtures.h @@ -9,7 +9,7 @@ #include // local includes -#include "displaydevice/logging.h" +#include "display_device/logging.h" #include "test_utils.h" // Undefine the original TEST macro diff --git a/tests/fixtures/include/fixtures/json_converter_test.h b/tests/fixtures/include/fixtures/json_converter_test.h index e528781e..683df883 100644 --- a/tests/fixtures/include/fixtures/json_converter_test.h +++ b/tests/fixtures/include/fixtures/json_converter_test.h @@ -1,7 +1,7 @@ #pragma once // local includes -#include "displaydevice/json.h" +#include "display_device/json.h" #include "fixtures.h" class JsonConverterTest: public BaseTest { diff --git a/tests/fixtures/include/fixtures/mock_audio_context.h b/tests/fixtures/include/fixtures/mock_audio_context.h index 018cf40b..2aaa5bfc 100644 --- a/tests/fixtures/include/fixtures/mock_audio_context.h +++ b/tests/fixtures/include/fixtures/mock_audio_context.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/audio_context_interface.h" +#include "display_device/audio_context_interface.h" namespace display_device { class MockAudioContext: public AudioContextInterface { diff --git a/tests/fixtures/include/fixtures/mock_settings_persistence.h b/tests/fixtures/include/fixtures/mock_settings_persistence.h index 5f583477..9efb97b5 100644 --- a/tests/fixtures/include/fixtures/mock_settings_persistence.h +++ b/tests/fixtures/include/fixtures/mock_settings_persistence.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/settings_persistence_interface.h" +#include "display_device/settings_persistence_interface.h" namespace display_device { class MockSettingsPersistence: public SettingsPersistenceInterface { diff --git a/tests/unit/general/test_comparison.cpp b/tests/unit/general/test_comparison.cpp index 62d6ea78..68fcce4a 100644 --- a/tests/unit/general/test_comparison.cpp +++ b/tests/unit/general/test_comparison.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/types.h" +#include "display_device/types.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/general/test_file_settings_persistence.cpp b/tests/unit/general/test_file_settings_persistence.cpp index c7d2ec12..cb9589e7 100644 --- a/tests/unit/general/test_file_settings_persistence.cpp +++ b/tests/unit/general/test_file_settings_persistence.cpp @@ -3,7 +3,7 @@ #include // local includes -#include "displaydevice/file_settings_persistence.h" +#include "display_device/file_settings_persistence.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/general/test_json.cpp b/tests/unit/general/test_json.cpp index 0ed837ef..bc276685 100644 --- a/tests/unit/general/test_json.cpp +++ b/tests/unit/general/test_json.cpp @@ -1,9 +1,9 @@ // special ordered include of details #define DD_JSON_DETAIL // clang-format off -#include "displaydevice/json.h" -#include "displaydevice/detail/json_serializer.h" -#include "displaydevice/detail/json_converter.h" +#include "display_device/json.h" +#include "display_device/detail/json_serializer.h" +#include "display_device/detail/json_converter.h" // clang-format on // local includes diff --git a/tests/unit/general/test_logging.cpp b/tests/unit/general/test_logging.cpp index 2ffb2837..9da596fb 100644 --- a/tests/unit/general/test_logging.cpp +++ b/tests/unit/general/test_logging.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/logging.h" +#include "display_device/logging.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/general/test_noop_audio_context.cpp b/tests/unit/general/test_noop_audio_context.cpp index 28421f4c..cebf79ee 100644 --- a/tests/unit/general/test_noop_audio_context.cpp +++ b/tests/unit/general/test_noop_audio_context.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/noop_audio_context.h" +#include "display_device/noop_audio_context.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/general/test_noop_settings_persistence.cpp b/tests/unit/general/test_noop_settings_persistence.cpp index bb95b4b3..a33ba765 100644 --- a/tests/unit/general/test_noop_settings_persistence.cpp +++ b/tests/unit/general/test_noop_settings_persistence.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/noop_settings_persistence.h" +#include "display_device/noop_settings_persistence.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/general/test_retry_scheduler.cpp b/tests/unit/general/test_retry_scheduler.cpp index 3109f4a0..5f5fea00 100644 --- a/tests/unit/general/test_retry_scheduler.cpp +++ b/tests/unit/general/test_retry_scheduler.cpp @@ -2,7 +2,7 @@ #include // local includes -#include "displaydevice/retry_scheduler.h" +#include "display_device/retry_scheduler.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/windows/test_comparison.cpp b/tests/unit/windows/test_comparison.cpp index 0cdea8f2..8e384e30 100644 --- a/tests/unit/windows/test_comparison.cpp +++ b/tests/unit/windows/test_comparison.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/windows/types.h" +#include "display_device/windows/types.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/windows/test_json_converter.cpp b/tests/unit/windows/test_json_converter.cpp index a42a0b06..e5bf2808 100644 --- a/tests/unit/windows/test_json_converter.cpp +++ b/tests/unit/windows/test_json_converter.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/windows/json.h" +#include "display_device/windows/json.h" #include "fixtures/json_converter_test.h" #include "utils/comparison.h" diff --git a/tests/unit/windows/test_persistent_state.cpp b/tests/unit/windows/test_persistent_state.cpp index 81a90305..9e31ce99 100644 --- a/tests/unit/windows/test_persistent_state.cpp +++ b/tests/unit/windows/test_persistent_state.cpp @@ -1,6 +1,6 @@ // local includes -#include "displaydevice/noop_settings_persistence.h" -#include "displaydevice/windows/settings_manager.h" +#include "display_device/noop_settings_persistence.h" +#include "display_device/windows/settings_manager.h" #include "fixtures/fixtures.h" #include "fixtures/mock_settings_persistence.h" #include "utils/comparison.h" diff --git a/tests/unit/windows/test_settings_manager_apply.cpp b/tests/unit/windows/test_settings_manager_apply.cpp index 89c5b6fc..5caf34fe 100644 --- a/tests/unit/windows/test_settings_manager_apply.cpp +++ b/tests/unit/windows/test_settings_manager_apply.cpp @@ -1,6 +1,6 @@ // local includes -#include "displaydevice/windows/settings_manager.h" -#include "displaydevice/windows/settings_utils.h" +#include "display_device/windows/settings_manager.h" +#include "display_device/windows/settings_utils.h" #include "fixtures/fixtures.h" #include "fixtures/mock_audio_context.h" #include "fixtures/mock_settings_persistence.h" diff --git a/tests/unit/windows/test_settings_manager_general.cpp b/tests/unit/windows/test_settings_manager_general.cpp index 1a782e51..79ed5ad9 100644 --- a/tests/unit/windows/test_settings_manager_general.cpp +++ b/tests/unit/windows/test_settings_manager_general.cpp @@ -1,7 +1,7 @@ // local includes -#include "displaydevice/noop_audio_context.h" -#include "displaydevice/noop_settings_persistence.h" -#include "displaydevice/windows/settings_manager.h" +#include "display_device/noop_audio_context.h" +#include "display_device/noop_settings_persistence.h" +#include "display_device/windows/settings_manager.h" #include "fixtures/fixtures.h" #include "fixtures/mock_audio_context.h" #include "fixtures/mock_settings_persistence.h" diff --git a/tests/unit/windows/test_settings_manager_revert.cpp b/tests/unit/windows/test_settings_manager_revert.cpp index a6697f3e..37e77131 100644 --- a/tests/unit/windows/test_settings_manager_revert.cpp +++ b/tests/unit/windows/test_settings_manager_revert.cpp @@ -1,6 +1,6 @@ // local includes -#include "displaydevice/windows/settings_manager.h" -#include "displaydevice/windows/settings_utils.h" +#include "display_device/windows/settings_manager.h" +#include "display_device/windows/settings_utils.h" #include "fixtures/fixtures.h" #include "fixtures/mock_audio_context.h" #include "fixtures/mock_settings_persistence.h" diff --git a/tests/unit/windows/test_settings_utils.cpp b/tests/unit/windows/test_settings_utils.cpp index d33dbe90..06464c36 100644 --- a/tests/unit/windows/test_settings_utils.cpp +++ b/tests/unit/windows/test_settings_utils.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/windows/settings_utils.h" +#include "display_device/windows/settings_utils.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/mock_win_display_device.h" diff --git a/tests/unit/windows/test_win_api_layer.cpp b/tests/unit/windows/test_win_api_layer.cpp index 4a720902..3a2537e8 100644 --- a/tests/unit/windows/test_win_api_layer.cpp +++ b/tests/unit/windows/test_win_api_layer.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/windows/win_api_layer.h" +#include "display_device/windows/win_api_layer.h" #include "fixtures/fixtures.h" namespace { diff --git a/tests/unit/windows/test_win_api_utils.cpp b/tests/unit/windows/test_win_api_utils.cpp index 3f22d64b..efa690c6 100644 --- a/tests/unit/windows/test_win_api_utils.cpp +++ b/tests/unit/windows/test_win_api_utils.cpp @@ -1,5 +1,5 @@ // local includes -#include "displaydevice/windows/win_api_utils.h" +#include "display_device/windows/win_api_utils.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/mock_win_api_layer.h" diff --git a/tests/unit/windows/test_win_display_device_general.cpp b/tests/unit/windows/test_win_display_device_general.cpp index c0cf46bd..45f94c50 100644 --- a/tests/unit/windows/test_win_display_device_general.cpp +++ b/tests/unit/windows/test_win_display_device_general.cpp @@ -1,8 +1,8 @@ // local includes -#include "displaydevice/windows/settings_utils.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_api_utils.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/settings_utils.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_api_utils.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/helpers.h" diff --git a/tests/unit/windows/test_win_display_device_hdr.cpp b/tests/unit/windows/test_win_display_device_hdr.cpp index a84feaac..f8dabece 100644 --- a/tests/unit/windows/test_win_display_device_hdr.cpp +++ b/tests/unit/windows/test_win_display_device_hdr.cpp @@ -1,7 +1,7 @@ // local includes -#include "displaydevice/windows/settings_utils.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/settings_utils.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/guards.h" diff --git a/tests/unit/windows/test_win_display_device_modes.cpp b/tests/unit/windows/test_win_display_device_modes.cpp index b91dd749..db359528 100644 --- a/tests/unit/windows/test_win_display_device_modes.cpp +++ b/tests/unit/windows/test_win_display_device_modes.cpp @@ -2,10 +2,10 @@ #include // local includes -#include "displaydevice/windows/settings_utils.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_api_utils.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/settings_utils.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_api_utils.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/guards.h" diff --git a/tests/unit/windows/test_win_display_device_primary.cpp b/tests/unit/windows/test_win_display_device_primary.cpp index 3033654e..9fb16595 100644 --- a/tests/unit/windows/test_win_display_device_primary.cpp +++ b/tests/unit/windows/test_win_display_device_primary.cpp @@ -1,8 +1,8 @@ // local includes -#include "displaydevice/windows/settings_utils.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_api_utils.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/settings_utils.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_api_utils.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/guards.h" diff --git a/tests/unit/windows/test_win_display_device_topology.cpp b/tests/unit/windows/test_win_display_device_topology.cpp index 077a3d45..b756fae8 100644 --- a/tests/unit/windows/test_win_display_device_topology.cpp +++ b/tests/unit/windows/test_win_display_device_topology.cpp @@ -1,8 +1,8 @@ // local includes -#include "displaydevice/windows/settings_utils.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_api_utils.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/settings_utils.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_api_utils.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/comparison.h" #include "utils/guards.h" diff --git a/tests/unit/windows/test_win_playground.cpp b/tests/unit/windows/test_win_playground.cpp index 76cb01b4..7fa1b0cc 100644 --- a/tests/unit/windows/test_win_playground.cpp +++ b/tests/unit/windows/test_win_playground.cpp @@ -1,8 +1,8 @@ // local includes -#include "displaydevice/windows/json.h" -#include "displaydevice/windows/settings_manager.h" -#include "displaydevice/windows/win_api_layer.h" -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/json.h" +#include "display_device/windows/settings_manager.h" +#include "display_device/windows/win_api_layer.h" +#include "display_device/windows/win_display_device.h" #include "fixtures/fixtures.h" #include "utils/guards.h" diff --git a/tests/unit/windows/utils/comparison.h b/tests/unit/windows/utils/comparison.h index fd8c9a8c..4119bb92 100644 --- a/tests/unit/windows/utils/comparison.h +++ b/tests/unit/windows/utils/comparison.h @@ -1,7 +1,7 @@ #pragma once // local includes -#include "displaydevice/windows/types.h" +#include "display_device/windows/types.h" // Helper comparison operators bool diff --git a/tests/unit/windows/utils/guards.cpp b/tests/unit/windows/utils/guards.cpp index c96e3063..da48c3a5 100644 --- a/tests/unit/windows/utils/guards.cpp +++ b/tests/unit/windows/utils/guards.cpp @@ -2,7 +2,7 @@ #include "guards.h" // local includes -#include "displaydevice/windows/settings_utils.h" +#include "display_device/windows/settings_utils.h" boost::scope::scope_exit makeTopologyGuard(display_device::WinDisplayDeviceInterface &win_dd) { diff --git a/tests/unit/windows/utils/guards.h b/tests/unit/windows/utils/guards.h index 4e93fb43..3be687cc 100644 --- a/tests/unit/windows/utils/guards.h +++ b/tests/unit/windows/utils/guards.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/windows/win_display_device_interface.h" +#include "display_device/windows/win_display_device_interface.h" #include "helpers.h" // Helper functions to make guards for restoring previous state diff --git a/tests/unit/windows/utils/helpers.cpp b/tests/unit/windows/utils/helpers.cpp index d27692a9..3d8d7185 100644 --- a/tests/unit/windows/utils/helpers.cpp +++ b/tests/unit/windows/utils/helpers.cpp @@ -1,6 +1,6 @@ // local includes #include "helpers.h" -#include "displaydevice/windows/json.h" +#include "display_device/windows/json.h" std::optional> getAvailableDevices(display_device::WinApiLayer &layer, const bool only_valid_output) { diff --git a/tests/unit/windows/utils/helpers.h b/tests/unit/windows/utils/helpers.h index 3f3c84fb..67d59548 100644 --- a/tests/unit/windows/utils/helpers.h +++ b/tests/unit/windows/utils/helpers.h @@ -4,8 +4,8 @@ #include // local includes -#include "displaydevice/windows/types.h" -#include "displaydevice/windows/win_api_layer.h" +#include "display_device/windows/types.h" +#include "display_device/windows/win_api_layer.h" // Generic helper functions std::optional> diff --git a/tests/unit/windows/utils/mock_win_api_layer.h b/tests/unit/windows/utils/mock_win_api_layer.h index 6bfe72ce..3dd7dfb1 100644 --- a/tests/unit/windows/utils/mock_win_api_layer.h +++ b/tests/unit/windows/utils/mock_win_api_layer.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/windows/win_api_layer_interface.h" +#include "display_device/windows/win_api_layer_interface.h" namespace display_device { class MockWinApiLayer: public WinApiLayerInterface { diff --git a/tests/unit/windows/utils/mock_win_display_device.h b/tests/unit/windows/utils/mock_win_display_device.h index c159b7f5..0fc92fa2 100644 --- a/tests/unit/windows/utils/mock_win_display_device.h +++ b/tests/unit/windows/utils/mock_win_display_device.h @@ -4,7 +4,7 @@ #include // local includes -#include "displaydevice/windows/win_display_device.h" +#include "display_device/windows/win_display_device.h" namespace display_device { class MockWinDisplayDevice: public WinDisplayDeviceInterface {