From 2040a11585851e1578cd2da33e5eeb7ad8019d81 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Fri, 21 Jun 2019 13:33:32 +0200
Subject: [PATCH] header shuffling

---
 rpcs3/main.cpp                        |  4 ++--
 rpcs3/main_application.cpp            | 11 +++++++++++
 rpcs3/main_application.h              | 14 +-------------
 rpcs3/rpcs3_app.cpp                   |  2 ++
 rpcs3/rpcs3_app.h                     |  4 ++--
 rpcs3/rpcs3qt/gui_application.h       | 10 +++++-----
 rpcs3/rpcs3qt/user_manager_dialog.cpp |  7 ++++++-
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 754c993c5b..f1c0a24c58 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
 	app->setApplicationVersion(qstr(rpcs3::version.to_string()));
 	app->setApplicationName("RPCS3");
 
-	if (auto gui_app = qobject_cast<gui_application*>(app.get()))
+	if (auto gui_app = qobject_cast<gui_application*>(app.data()))
 	{
 #if defined(_WIN32) || defined(__APPLE__)
 		app->setAttribute(Qt::AA_EnableHighDpiScaling);
@@ -155,7 +155,7 @@ int main(int argc, char** argv)
 
 		gui_app->Init();
 	}
-	else if (auto non_gui_app = qobject_cast<rpcs3_app*>(app.get()))
+	else if (auto non_gui_app = qobject_cast<rpcs3_app*>(app.data()))
 	{
 		non_gui_app->Init();
 	}
diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp
index 3c752f760d..bda1d7399b 100644
--- a/rpcs3/main_application.cpp
+++ b/rpcs3/main_application.cpp
@@ -1,5 +1,6 @@
 #include "main_application.h"
 
+#include "pad_thread.h"
 #include "Emu/Io/Null/NullPadHandler.h"
 #include "Emu/Io/Null/NullKeyboardHandler.h"
 #include "Emu/Io/Null/NullMouseHandler.h"
@@ -31,6 +32,16 @@
 #include "Emu/Audio/Pulse/PulseBackend.h"
 #endif
 
+#include "Emu/RSX/GSRender.h"
+#include "Emu/RSX/Null/NullGSRender.h"
+#include "Emu/RSX/GL/GLGSRender.h"
+#ifdef _MSC_VER
+#include "Emu/RSX/D3D12/D3D12GSRender.h"
+#endif
+#if defined(_WIN32) || defined(HAVE_VULKAN)
+#include "Emu/RSX/VK/VKGSRender.h"
+#endif
+
 /** Emu.Init() wrapper for user manager */
 bool main_application::InitializeEmulator(const std::string& user, bool force_init)
 {
diff --git a/rpcs3/main_application.h b/rpcs3/main_application.h
index 84104cd972..7f52d9d655 100644
--- a/rpcs3/main_application.h
+++ b/rpcs3/main_application.h
@@ -1,20 +1,8 @@
 #pragma once
 
 #include "stdafx.h"
-
-#include "Emu/System.h"
-
-#include "Emu/RSX/GSRender.h"
-#include "Emu/RSX/Null/NullGSRender.h"
-#include "Emu/RSX/GL/GLGSRender.h"
-#ifdef _MSC_VER
-#include "Emu/RSX/D3D12/D3D12GSRender.h"
-#endif
-#if defined(_WIN32) || defined(HAVE_VULKAN)
-#include "Emu/RSX/VK/VKGSRender.h"
-#endif
-
 #include <QWindow>
+#include "Emu/System.h"
 
 class main_application
 {
diff --git a/rpcs3/rpcs3_app.cpp b/rpcs3/rpcs3_app.cpp
index f83b78d16d..7489c5e7ba 100644
--- a/rpcs3/rpcs3_app.cpp
+++ b/rpcs3/rpcs3_app.cpp
@@ -2,6 +2,8 @@
 
 #include "Emu/System.h"
 
+#include "Emu/RSX/GSRender.h"
+
 // For now, a trivial constructor/destructor.  May add command line usage later.
 rpcs3_app::rpcs3_app(int& argc, char** argv) : QCoreApplication(argc, argv)
 {
diff --git a/rpcs3/rpcs3_app.h b/rpcs3/rpcs3_app.h
index 781e5d214a..6055e1ec3e 100644
--- a/rpcs3/rpcs3_app.h
+++ b/rpcs3/rpcs3_app.h
@@ -2,10 +2,10 @@
 
 #include "stdafx.h"
 
-#include "main_application.h"
-
 #include <QCoreApplication>
 
+#include "main_application.h"
+
 /** RPCS3 Application Class
  * The point of this class is to do application initialization and to hold onto the main window. The main thing I intend this class to do, for now, is to initialize callbacks and the main_window.
 */
diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3qt/gui_application.h
index c4b499e52f..f275313162 100644
--- a/rpcs3/rpcs3qt/gui_application.h
+++ b/rpcs3/rpcs3qt/gui_application.h
@@ -2,17 +2,17 @@
 
 #include "stdafx.h"
 
-#include "main_application.h"
+#include <QApplication>
+#include <QFontDatabase>
+#include <QIcon>
+
 #include "main_window.h"
+#include "main_application.h"
 #include "emu_settings.h"
 #include "gui_settings.h"
 #include "gs_frame.h"
 #include "gl_gs_frame.h"
 
-#include <QApplication>
-#include <QFontDatabase>
-#include <QIcon>
-
 class gui_application : public QApplication, public main_application
 {
 	Q_OBJECT
diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp
index 295c9b7a1c..361db23e7d 100644
--- a/rpcs3/rpcs3qt/user_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp
@@ -1,4 +1,9 @@
-#include "user_manager_dialog.h"
+#include <QRegExpValidator>
+#include <QInputDialog>
+#include <QKeyEvent>
+#include <QEvent>
+
+#include "user_manager_dialog.h"
 #include "table_item_delegate.h"
 #include "main_application.h"