ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7269 from lioncash/qt 

DolphinQt/MainWindow: Replace includes with forward declarations
This commit is contained in:
spycrab 2018-07-30 11:56:31 +02:00 committed by GitHub
parent 2a776bf2b6 a9003aadc6
commit 81c3400681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinQt/Config/SettingsWindow.cpp
View File

@ -8,7 +8,6 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include "DolphinQt/Config/SettingsWindow.h" #include "DolphinQt/Config/SettingsWindow.h"
#include "DolphinQt/MainWindow.h"
#include "DolphinQt/QtUtils/WrapInScrollArea.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h"
#include "DolphinQt/Resources.h" #include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"

2
Source/Core/DolphinQt/HotkeyScheduler.cpp
View File

@ -11,6 +11,7 @@
#include "AudioCommon/AudioCommon.h" #include "AudioCommon/AudioCommon.h"
#include "Common/Config/Config.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/Config/GraphicsSettings.h" #include "Core/Config/GraphicsSettings.h"
@ -21,7 +22,6 @@
#include "Core/IOS/USB/Bluetooth/BTBase.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/State.h" #include "Core/State.h"
#include "DolphinQt/MainWindow.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"

5
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -14,6 +14,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QMimeData> #include <QMimeData>
#include <QProgressDialog> #include <QProgressDialog>
#include <QStackedWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <future> #include <future>
@ -68,19 +69,23 @@
#include "DolphinQt/Debugger/WatchWidget.h" #include "DolphinQt/Debugger/WatchWidget.h"
#include "DolphinQt/FIFO/FIFOPlayerWindow.h" #include "DolphinQt/FIFO/FIFOPlayerWindow.h"
#include "DolphinQt/GCMemcardManager.h" #include "DolphinQt/GCMemcardManager.h"
#include "DolphinQt/GameList/GameList.h"
#include "DolphinQt/Host.h" #include "DolphinQt/Host.h"
#include "DolphinQt/HotkeyScheduler.h" #include "DolphinQt/HotkeyScheduler.h"
#include "DolphinQt/MainWindow.h" #include "DolphinQt/MainWindow.h"
#include "DolphinQt/MenuBar.h"
#include "DolphinQt/NetPlay/NetPlayDialog.h" #include "DolphinQt/NetPlay/NetPlayDialog.h"
#include "DolphinQt/NetPlay/NetPlaySetupDialog.h" #include "DolphinQt/NetPlay/NetPlaySetupDialog.h"
#include "DolphinQt/QtUtils/QueueOnObject.h" #include "DolphinQt/QtUtils/QueueOnObject.h"
#include "DolphinQt/QtUtils/RunOnObject.h" #include "DolphinQt/QtUtils/RunOnObject.h"
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h" #include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
#include "DolphinQt/RenderWidget.h"
#include "DolphinQt/Resources.h" #include "DolphinQt/Resources.h"
#include "DolphinQt/SearchBar.h" #include "DolphinQt/SearchBar.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
#include "DolphinQt/TAS/GCTASInputWindow.h" #include "DolphinQt/TAS/GCTASInputWindow.h"
#include "DolphinQt/TAS/WiiTASInputWindow.h" #include "DolphinQt/TAS/WiiTASInputWindow.h"
#include "DolphinQt/ToolBar.h"
#include "DolphinQt/WiiUpdate.h" #include "DolphinQt/WiiUpdate.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"

19
Source/Core/DolphinQt/MainWindow.h
View File

@ -5,20 +5,14 @@
#pragma once #pragma once
#include <QMainWindow> #include <QMainWindow>
#include <QStackedWidget>
#include <QString>
#include <QToolBar>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <string> #include <string>
#include "DolphinQt/GameList/GameList.h"
#include "DolphinQt/MenuBar.h"
#include "DolphinQt/RenderWidget.h"
#include "DolphinQt/ToolBar.h"
class QProgressDialog; class QProgressDialog;
class QStackedWidget;
class QString;
class BreakpointWidget; class BreakpointWidget;
struct BootParameters; struct BootParameters;
@ -27,6 +21,7 @@ class CodeWidget;
class ControllersWindow; class ControllersWindow;
class DragEnterEvent; class DragEnterEvent;
class FIFOPlayerWindow; class FIFOPlayerWindow;
class GameList;
class GCTASInputWindow; class GCTASInputWindow;
class GraphicsWindow; class GraphicsWindow;
class HotkeyScheduler; class HotkeyScheduler;
@ -34,14 +29,22 @@ class JITWidget;
class LogConfigWidget; class LogConfigWidget;
class LogWidget; class LogWidget;
class MemoryWidget; class MemoryWidget;
class MenuBar;
class NetPlayDialog; class NetPlayDialog;
class NetPlaySetupDialog; class NetPlaySetupDialog;
class RegisterWidget; class RegisterWidget;
class RenderWidget;
class SearchBar; class SearchBar;
class SettingsWindow; class SettingsWindow;
class ToolBar;
class WatchWidget; class WatchWidget;
class WiiTASInputWindow; class WiiTASInputWindow;
namespace DiscIO
{
enum class Region;
}
namespace X11Utils namespace X11Utils
{ {
class XRRConfiguration; class XRRConfiguration;