feat: Rename displaydevice directory to display_device (#64)

LizardByte · Jul 17, 2024 · 85694e6 · 85694e6
1 parent b693e47
commit 85694e6
Show file tree

Hide file tree

Showing 90 changed files with 136 additions and 136 deletions.
diff --git 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
@@ -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
@@ -1,13 +1,13 @@
 // class header include
-#include "displaydevice/file_settings_persistence.h"
+#include "display_device/file_settings_persistence.h"
 
 // system includes
 #include <algorithm>
 #include <fstream>
 #include <iterator>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 namespace display_device {
   FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):

diff --git a/...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h b/...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h
diff --git a/...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h b/...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h
diff --git a/...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h b/...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h
diff --git a/...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h b/...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h
diff --git a/...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h b/...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h
diff --git a/src/common/include/displaydevice/json.h → src/common/include/display_device/json.h b/src/common/include/displaydevice/json.h → src/common/include/display_device/json.h
diff --git a/src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h b/src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h
diff --git a/...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h b/...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h
diff --git a/...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h b/...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h
diff --git a/...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h b/...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h
diff --git a/...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h b/...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h
diff --git a/...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h b/...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h
diff --git a/src/common/include/displaydevice/types.h → src/common/include/display_device/types.h b/src/common/include/displaydevice/types.h → src/common/include/display_device/types.h
diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 // system includes
 #include <chrono>

diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/retry_scheduler.h"
+#include "display_device/retry_scheduler.h"
 
 namespace display_device {
   SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):

diff --git 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 → src/display_device/CMakeLists.txt b/src/displaydevice/CMakeLists.txt → 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/.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h b/.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h
diff --git a/src/display_device/libddplaceholder.cpp 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
diff --git 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/...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h b/...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h
diff --git 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
@@ -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/...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h b/...aydevice/windows/detail/json_serializer.h → ...y_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/...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h b/...dows/include/displaydevice/windows/json.h → ...ows/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/.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h b/.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h
@@ -4,8 +4,8 @@
 #include <memory>
 
 // 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/.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h b/.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h
@@ -5,9 +5,9 @@
 #include <memory>
 
 // 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/...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h b/...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h
diff --git a/...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h b/...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h
@@ -9,7 +9,7 @@
 #include <set>
 
 // local includes
-#include "displaydevice/types.h"
+#include "display_device/types.h"
 
 namespace display_device {
   /**

diff --git a/...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h b/...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h
diff --git a/...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h b/...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h
diff --git a/...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h b/...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h
diff --git a/...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h b/...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h
diff --git a/...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h b/...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h
@@ -4,7 +4,7 @@
 #include <set>
 
 // 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
@@ -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
@@ -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
@@ -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<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):

diff --git 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 <algorithm>
 #include <boost/scope/scope_exit.hpp>
 
 // 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
@@ -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
@@ -1,13 +1,13 @@
 // class header include
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/windows/settings_manager.h"
 
 // system includes
 #include <boost/scope/scope_exit.hpp>
 
 // 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
@@ -1,14 +1,14 @@
 // header include
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/windows/settings_utils.h"
 
 // system includes
 #include <algorithm>
 #include <cmath>
 #include <thread>
 
 // 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
@@ -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
@@ -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 <boost/algorithm/string.hpp>
@@ -12,7 +12,7 @@
 #include <iomanip>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 // Windows includes after "windows.h"
 #include <SetupApi.h>

diff --git 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 <unordered_set>
 
 // 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
@@ -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<WinApiLayerInterface> w_api):

diff --git 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 <ranges>
 
 // 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
@@ -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 <ranges>
 
 // 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 {