From e4d064aaa3d4c149487180d0e0d62dd9ecce3d92 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 29 Apr 2023 19:17:07 +0200 Subject: [PATCH] Rename file --- CMakeLists.txt | 5 ++--- src/advanced-scene-switcher.hpp | 2 +- src/macro-core/macro-tree.cpp | 2 +- src/macro-external/video/macro-condition-video.cpp | 2 +- src/{switcher-data-structs.cpp => switcher-data.cpp} | 2 +- src/{switcher-data-structs.hpp => switcher-data.hpp} | 0 src/utils/connection-manager.cpp | 2 +- src/utils/scene-switch-helpers.cpp | 2 +- src/utils/variable-string.cpp | 5 ++--- src/utils/variable-text-edit.cpp | 2 +- src/utils/variable.cpp | 3 +-- 11 files changed, 12 insertions(+), 15 deletions(-) rename src/{switcher-data-structs.cpp => switcher-data.cpp} (99%) rename src/{switcher-data-structs.hpp => switcher-data.hpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb2dd3d7..0bd3af22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,12 +42,11 @@ target_sources( src/general.cpp src/hotkey.cpp src/hotkey.hpp - src/hotkey.hpp src/platform-funcs.hpp src/status-control.cpp src/status-control.hpp - src/switcher-data-structs.cpp - src/switcher-data-structs.hpp + src/switcher-data.cpp + src/switcher-data.hpp src/version.cpp src/version.h) diff --git a/src/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp index 01fad3c1..a1e0f68a 100644 --- a/src/advanced-scene-switcher.hpp +++ b/src/advanced-scene-switcher.hpp @@ -1,6 +1,6 @@ #pragma once #include "macro-segment-list.hpp" -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" #include diff --git a/src/macro-core/macro-tree.cpp b/src/macro-core/macro-tree.cpp index febbcd41..2e87e993 100644 --- a/src/macro-core/macro-tree.cpp +++ b/src/macro-core/macro-tree.cpp @@ -1,7 +1,7 @@ #include "macro-tree.hpp" #include "macro.hpp" #include "utility.hpp" -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" #include #include diff --git a/src/macro-external/video/macro-condition-video.cpp b/src/macro-external/video/macro-condition-video.cpp index f712e366..bf036bbd 100644 --- a/src/macro-external/video/macro-condition-video.cpp +++ b/src/macro-external/video/macro-condition-video.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/src/switcher-data-structs.cpp b/src/switcher-data.cpp similarity index 99% rename from src/switcher-data-structs.cpp rename to src/switcher-data.cpp index 318f091f..7fcdb8c4 100644 --- a/src/switcher-data-structs.cpp +++ b/src/switcher-data.cpp @@ -1,4 +1,4 @@ -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" #include "utility.hpp" namespace advss { diff --git a/src/switcher-data-structs.hpp b/src/switcher-data.hpp similarity index 100% rename from src/switcher-data-structs.hpp rename to src/switcher-data.hpp diff --git a/src/utils/connection-manager.cpp b/src/utils/connection-manager.cpp index 2dc81351..d1ba4c19 100644 --- a/src/utils/connection-manager.cpp +++ b/src/utils/connection-manager.cpp @@ -1,7 +1,7 @@ #include "connection-manager.hpp" #include "utility.hpp" #include "name-dialog.hpp" -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" #include #include diff --git a/src/utils/scene-switch-helpers.cpp b/src/utils/scene-switch-helpers.cpp index bac78592..34e09af0 100644 --- a/src/utils/scene-switch-helpers.cpp +++ b/src/utils/scene-switch-helpers.cpp @@ -1,5 +1,5 @@ #include "scene-switch-helpers.hpp" -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" #include "obs-frontend-api.h" #include "utility.hpp" diff --git a/src/utils/variable-string.cpp b/src/utils/variable-string.cpp index 5547e694..938bbdd8 100644 --- a/src/utils/variable-string.cpp +++ b/src/utils/variable-string.cpp @@ -1,7 +1,6 @@ #include "variable-string.hpp" - -#include -#include +#include "switcher-data.hpp" +#include "utility.hpp" namespace advss { diff --git a/src/utils/variable-text-edit.cpp b/src/utils/variable-text-edit.cpp index 1d2cce52..e0596a09 100644 --- a/src/utils/variable-text-edit.cpp +++ b/src/utils/variable-text-edit.cpp @@ -1,5 +1,5 @@ #include "variable-text-edit.hpp" -#include "switcher-data-structs.hpp" +#include "switcher-data.hpp" namespace advss { diff --git a/src/utils/variable.cpp b/src/utils/variable.cpp index f584d053..01968284 100644 --- a/src/utils/variable.cpp +++ b/src/utils/variable.cpp @@ -1,9 +1,8 @@ #include "variable.hpp" +#include "switcher-data.hpp" #include "math-helpers.hpp" #include "utility.hpp" -#include - namespace advss { // Keep track of the last time a variable was changed to save some work when