diff --git a/src/general.cpp b/src/general.cpp index b55381dc..6fa88c69 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -1,9 +1,8 @@ -#include #include -#include #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" QMetaObject::Connection inactivePluse; diff --git a/src/headers/switch-audio.hpp b/src/headers/switch-audio.hpp index 25562569..431fd266 100644 --- a/src/headers/switch-audio.hpp +++ b/src/headers/switch-audio.hpp @@ -1,9 +1,6 @@ #pragma once -#include #include -#include -#include "utility.hpp" #include "switch-generic.hpp" #include "volume-control.hpp" diff --git a/src/headers/switch-executable.hpp b/src/headers/switch-executable.hpp index 9126a9b2..644c05e4 100644 --- a/src/headers/switch-executable.hpp +++ b/src/headers/switch-executable.hpp @@ -1,9 +1,5 @@ #pragma once -#include #include -#include - -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto exe_func = 3; diff --git a/src/headers/switch-file.hpp b/src/headers/switch-file.hpp index b2ff7f0e..b042ae24 100644 --- a/src/headers/switch-file.hpp +++ b/src/headers/switch-file.hpp @@ -1,6 +1,4 @@ #pragma once -#include -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto read_file_func = 0; diff --git a/src/headers/switch-generic.hpp b/src/headers/switch-generic.hpp index c0f4e136..80d69dc4 100644 --- a/src/headers/switch-generic.hpp +++ b/src/headers/switch-generic.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include +#include struct SceneSwitcherEntry { OBSWeakSource scene = nullptr; diff --git a/src/headers/switch-idle.hpp b/src/headers/switch-idle.hpp index f7559ae6..38497035 100644 --- a/src/headers/switch-idle.hpp +++ b/src/headers/switch-idle.hpp @@ -1,6 +1,4 @@ #pragma once -#include -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto default_idle_time = 60; diff --git a/src/headers/switch-media.hpp b/src/headers/switch-media.hpp index 87f447cb..f14145cb 100644 --- a/src/headers/switch-media.hpp +++ b/src/headers/switch-media.hpp @@ -1,5 +1,4 @@ #pragma once -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto media_func = 6; diff --git a/src/headers/switch-random.hpp b/src/headers/switch-random.hpp index dc1bf826..9f9d64d6 100644 --- a/src/headers/switch-random.hpp +++ b/src/headers/switch-random.hpp @@ -1,5 +1,4 @@ #pragma once -#include "utility.hpp" #include "switch-generic.hpp" struct RandomSwitch : SceneSwitcherEntry { diff --git a/src/headers/switch-screen-region.hpp b/src/headers/switch-screen-region.hpp index 783eac2c..7ed5b3bf 100644 --- a/src/headers/switch-screen-region.hpp +++ b/src/headers/switch-screen-region.hpp @@ -1,5 +1,5 @@ #pragma once -#include "utility.hpp" +#include #include "switch-generic.hpp" constexpr auto screen_region_func = 4; diff --git a/src/headers/switch-sequence.hpp b/src/headers/switch-sequence.hpp index af336d2a..9c8aa1ef 100644 --- a/src/headers/switch-sequence.hpp +++ b/src/headers/switch-sequence.hpp @@ -1,5 +1,4 @@ #pragma once -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto round_trip_func = 1; diff --git a/src/headers/switch-time.hpp b/src/headers/switch-time.hpp index dcf6d057..ae8d4ae0 100644 --- a/src/headers/switch-time.hpp +++ b/src/headers/switch-time.hpp @@ -1,5 +1,4 @@ #pragma once -#include #include #include "switch-generic.hpp" diff --git a/src/headers/switch-transitions.hpp b/src/headers/switch-transitions.hpp index b4862bcf..97be9652 100644 --- a/src/headers/switch-transitions.hpp +++ b/src/headers/switch-transitions.hpp @@ -1,6 +1,4 @@ #pragma once -#include -#include "utility.hpp" #include "switch-generic.hpp" struct SceneTransition : SceneSwitcherEntry { diff --git a/src/headers/switch-window.hpp b/src/headers/switch-window.hpp index e0ebb89c..acde8de0 100644 --- a/src/headers/switch-window.hpp +++ b/src/headers/switch-window.hpp @@ -1,5 +1,4 @@ #pragma once -#include "utility.hpp" #include "switch-generic.hpp" constexpr auto window_title_func = 5; diff --git a/src/switch-audio.cpp b/src/switch-audio.cpp index 8b1d6419..537f5a85 100644 --- a/src/switch-audio.cpp +++ b/src/switch-audio.cpp @@ -1,11 +1,6 @@ -#include -#include - #include "headers/advanced-scene-switcher.hpp" #include "headers/volume-control.hpp" - -#include -#include +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-executable.cpp b/src/switch-executable.cpp index 355654bb..5aa15be8 100644 --- a/src/switch-executable.cpp +++ b/src/switch-executable.cpp @@ -1,4 +1,5 @@ #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-file.cpp b/src/switch-file.cpp index 20d23654..71375639 100644 --- a/src/switch-file.cpp +++ b/src/switch-file.cpp @@ -5,6 +5,7 @@ #include "headers/advanced-scene-switcher.hpp" #include "headers/curl-helper.hpp" +#include "headers/utility.hpp" #define LOCAL_FILE_IDX 0 #define REMOTE_FILE_IDX 1 diff --git a/src/switch-generic.cpp b/src/switch-generic.cpp index b90eb714..c9cce089 100644 --- a/src/switch-generic.cpp +++ b/src/switch-generic.cpp @@ -1,7 +1,5 @@ -#include -#include - #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" bool SceneSwitcherEntry::initialized() { diff --git a/src/switch-idle.cpp b/src/switch-idle.cpp index c3a4faec..844836d3 100644 --- a/src/switch-idle.cpp +++ b/src/switch-idle.cpp @@ -1,6 +1,7 @@ #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" void SwitcherData::checkIdleSwitch(bool &match, OBSWeakSource &scene, OBSWeakSource &transition) diff --git a/src/switch-media.cpp b/src/switch-media.cpp index ac4e7b88..4d76185b 100644 --- a/src/switch-media.cpp +++ b/src/switch-media.cpp @@ -1,4 +1,5 @@ #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-pause.cpp b/src/switch-pause.cpp index 31413e42..9d37aaa4 100644 --- a/src/switch-pause.cpp +++ b/src/switch-pause.cpp @@ -1,6 +1,7 @@ #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" void AdvSceneSwitcher::on_pauseScenesAdd_clicked() { diff --git a/src/switch-random.cpp b/src/switch-random.cpp index c905742c..5d9714b4 100644 --- a/src/switch-random.cpp +++ b/src/switch-random.cpp @@ -1,6 +1,7 @@ #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-screen-region.cpp b/src/switch-screen-region.cpp index 7e7b786f..06532bb2 100644 --- a/src/switch-screen-region.cpp +++ b/src/switch-screen-region.cpp @@ -1,6 +1,7 @@ #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-sequence.cpp b/src/switch-sequence.cpp index 16b9f92a..5004ede8 100644 --- a/src/switch-sequence.cpp +++ b/src/switch-sequence.cpp @@ -3,6 +3,7 @@ #include #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-time.cpp b/src/switch-time.cpp index 404d12d2..b4067722 100644 --- a/src/switch-time.cpp +++ b/src/switch-time.cpp @@ -1,4 +1,5 @@ #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse; diff --git a/src/switch-transitions.cpp b/src/switch-transitions.cpp index 608c97b1..8d362f51 100644 --- a/src/switch-transitions.cpp +++ b/src/switch-transitions.cpp @@ -1,4 +1,5 @@ #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" void AdvSceneSwitcher::on_transitionsAdd_clicked() { diff --git a/src/switch-window.cpp b/src/switch-window.cpp index 91ab014d..30225f66 100644 --- a/src/switch-window.cpp +++ b/src/switch-window.cpp @@ -1,4 +1,5 @@ #include "headers/advanced-scene-switcher.hpp" +#include "headers/utility.hpp" static QMetaObject::Connection addPulse;