Reformat all the things. Have fun with merge conflicts.

1 files changed, 125 insertions, 111 deletions

diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
index 71c35003e8..f3737512e6 100644
--- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
+++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
@@ -21,123 +21,137 @@
 #include "DolphinWX/WxUtils.h"
 
 template <typename T>
-IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) :
-	wxSpinCtrl(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style),
-	m_setting(setting)
+IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal,
+                                  int maxVal, long style)
+    : wxSpinCtrl(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, style),
+      m_setting(setting)
 {
-	SetRange(minVal, maxVal);
-	SetValue(m_setting);
-	Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
+  SetRange(minVal, maxVal);
+  SetValue(m_setting);
+  Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
 }
 
-
-SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& ininame) :
-	wxDialog(parent, wxID_ANY,
-	wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
+SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title,
+                                                     const std::string& ininame)
+    : wxDialog(parent, wxID_ANY,
+               wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
 {
-	VideoConfig& vconfig = g_Config;
-
-	if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
-		vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
-	else
-		vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
-
-	wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
-
-	// -- GENERAL --
-	{
-	wxPanel* const page_general= new wxPanel(notebook);
-	notebook->AddPage(page_general, _("General"));
-	wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
-
-	// - rendering
-	{
-	wxStaticBoxSizer* const group_rendering = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Rendering"));
-	szr_general->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
-	wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
-	group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	// backend
-	wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
-	wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY);
-
-	for (const auto& backend : g_available_video_backends)
-	{
-		choice_backend->AppendString(StrToWxStr(backend->GetDisplayName()));
-	}
-
-	// TODO: How to get the translated plugin name?
-	choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
-	choice_backend->Bind(wxEVT_CHOICE, &SoftwareVideoConfigDialog::Event_Backend, this);
-
-	szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
-	szr_rendering->Add(choice_backend, 1, 0, 0);
-
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-	{
-		label_backend->Disable();
-		choice_backend->Disable();
-	}
-
-	// xfb
-	szr_rendering->Add(new SettingCheckBox(page_general, _("Bypass XFB"), "", vconfig.bUseXFB, true));
-	}
-
-	// - info
-	{
-	wxStaticBoxSizer* const group_info = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Overlay Information"));
-	szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
-	group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_info->Add(new SettingCheckBox(page_general, _("Various Statistics"), "", vconfig.bOverlayStats));
-	}
-
-	// - utility
-	{
-	wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Utility"));
-	szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
-	group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_utility->Add(new SettingCheckBox(page_general, _("Dump Textures"), "", vconfig.bDumpTextures));
-	szr_utility->Add(new SettingCheckBox(page_general, _("Dump Objects"), "", vconfig.bDumpObjects));
-
-	// - debug only
-	wxStaticBoxSizer* const group_debug_only_utility = new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Debug Only"));
-	group_utility->Add(group_debug_only_utility, 0, wxEXPAND | wxBOTTOM, 5);
-	wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, 5, 5);
-	group_debug_only_utility->Add(szr_debug_only_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_debug_only_utility->Add(new SettingCheckBox(page_general, _("Dump TEV Stages"), "", vconfig.bDumpTevStages));
-	szr_debug_only_utility->Add(new SettingCheckBox(page_general, _("Dump Texture Fetches"), "", vconfig.bDumpTevTextureFetches));
-	}
-
-	// - misc
-	{
-	wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Drawn Object Range"));
-	szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-	wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
-	group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
-
-	szr_misc->Add(new IntegerSetting<int>(page_general, _("Start"), vconfig.drawStart, 0, 100000));
-	szr_misc->Add(new IntegerSetting<int>(page_general, _("End"), vconfig.drawEnd, 0, 100000));
-	}
-
-	page_general->SetSizerAndFit(szr_general);
-	}
-
-	wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
-	szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
-	szr_main->Add(new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition),
-			0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
-
-	SetSizerAndFit(szr_main);
-	Center();
-	SetFocus();
+  VideoConfig& vconfig = g_Config;
+
+  if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
+    vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
+  else
+    vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
+
+  wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);
+
+  // -- GENERAL --
+  {
+    wxPanel* const page_general = new wxPanel(notebook);
+    notebook->AddPage(page_general, _("General"));
+    wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
+
+    // - rendering
+    {
+      wxStaticBoxSizer* const group_rendering =
+          new wxStaticBoxSizer(wxVERTICAL, page_general, _("Rendering"));
+      szr_general->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
+      wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
+      group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+      // backend
+      wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
+      wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY);
+
+      for (const auto& backend : g_available_video_backends)
+      {
+        choice_backend->AppendString(StrToWxStr(backend->GetDisplayName()));
+      }
+
+      // TODO: How to get the translated plugin name?
+      choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));
+      choice_backend->Bind(wxEVT_CHOICE, &SoftwareVideoConfigDialog::Event_Backend, this);
+
+      szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);
+      szr_rendering->Add(choice_backend, 1, 0, 0);
+
+      if (Core::GetState() != Core::CORE_UNINITIALIZED)
+      {
+        label_backend->Disable();
+        choice_backend->Disable();
+      }
+
+      // xfb
+      szr_rendering->Add(
+          new SettingCheckBox(page_general, _("Bypass XFB"), "", vconfig.bUseXFB, true));
+    }
+
+    // - info
+    {
+      wxStaticBoxSizer* const group_info =
+          new wxStaticBoxSizer(wxVERTICAL, page_general, _("Overlay Information"));
+      szr_general->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+      wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
+      group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+      szr_info->Add(
+          new SettingCheckBox(page_general, _("Various Statistics"), "", vconfig.bOverlayStats));
+    }
+
+    // - utility
+    {
+      wxStaticBoxSizer* const group_utility =
+          new wxStaticBoxSizer(wxVERTICAL, page_general, _("Utility"));
+      szr_general->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+      wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
+      group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+      szr_utility->Add(
+          new SettingCheckBox(page_general, _("Dump Textures"), "", vconfig.bDumpTextures));
+      szr_utility->Add(
+          new SettingCheckBox(page_general, _("Dump Objects"), "", vconfig.bDumpObjects));
+
+      // - debug only
+      wxStaticBoxSizer* const group_debug_only_utility =
+          new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Debug Only"));
+      group_utility->Add(group_debug_only_utility, 0, wxEXPAND | wxBOTTOM, 5);
+      wxGridSizer* const szr_debug_only_utility = new wxGridSizer(2, 5, 5);
+      group_debug_only_utility->Add(szr_debug_only_utility, 1,
+                                    wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+      szr_debug_only_utility->Add(
+          new SettingCheckBox(page_general, _("Dump TEV Stages"), "", vconfig.bDumpTevStages));
+      szr_debug_only_utility->Add(new SettingCheckBox(page_general, _("Dump Texture Fetches"), "",
+                                                      vconfig.bDumpTevTextureFetches));
+    }
+
+    // - misc
+    {
+      wxStaticBoxSizer* const group_misc =
+          new wxStaticBoxSizer(wxVERTICAL, page_general, _("Drawn Object Range"));
+      szr_general->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+      wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
+      group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+
+      szr_misc->Add(
+          new IntegerSetting<int>(page_general, _("Start"), vconfig.drawStart, 0, 100000));
+      szr_misc->Add(new IntegerSetting<int>(page_general, _("End"), vconfig.drawEnd, 0, 100000));
+    }
+
+    page_general->SetSizerAndFit(szr_general);
+  }
+
+  wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL);
+  szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5);
+  szr_main->Add(new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition), 0,
+                wxALIGN_RIGHT | wxRIGHT | wxBOTTOM, 5);
+
+  SetSizerAndFit(szr_main);
+  Center();
+  SetFocus();
 }
 
 SoftwareVideoConfigDialog::~SoftwareVideoConfigDialog()
 {
-	g_Config.Save((File::GetUserPath(D_CONFIG_IDX) + "GFX.ini").c_str());
+  g_Config.Save((File::GetUserPath(D_CONFIG_IDX) + "GFX.ini").c_str());
 }