From 8ca5e76afb08b64a9a8d04feb6b3f5922a63cd94 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 28 Jan 2024 14:45:58 +0100 Subject: [PATCH] Move variable files to to variables folder --- CMakeLists.txt | 27 ++++++++++--------- cmake/AdvSSHelpers.cmake | 2 +- .../variable-line-edit.cpp | 0 .../variable-line-edit.hpp | 0 lib/{utils => variables}/variable-number.hpp | 0 lib/{utils => variables}/variable-number.tpp | 0 lib/{utils => variables}/variable-spinbox.cpp | 0 lib/{utils => variables}/variable-spinbox.hpp | 0 lib/{utils => variables}/variable-string.cpp | 0 lib/{utils => variables}/variable-string.hpp | 0 .../variable-text-edit.cpp | 0 .../variable-text-edit.hpp | 0 lib/{utils => variables}/variable.cpp | 0 lib/{utils => variables}/variable.hpp | 0 14 files changed, 15 insertions(+), 14 deletions(-) rename lib/{utils => variables}/variable-line-edit.cpp (100%) rename lib/{utils => variables}/variable-line-edit.hpp (100%) rename lib/{utils => variables}/variable-number.hpp (100%) rename lib/{utils => variables}/variable-number.tpp (100%) rename lib/{utils => variables}/variable-spinbox.cpp (100%) rename lib/{utils => variables}/variable-spinbox.hpp (100%) rename lib/{utils => variables}/variable-string.cpp (100%) rename lib/{utils => variables}/variable-string.hpp (100%) rename lib/{utils => variables}/variable-text-edit.cpp (100%) rename lib/{utils => variables}/variable-text-edit.hpp (100%) rename lib/{utils => variables}/variable.cpp (100%) rename lib/{utils => variables}/variable.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a87510a2..99fe5203 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,20 +212,20 @@ target_sources( lib/utils/ui-helpers.hpp lib/utils/utility.cpp lib/utils/utility.hpp - lib/utils/variable-line-edit.cpp - lib/utils/variable-line-edit.hpp - lib/utils/variable-number.hpp - lib/utils/variable-number.tpp - lib/utils/variable-spinbox.cpp - lib/utils/variable-spinbox.hpp - lib/utils/variable-string.cpp - lib/utils/variable-string.hpp - lib/utils/variable-text-edit.cpp - lib/utils/variable-text-edit.hpp - lib/utils/variable.cpp - lib/utils/variable.hpp lib/utils/volume-control.cpp - lib/utils/volume-control.hpp) + lib/utils/volume-control.hpp + lib/variables/variable-line-edit.cpp + lib/variables/variable-line-edit.hpp + lib/variables/variable-number.hpp + lib/variables/variable-number.tpp + lib/variables/variable-spinbox.cpp + lib/variables/variable-spinbox.hpp + lib/variables/variable-string.cpp + lib/variables/variable-string.hpp + lib/variables/variable-text-edit.cpp + lib/variables/variable-text-edit.hpp + lib/variables/variable.cpp + lib/variables/variable.hpp) # --- End of section --- @@ -249,6 +249,7 @@ target_include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/lib/legacy" "${CMAKE_CURRENT_SOURCE_DIR}/lib/macro" "${CMAKE_CURRENT_SOURCE_DIR}/lib/utils" + "${CMAKE_CURRENT_SOURCE_DIR}/lib/variables" "${CMAKE_CURRENT_BINARY_DIR}/forms") set_target_properties( diff --git a/cmake/AdvSSHelpers.cmake b/cmake/AdvSSHelpers.cmake index e6a73508..1b12043b 100644 --- a/cmake/AdvSSHelpers.cmake +++ b/cmake/AdvSSHelpers.cmake @@ -295,7 +295,7 @@ function(setup_advss_plugin target) ${target} PRIVATE "${ADVSS_SOURCE_DIR}/lib" "${ADVSS_SOURCE_DIR}/lib/legacy" "${ADVSS_SOURCE_DIR}/lib/macro" "${ADVSS_SOURCE_DIR}/lib/utils" - "${ADVSS_SOURCE_DIR}/forms") + "${ADVSS_SOURCE_DIR}/lib/variables" "${ADVSS_SOURCE_DIR}/forms") endfunction() function(install_advss_plugin_dependency) diff --git a/lib/utils/variable-line-edit.cpp b/lib/variables/variable-line-edit.cpp similarity index 100% rename from lib/utils/variable-line-edit.cpp rename to lib/variables/variable-line-edit.cpp diff --git a/lib/utils/variable-line-edit.hpp b/lib/variables/variable-line-edit.hpp similarity index 100% rename from lib/utils/variable-line-edit.hpp rename to lib/variables/variable-line-edit.hpp diff --git a/lib/utils/variable-number.hpp b/lib/variables/variable-number.hpp similarity index 100% rename from lib/utils/variable-number.hpp rename to lib/variables/variable-number.hpp diff --git a/lib/utils/variable-number.tpp b/lib/variables/variable-number.tpp similarity index 100% rename from lib/utils/variable-number.tpp rename to lib/variables/variable-number.tpp diff --git a/lib/utils/variable-spinbox.cpp b/lib/variables/variable-spinbox.cpp similarity index 100% rename from lib/utils/variable-spinbox.cpp rename to lib/variables/variable-spinbox.cpp diff --git a/lib/utils/variable-spinbox.hpp b/lib/variables/variable-spinbox.hpp similarity index 100% rename from lib/utils/variable-spinbox.hpp rename to lib/variables/variable-spinbox.hpp diff --git a/lib/utils/variable-string.cpp b/lib/variables/variable-string.cpp similarity index 100% rename from lib/utils/variable-string.cpp rename to lib/variables/variable-string.cpp diff --git a/lib/utils/variable-string.hpp b/lib/variables/variable-string.hpp similarity index 100% rename from lib/utils/variable-string.hpp rename to lib/variables/variable-string.hpp diff --git a/lib/utils/variable-text-edit.cpp b/lib/variables/variable-text-edit.cpp similarity index 100% rename from lib/utils/variable-text-edit.cpp rename to lib/variables/variable-text-edit.cpp diff --git a/lib/utils/variable-text-edit.hpp b/lib/variables/variable-text-edit.hpp similarity index 100% rename from lib/utils/variable-text-edit.hpp rename to lib/variables/variable-text-edit.hpp diff --git a/lib/utils/variable.cpp b/lib/variables/variable.cpp similarity index 100% rename from lib/utils/variable.cpp rename to lib/variables/variable.cpp diff --git a/lib/utils/variable.hpp b/lib/variables/variable.hpp similarity index 100% rename from lib/utils/variable.hpp rename to lib/variables/variable.hpp