frontend: Demangle ScreenshotObj and OBSBasic

frontend/utility/ScreenshotObj.cpp

@@ -353,11 +353,7 @@ void ScreenshotObj::onFinished()
 
 	if (outputWidth > 0 && outputHeight > 0) {
 		if (outputToFile) {
-			OBSBasic *main = OBSBasic::Get();
-			main->ShowStatusBarMessage(
-				QTStr("Basic.StatusBar.ScreenshotSavedTo").arg(QT_UTF8(path.c_str())));
-			main->lastScreenshot = path;
-			main->OnEvent(OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN);
+			emit imageSaved(path);
 		}
 
 		emit imageReady(image.copy());

frontend/utility/ScreenshotObj.hpp

@@ -34,22 +34,23 @@ class ScreenshotObj : public QObject {
 
 	enum class Stage { Render, Download, Output, Finished };
 
-	void processStage();
-	void renderScreenshot();
-	void downloadData();
-	void copyData();
-	void saveToFile();
-	void muxFile();
-	void onFinished();
-
 	Stage stage() { return stage_; }
 	void setStage(Stage stage) { stage_ = stage; }
 
 	void setSize(QSize size);
 	void setSize(int width, int height);
 	void setSaveToFile(bool save);
 
+	void processStage();
+
 private:
+	void renderScreenshot();
+	void downloadData();
+	void copyData();
+	void saveToFile();
+	void muxFile();
+	void onFinished();
+
 	Stage stage_ = Stage::Render;
 
 	gs_texrender_t *texrender = nullptr;
@@ -69,6 +70,7 @@ class ScreenshotObj : public QObject {
 	bool outputToFile = true;
 
 signals:
+	void imageSaved(std::string path);
 	void imageReady(QImage image);
 
 private slots:

frontend/widgets/OBSBasic.cpp

@@ -41,6 +41,7 @@
 #include <settings/OBSBasicSettings.hpp>
 #include <utility/QuickTransition.hpp>
 #include <utility/SceneRenameDelegate.hpp>
+#include <utility/ScreenshotObj.hpp>
 #if defined(_WIN32) || defined(WHATSNEW_ENABLED)
 #include <utility/WhatsNewInfoThread.hpp>
 #endif

frontend/widgets/OBSBasic.hpp

@@ -41,6 +41,7 @@
 
 #include <QAccessible>
 #include <QSystemTrayIcon>
+#include <QPointer>
 
 #include <deque>
 
@@ -57,6 +58,7 @@ class OBSBasicTransform;
 class OBSLogViewer;
 class OBSMissingFiles;
 class OBSProjector;
+class ScreenshotObj;
 class VolumeControl;
 #ifdef YOUTUBE_ENABLED
 class YouTubeAppDock;
@@ -212,7 +214,6 @@ class OBSBasic : public OBSMainWindow {
 	friend class OBSYoutubeActions;
 	friend struct BasicOutputHandler;
 	friend struct OBSStudioAPI;
-	friend class ScreenshotObj;
 
 	enum class MoveDir { Up, Down, Left, Right };
 
@@ -1323,7 +1324,7 @@ private slots:
 	 * -------------------------------------
 	 */
 private:
-	QPointer<QObject> screenshotData;
+	QPointer<ScreenshotObj> screenshotData;
 	std::string lastScreenshot;
 
 private slots:

frontend/widgets/OBSBasic_Screenshots.cpp

@@ -30,6 +30,13 @@ void OBSBasic::Screenshot(OBSSource source)
 	}
 
 	screenshotData = new ScreenshotObj(source);
+
+	connect(screenshotData, &ScreenshotObj::imageSaved, this, [this](std::string path) {
+		ShowStatusBarMessage(QTStr("Basic.StatusBar.ScreenshotSavedTo").arg(QT_UTF8(path.c_str())));
+		lastScreenshot = path;
+
+		OnEvent(OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN);
+	});
 }
 
 void OBSBasic::ScreenshotSelectedSource()