Reformat all the things. Have fun with merge conflicts.

1 files changed, 50 insertions, 50 deletions

diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp
index ecd5af12f4..a238f41373 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp
@@ -11,7 +11,6 @@
 #include "Core/ConfigManager.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
-#include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Config/AdvancedConfigPane.h"
 #include "DolphinWX/Config/AudioConfigPane.h"
 #include "DolphinWX/Config/ConfigMain.h"
@@ -20,23 +19,24 @@
 #include "DolphinWX/Config/InterfaceConfigPane.h"
 #include "DolphinWX/Config/PathConfigPane.h"
 #include "DolphinWX/Config/WiiConfigPane.h"
+#include "DolphinWX/WxUtils.h"
 
 // Sent by child panes to signify that the game list should
 // be updated when this modal dialog closes.
 wxDEFINE_EVENT(wxDOLPHIN_CFG_REFRESH_LIST, wxCommandEvent);
 
 CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
-		const wxPoint& position, const wxSize& size, long style)
-	: wxDialog(parent, id, title, position, size, style)
+                         const wxPoint& position, const wxSize& size, long style)
+    : wxDialog(parent, id, title, position, size, style)
 {
-	// Control refreshing of the ISOs list
-	m_refresh_game_list_on_close = false;
+  // Control refreshing of the ISOs list
+  m_refresh_game_list_on_close = false;
 
-	Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this);
-	Bind(wxEVT_BUTTON, &CConfigMain::OnOk, this, wxID_OK);
-	Bind(wxDOLPHIN_CFG_REFRESH_LIST, &CConfigMain::OnSetRefreshGameListOnClose, this);
+  Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this);
+  Bind(wxEVT_BUTTON, &CConfigMain::OnOk, this, wxID_OK);
+  Bind(wxDOLPHIN_CFG_REFRESH_LIST, &CConfigMain::OnSetRefreshGameListOnClose, this);
 
-	CreateGUIControls();
+  CreateGUIControls();
 }
 
 CConfigMain::~CConfigMain()
@@ -45,67 +45,67 @@ CConfigMain::~CConfigMain()
 
 void CConfigMain::SetSelectedTab(int tab)
 {
-	// TODO : this is just a quick and dirty way to do it, possible cleanup
-
-	switch (tab)
-	{
-	case ID_AUDIOPAGE:
-		Notebook->SetSelection(2);
-		break;
-	}
+  // TODO : this is just a quick and dirty way to do it, possible cleanup
+
+  switch (tab)
+  {
+  case ID_AUDIOPAGE:
+    Notebook->SetSelection(2);
+    break;
+  }
 }
 
 void CConfigMain::CreateGUIControls()
 {
-	// Create the notebook and pages
-	Notebook = new wxNotebook(this, ID_NOTEBOOK);
-	wxPanel* const general_pane = new GeneralConfigPane(Notebook, ID_GENERALPAGE);
-	wxPanel* const interface_pane = new InterfaceConfigPane(Notebook, ID_DISPLAYPAGE);
-	wxPanel* const audio_pane = new AudioConfigPane(Notebook, ID_AUDIOPAGE);
-	wxPanel* const gamecube_pane = new GameCubeConfigPane(Notebook, ID_GAMECUBEPAGE);
-	wxPanel* const wii_pane = new WiiConfigPane(Notebook, ID_WIIPAGE);
-	wxPanel* const path_pane = new PathConfigPane(Notebook, ID_PATHSPAGE);
-	wxPanel* const advanced_pane = new AdvancedConfigPane(Notebook, ID_ADVANCEDPAGE);
-
-	Notebook->AddPage(general_pane, _("General"));
-	Notebook->AddPage(interface_pane, _("Interface"));
-	Notebook->AddPage(audio_pane, _("Audio"));
-	Notebook->AddPage(gamecube_pane, _("GameCube"));
-	Notebook->AddPage(wii_pane, _("Wii"));
-	Notebook->AddPage(path_pane, _("Paths"));
-	Notebook->AddPage(advanced_pane, _("Advanced"));
-	if (Movie::IsMovieActive() || NetPlay::IsNetPlayRunning())
-		advanced_pane->Disable();
-
-	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
-	main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
-	main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+  // Create the notebook and pages
+  Notebook = new wxNotebook(this, ID_NOTEBOOK);
+  wxPanel* const general_pane = new GeneralConfigPane(Notebook, ID_GENERALPAGE);
+  wxPanel* const interface_pane = new InterfaceConfigPane(Notebook, ID_DISPLAYPAGE);
+  wxPanel* const audio_pane = new AudioConfigPane(Notebook, ID_AUDIOPAGE);
+  wxPanel* const gamecube_pane = new GameCubeConfigPane(Notebook, ID_GAMECUBEPAGE);
+  wxPanel* const wii_pane = new WiiConfigPane(Notebook, ID_WIIPAGE);
+  wxPanel* const path_pane = new PathConfigPane(Notebook, ID_PATHSPAGE);
+  wxPanel* const advanced_pane = new AdvancedConfigPane(Notebook, ID_ADVANCEDPAGE);
+
+  Notebook->AddPage(general_pane, _("General"));
+  Notebook->AddPage(interface_pane, _("Interface"));
+  Notebook->AddPage(audio_pane, _("Audio"));
+  Notebook->AddPage(gamecube_pane, _("GameCube"));
+  Notebook->AddPage(wii_pane, _("Wii"));
+  Notebook->AddPage(path_pane, _("Paths"));
+  Notebook->AddPage(advanced_pane, _("Advanced"));
+  if (Movie::IsMovieActive() || NetPlay::IsNetPlayRunning())
+    advanced_pane->Disable();
+
+  wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
+  main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
+  main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
 
 #ifdef __APPLE__
-	main_sizer->SetMinSize(550, 0);
+  main_sizer->SetMinSize(550, 0);
 #else
-	main_sizer->SetMinSize(400, 0);
+  main_sizer->SetMinSize(400, 0);
 #endif
 
-	SetSizerAndFit(main_sizer);
-	Center();
-	SetFocus();
+  SetSizerAndFit(main_sizer);
+  Center();
+  SetFocus();
 }
 
 void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event))
 {
-	EndModal((m_refresh_game_list_on_close) ? wxID_OK : wxID_CANCEL);
+  EndModal((m_refresh_game_list_on_close) ? wxID_OK : wxID_CANCEL);
 }
 
 void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event))
 {
-	Close();
+  Close();
 
-	// Save the config. Dolphin crashes too often to only save the settings on closing
-	SConfig::GetInstance().SaveSettings();
+  // Save the config. Dolphin crashes too often to only save the settings on closing
+  SConfig::GetInstance().SaveSettings();
 }
 
 void CConfigMain::OnSetRefreshGameListOnClose(wxCommandEvent& WXUNUSED(event))
 {
-	m_refresh_game_list_on_close = true;
+  m_refresh_game_list_on_close = true;
 }