Selaa lähdekoodia

frontend: Add renamed Qt UI docks

PatTheMav 10 kuukautta sitten
vanhempi
sitoutus
a959ecadaf

+ 2 - 1
UI/window-dock-browser.cpp → frontend/docks/BrowserDock.cpp

@@ -1,4 +1,5 @@
-#include "window-dock-browser.hpp"
+#include "BrowserDock.hpp"
+
 #include <QCloseEvent>
 #include <QCloseEvent>
 
 
 void BrowserDock::closeEvent(QCloseEvent *event)
 void BrowserDock::closeEvent(QCloseEvent *event)

+ 2 - 2
UI/window-dock-browser.hpp → frontend/docks/BrowserDock.hpp

@@ -1,9 +1,9 @@
 #pragma once
 #pragma once
 
 
-#include "window-dock.hpp"
-#include <QScopedPointer>
+#include "OBSDock.hpp"
 
 
 #include <browser-panel.hpp>
 #include <browser-panel.hpp>
+
 extern QCef *cef;
 extern QCef *cef;
 extern QCefCookieManager *panel_cookies;
 extern QCefCookieManager *panel_cookies;
 
 

+ 6 - 4
UI/window-dock.cpp → frontend/docks/OBSDock.cpp

@@ -1,9 +1,11 @@
-#include "moc_window-dock.cpp"
-#include "obs-app.hpp"
-#include "window-basic-main.hpp"
+#include "OBSDock.hpp"
+
+#include <widgets/OBSBasic.hpp>
 
 
-#include <QMessageBox>
 #include <QCheckBox>
 #include <QCheckBox>
+#include <QMessageBox>
+
+#include "moc_OBSDock.cpp"
 
 
 void OBSDock::closeEvent(QCloseEvent *event)
 void OBSDock::closeEvent(QCloseEvent *event)
 {
 {

+ 4 - 0
UI/window-dock.hpp → frontend/docks/OBSDock.hpp

@@ -2,6 +2,10 @@
 
 
 #include <QDockWidget>
 #include <QDockWidget>
 
 
+class QCloseEvent;
+class QShowEvent;
+class QString;
+
 class OBSDock : public QDockWidget {
 class OBSDock : public QDockWidget {
 	Q_OBJECT
 	Q_OBJECT
 
 

+ 10 - 6
UI/window-dock-youtube-app.cpp → frontend/docks/YouTubeAppDock.cpp

@@ -1,15 +1,19 @@
-#include <QUuid>
+#include "YouTubeAppDock.hpp"
 
 
-#include "window-basic-main.hpp"
-#include "youtube-api-wrappers.hpp"
-#include "moc_window-dock-youtube-app.cpp"
+#include <utility/YoutubeApiWrappers.hpp>
+#include <widgets/OBSBasic.hpp>
 
 
-#include "ui-config.h"
-#include "qt-wrappers.hpp"
+#include <qt-wrappers.hpp>
 
 
+#include <QUuid>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json.hpp>
+
+#include "moc_YouTubeAppDock.cpp"
+
 using json = nlohmann::json;
 using json = nlohmann::json;
 
 
+extern bool cef_js_avail;
+
 #ifdef YOUTUBE_WEBAPP_PLACEHOLDER
 #ifdef YOUTUBE_WEBAPP_PLACEHOLDER
 static constexpr const char *YOUTUBE_WEBAPP_PLACEHOLDER_URL = YOUTUBE_WEBAPP_PLACEHOLDER;
 static constexpr const char *YOUTUBE_WEBAPP_PLACEHOLDER_URL = YOUTUBE_WEBAPP_PLACEHOLDER;
 #else
 #else

+ 4 - 2
UI/window-dock-youtube-app.hpp → frontend/docks/YouTubeAppDock.hpp

@@ -1,10 +1,12 @@
 #pragma once
 #pragma once
 
 
-#include "window-dock-browser.hpp"
-#include "youtube-api-wrappers.hpp"
+#include "BrowserDock.hpp"
+
+#include <QPointer>
 
 
 class QAction;
 class QAction;
 class QCefWidget;
 class QCefWidget;
+class YoutubeApiWrappers;
 
 
 class YouTubeAppDock : public BrowserDock {
 class YouTubeAppDock : public BrowserDock {
 	Q_OBJECT
 	Q_OBJECT