Reformat all the things. Have fun with merge conflicts.

Source/Core/DolphinQt2/MainWindow.h

@@ -9,77 +9,77 @@
 #include <QString>
 #include <QToolBar>
 
+#include "DolphinQt2/GameList/GameList.h"
 #include "DolphinQt2/MenuBar.h"
 #include "DolphinQt2/RenderWidget.h"
 #include "DolphinQt2/ToolBar.h"
-#include "DolphinQt2/GameList/GameList.h"
 
 class PathDialog;
 class SettingsWindow;
 
 class MainWindow final : public QMainWindow
 {
-	Q_OBJECT
+  Q_OBJECT
 
 public:
-	explicit MainWindow();
-	~MainWindow();
+  explicit MainWindow();
+  ~MainWindow();
 
 signals:
-	void EmulationStarted();
-	void EmulationPaused();
-	void EmulationStopped();
+  void EmulationStarted();
+  void EmulationPaused();
+  void EmulationStopped();
 
 private slots:
-	void Open();
-	void Play();
-	void Pause();
+  void Open();
+  void Play();
+  void Pause();
 
-	// May ask for confirmation. Returns whether or not it actually stopped.
-	bool Stop();
-	void ForceStop();
-	void Reset();
-	void FrameAdvance();
-	void StateLoad();
-	void StateSave();
-	void StateLoadSlot();
-	void StateSaveSlot();
-	void StateLoadSlotAt(int slot);
-	void StateSaveSlotAt(int slot);
-	void StateLoadUndo();
-	void StateSaveUndo();
-	void StateSaveOldest();
-	void SetStateSlot(int slot);
+  // May ask for confirmation. Returns whether or not it actually stopped.
+  bool Stop();
+  void ForceStop();
+  void Reset();
+  void FrameAdvance();
+  void StateLoad();
+  void StateSave();
+  void StateLoadSlot();
+  void StateSaveSlot();
+  void StateLoadSlotAt(int slot);
+  void StateSaveSlotAt(int slot);
+  void StateLoadUndo();
+  void StateSaveUndo();
+  void StateSaveOldest();
+  void SetStateSlot(int slot);
 
-	void FullScreen();
-	void ScreenShot();
+  void FullScreen();
+  void ScreenShot();
 
 private:
-	void CreateComponents();
+  void CreateComponents();
 
-	void ConnectGameList();
-	void ConnectMenuBar();
-	void ConnectRenderWidget();
-	void ConnectStack();
-	void ConnectToolBar();
-	void ConnectPathsDialog();
+  void ConnectGameList();
+  void ConnectMenuBar();
+  void ConnectRenderWidget();
+  void ConnectStack();
+  void ConnectToolBar();
+  void ConnectPathsDialog();
 
-	void StartGame(const QString& path);
-	void ShowRenderWidget();
-	void HideRenderWidget();
+  void StartGame(const QString& path);
+  void ShowRenderWidget();
+  void HideRenderWidget();
 
-	void ShowPathsDialog();
-	void ShowSettingsWindow();
-	void ShowAboutDialog();
+  void ShowPathsDialog();
+  void ShowSettingsWindow();
+  void ShowAboutDialog();
 
-	QStackedWidget* m_stack;
-	ToolBar* m_tool_bar;
-	MenuBar* m_menu_bar;
-	GameList* m_game_list;
-	RenderWidget* m_render_widget;
-	bool m_rendering_to_main;
-	int m_state_slot = 1;
+  QStackedWidget* m_stack;
+  ToolBar* m_tool_bar;
+  MenuBar* m_menu_bar;
+  GameList* m_game_list;
+  RenderWidget* m_render_widget;
+  bool m_rendering_to_main;
+  int m_state_slot = 1;
 
-	PathDialog* m_paths_dialog;
-	SettingsWindow* m_settings_window;
+  PathDialog* m_paths_dialog;
+  SettingsWindow* m_settings_window;
 };