From 14d78100c13c55ab2bbc234581e5cdf0d989dfe2 Mon Sep 17 00:00:00 2001 From: c3r1c3 Date: Thu, 27 Dec 2018 01:34:15 -0600 Subject: [PATCH] Most files: Move files into subdirectories Almost all the files have been moved into folders and subfolders to keep everything organized and clean. --- .../advanced-scene-switcher-module.c | 0 .../advanced-scene-switcher.cpp | 6 +++--- executable-switch.cpp => src/executable-switch.cpp | 2 +- file-switch.cpp => src/file-switch.cpp | 2 +- general.cpp => src/general.cpp | 2 +- .../headers/advanced-scene-switcher.hpp | 2 +- .../headers/switcher-data-structs.hpp | 0 utility.hpp => src/headers/utility.hpp | 0 hotkey.cpp => src/hotkey.cpp | 2 +- idle-switch.cpp => src/idle-switch.cpp | 2 +- .../linux/advanced-scene-switcher-nix.cpp | 0 .../osx/advanced-scene-switcher-osx.mm | 0 pause-switch.cpp => src/pause-switch.cpp | 2 +- priority.cpp => src/priority.cpp | 2 +- random.cpp => src/random.cpp | 2 +- scene-round-trip.cpp => src/scene-round-trip.cpp | 2 +- scene-transitions.cpp => src/scene-transitions.cpp | 2 +- screen-region-switch.cpp => src/screen-region-switch.cpp | 2 +- .../win/advanced-scene-switcher-win.cpp | 0 window-title-switch.cpp => src/window-title-switch.cpp | 2 +- 20 files changed, 16 insertions(+), 16 deletions(-) rename advanced-scene-switcher-module.c => src/advanced-scene-switcher-module.c (100%) rename advanced-scene-switcher.cpp => src/advanced-scene-switcher.cpp (99%) rename executable-switch.cpp => src/executable-switch.cpp (98%) rename file-switch.cpp => src/file-switch.cpp (99%) rename general.cpp => src/general.cpp (97%) rename advanced-scene-switcher.hpp => src/headers/advanced-scene-switcher.hpp (99%) rename switcher-data-structs.hpp => src/headers/switcher-data-structs.hpp (100%) rename utility.hpp => src/headers/utility.hpp (100%) rename hotkey.cpp => src/hotkey.cpp (97%) rename idle-switch.cpp => src/idle-switch.cpp (98%) rename advanced-scene-switcher-nix.cpp => src/linux/advanced-scene-switcher-nix.cpp (100%) rename advanced-scene-switcher-osx.mm => src/osx/advanced-scene-switcher-osx.mm (100%) rename pause-switch.cpp => src/pause-switch.cpp (99%) rename priority.cpp => src/priority.cpp (96%) rename random.cpp => src/random.cpp (98%) rename scene-round-trip.cpp => src/scene-round-trip.cpp (99%) rename scene-transitions.cpp => src/scene-transitions.cpp (99%) rename screen-region-switch.cpp => src/screen-region-switch.cpp (98%) rename advanced-scene-switcher-win.cpp => src/win/advanced-scene-switcher-win.cpp (100%) rename window-title-switch.cpp => src/window-title-switch.cpp (99%) diff --git a/advanced-scene-switcher-module.c b/src/advanced-scene-switcher-module.c similarity index 100% rename from advanced-scene-switcher-module.c rename to src/advanced-scene-switcher-module.c diff --git a/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp similarity index 99% rename from advanced-scene-switcher.cpp rename to src/advanced-scene-switcher.cpp index 8bc520e2..5bb7c5c8 100644 --- a/advanced-scene-switcher.cpp +++ b/src/advanced-scene-switcher.cpp @@ -20,9 +20,9 @@ #include #include -#include "switcher-data-structs.hpp" -#include "utility.hpp" -#include "advanced-scene-switcher.hpp" +#include "headers/switcher-data-structs.hpp" +#include "headers/utility.hpp" +#include "headers/advanced-scene-switcher.hpp" SwitcherData* switcher = nullptr; diff --git a/executable-switch.cpp b/src/executable-switch.cpp similarity index 98% rename from executable-switch.cpp rename to src/executable-switch.cpp index efe5f292..009a41d4 100644 --- a/executable-switch.cpp +++ b/src/executable-switch.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" int SceneSwitcher::executableFindByData(const QString& exe) { diff --git a/file-switch.cpp b/src/file-switch.cpp similarity index 99% rename from file-switch.cpp rename to src/file-switch.cpp index a315d380..909452ca 100644 --- a/file-switch.cpp +++ b/src/file-switch.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" diff --git a/general.cpp b/src/general.cpp similarity index 97% rename from general.cpp rename to src/general.cpp index 73aa2f17..3fe65e72 100644 --- a/general.cpp +++ b/src/general.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" #include void SceneSwitcher::on_close_clicked() diff --git a/advanced-scene-switcher.hpp b/src/headers/advanced-scene-switcher.hpp similarity index 99% rename from advanced-scene-switcher.hpp rename to src/headers/advanced-scene-switcher.hpp index 185fd38d..c4784c56 100644 --- a/advanced-scene-switcher.hpp +++ b/src/headers/advanced-scene-switcher.hpp @@ -4,7 +4,7 @@ #include #include #include -#include "ui_advanced-scene-switcher.h" +#include "../forms/ui_advanced-scene-switcher.h" #include "switcher-data-structs.hpp" class QCloseEvent; diff --git a/switcher-data-structs.hpp b/src/headers/switcher-data-structs.hpp similarity index 100% rename from switcher-data-structs.hpp rename to src/headers/switcher-data-structs.hpp diff --git a/utility.hpp b/src/headers/utility.hpp similarity index 100% rename from utility.hpp rename to src/headers/utility.hpp diff --git a/hotkey.cpp b/src/hotkey.cpp similarity index 97% rename from hotkey.cpp rename to src/hotkey.cpp index dd998c26..03c47e36 100644 --- a/hotkey.cpp +++ b/src/hotkey.cpp @@ -1,5 +1,5 @@ #include -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void startStopHotkeyFunc(void* data, obs_hotkey_id id, obs_hotkey_t* hotkey, bool pressed) { diff --git a/idle-switch.cpp b/src/idle-switch.cpp similarity index 98% rename from idle-switch.cpp rename to src/idle-switch.cpp index 99a12918..371d2a23 100644 --- a/idle-switch.cpp +++ b/src/idle-switch.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SwitcherData::checkIdleSwitch(bool& match, OBSWeakSource& scene, OBSWeakSource& transition) { diff --git a/advanced-scene-switcher-nix.cpp b/src/linux/advanced-scene-switcher-nix.cpp similarity index 100% rename from advanced-scene-switcher-nix.cpp rename to src/linux/advanced-scene-switcher-nix.cpp diff --git a/advanced-scene-switcher-osx.mm b/src/osx/advanced-scene-switcher-osx.mm similarity index 100% rename from advanced-scene-switcher-osx.mm rename to src/osx/advanced-scene-switcher-osx.mm diff --git a/pause-switch.cpp b/src/pause-switch.cpp similarity index 99% rename from pause-switch.cpp rename to src/pause-switch.cpp index 719a15e9..f6b30c53 100644 --- a/pause-switch.cpp +++ b/src/pause-switch.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_pauseScenesAdd_clicked() { diff --git a/priority.cpp b/src/priority.cpp similarity index 96% rename from priority.cpp rename to src/priority.cpp index 791b3e06..a6734edb 100644 --- a/priority.cpp +++ b/src/priority.cpp @@ -1,5 +1,5 @@ #include -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_priorityUp_clicked() { diff --git a/random.cpp b/src/random.cpp similarity index 98% rename from random.cpp rename to src/random.cpp index d940ba6c..6da40df5 100644 --- a/random.cpp +++ b/src/random.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_randomScenesList_currentRowChanged(int idx) { diff --git a/scene-round-trip.cpp b/src/scene-round-trip.cpp similarity index 99% rename from scene-round-trip.cpp rename to src/scene-round-trip.cpp index 95c6ca05..aaae6f26 100644 --- a/scene-round-trip.cpp +++ b/src/scene-round-trip.cpp @@ -2,7 +2,7 @@ #include #include -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_sceneRoundTripAdd_clicked() { diff --git a/scene-transitions.cpp b/src/scene-transitions.cpp similarity index 99% rename from scene-transitions.cpp rename to src/scene-transitions.cpp index b9dd4016..578e473e 100644 --- a/scene-transitions.cpp +++ b/src/scene-transitions.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_transitionsAdd_clicked() { diff --git a/screen-region-switch.cpp b/src/screen-region-switch.cpp similarity index 98% rename from screen-region-switch.cpp rename to src/screen-region-switch.cpp index 45d17765..bd42ab85 100644 --- a/screen-region-switch.cpp +++ b/src/screen-region-switch.cpp @@ -1,4 +1,4 @@ -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SwitcherData::checkScreenRegionSwitch(bool& match, OBSWeakSource& scene, OBSWeakSource& transition) { diff --git a/advanced-scene-switcher-win.cpp b/src/win/advanced-scene-switcher-win.cpp similarity index 100% rename from advanced-scene-switcher-win.cpp rename to src/win/advanced-scene-switcher-win.cpp diff --git a/window-title-switch.cpp b/src/window-title-switch.cpp similarity index 99% rename from window-title-switch.cpp rename to src/window-title-switch.cpp index 9dd37746..ce24f448 100644 --- a/window-title-switch.cpp +++ b/src/window-title-switch.cpp @@ -1,5 +1,5 @@ #include -#include "advanced-scene-switcher.hpp" +#include "headers/advanced-scene-switcher.hpp" void SceneSwitcher::on_add_clicked() {