diff --git a/UI/window-basic-settings-a11y.cpp b/frontend/settings/OBSBasicSettings_A11y.cpp similarity index 98% rename from UI/window-basic-settings-a11y.cpp rename to frontend/settings/OBSBasicSettings_A11y.cpp index d50cbfded..15bf42435 100644 --- a/UI/window-basic-settings-a11y.cpp +++ b/frontend/settings/OBSBasicSettings_A11y.cpp @@ -1,8 +1,7 @@ -#include "window-basic-settings.hpp" -#include "window-basic-main.hpp" -#include "obs-frontend-api.h" -#include "obs-app.hpp" -#include +#include "OBSBasicSettings.hpp" + +#include + #include enum ColorPreset { diff --git a/UI/window-basic-settings-appearance.cpp b/frontend/settings/OBSBasicSettings_Appearance.cpp similarity index 88% rename from UI/window-basic-settings-appearance.cpp rename to frontend/settings/OBSBasicSettings_Appearance.cpp index cdfbc92f5..80e3fc914 100644 --- a/UI/window-basic-settings-appearance.cpp +++ b/frontend/settings/OBSBasicSettings_Appearance.cpp @@ -1,21 +1,9 @@ -#include "window-basic-settings.hpp" -#include "window-basic-main.hpp" -#include "obs-frontend-api.h" -#include "qt-wrappers.hpp" -#include "platform.hpp" -#include "obs-app.hpp" +#include "OBSBasicSettings.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include -#include "util/profiler.hpp" - -using namespace std; +#include void OBSBasicSettings::InitAppearancePage() { diff --git a/UI/window-basic-settings-stream.cpp b/frontend/settings/OBSBasicSettings_Stream.cpp similarity index 99% rename from UI/window-basic-settings-stream.cpp rename to frontend/settings/OBSBasicSettings_Stream.cpp index 885c49f8a..eff5d7de3 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/frontend/settings/OBSBasicSettings_Stream.cpp @@ -1,25 +1,17 @@ -#include -#include -#include -#include - -#include "window-basic-settings.hpp" -#include "obs-frontend-api.h" -#include "obs-app.hpp" -#include "window-basic-main.hpp" -#include "url-push-button.hpp" - -#ifdef BROWSER_AVAILABLE -#include -#endif - -#include "auth-oauth.hpp" - -#include "ui-config.h" +#include "OBSBasicSettings.hpp" #ifdef YOUTUBE_ENABLED -#include "youtube-api-wrappers.hpp" +#include #endif +#include +#ifdef YOUTUBE_ENABLED +#include +#endif +#include + +#include + +#include static const QUuid &CustomServerUUID() { @@ -32,6 +24,7 @@ struct QCefCookieManager; extern QCef *cef; extern QCefCookieManager *panel_cookies; +extern bool cef_js_avail; enum class ListOpt : int { ShowAll = 1,