Skip to content

Commit

Permalink
DolphinQt/MainWindow: Replace includes with forward declarations
Browse files Browse the repository at this point in the history
Reduces the amount of dependencies dragged in by the main window's
header. This also removes MainWindow.h includes elsewhere where they
aren't necessary, reducing the amount of UI files that need to be
recompiled if the main window's header changes.
  • Loading branch information
lioncash committed Jul 15, 2018
1 parent 6044165 commit a9003aa
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
1 change: 0 additions & 1 deletion Source/Core/DolphinQt/Config/SettingsWindow.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinQt/HotkeyScheduler.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions Source/Core/DolphinQt/MainWindow.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down
19 changes: 11 additions & 8 deletions Source/Core/DolphinQt/MainWindow.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,21 +21,30 @@ 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;
class JITWidget; 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;
Expand Down

0 comments on commit a9003aa

Please sign in to comment.