Reformat all the things. Have fun with merge conflicts.

1 files changed, 96 insertions, 94 deletions

diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index 58d46b92b6..e1869ca465 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -9,125 +9,127 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/Wiimote.h"
 #include "InputCommon/ControllerEmu.h"
-#include "InputCommon/InputConfig.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/InputConfig.h"
 
 bool InputConfig::LoadConfig(bool isGC)
 {
-	IniFile inifile;
-	bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
-	std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
-	std::string profile[MAX_BBMOTES];
-	std::string path;
-
-	if (SConfig::GetInstance().GetUniqueID() != "00000000")
-	{
-		std::string type;
-		if (isGC)
-		{
-			type = "Pad";
-			path = "Profiles/GCPad/";
-		}
-		else
-		{
-			type = "Wiimote";
-			path = "Profiles/Wiimote/";
-		}
-
-		IniFile game_ini = SConfig::GetInstance().LoadGameIni();
-		IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls");
-
-		for (int i = 0; i < 4; i++)
-		{
-			if (control_section->Exists(type + "Profile" + num[i]))
-			{
-				if (control_section->Get(type + "Profile" + num[i], &profile[i]))
-				{
-					if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
-					{
-						useProfile[i] = true;
-					}
-					else
-					{
-						// TODO: PanicAlert shouldn't be used for this.
-						PanicAlertT("Selected controller profile does not exist");
-					}
-				}
-			}
-		}
-	}
-
-	if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + m_ini_name + ".ini"))
-	{
-		int n = 0;
-		for (auto& controller : m_controllers)
-		{
-			// Load settings from ini
-			if (useProfile[n])
-			{
-				IniFile profile_ini;
-				profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
-				controller->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
-			}
-			else
-			{
-				controller->LoadConfig(inifile.GetOrCreateSection(controller->GetName()));
-			}
-
-			// Update refs
-			controller->UpdateReferences(g_controller_interface);
-
-			// Next profile
-			n++;
-		}
-		return true;
-	}
-	else
-	{
-		m_controllers[0]->LoadDefaults(g_controller_interface);
-		m_controllers[0]->UpdateReferences(g_controller_interface);
-		return false;
-	}
+  IniFile inifile;
+  bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
+  std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
+  std::string profile[MAX_BBMOTES];
+  std::string path;
+
+  if (SConfig::GetInstance().GetUniqueID() != "00000000")
+  {
+    std::string type;
+    if (isGC)
+    {
+      type = "Pad";
+      path = "Profiles/GCPad/";
+    }
+    else
+    {
+      type = "Wiimote";
+      path = "Profiles/Wiimote/";
+    }
+
+    IniFile game_ini = SConfig::GetInstance().LoadGameIni();
+    IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls");
+
+    for (int i = 0; i < 4; i++)
+    {
+      if (control_section->Exists(type + "Profile" + num[i]))
+      {
+        if (control_section->Get(type + "Profile" + num[i], &profile[i]))
+        {
+          if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
+          {
+            useProfile[i] = true;
+          }
+          else
+          {
+            // TODO: PanicAlert shouldn't be used for this.
+            PanicAlertT("Selected controller profile does not exist");
+          }
+        }
+      }
+    }
+  }
+
+  if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + m_ini_name + ".ini"))
+  {
+    int n = 0;
+    for (auto& controller : m_controllers)
+    {
+      // Load settings from ini
+      if (useProfile[n])
+      {
+        IniFile profile_ini;
+        profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
+        controller->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
+      }
+      else
+      {
+        controller->LoadConfig(inifile.GetOrCreateSection(controller->GetName()));
+      }
+
+      // Update refs
+      controller->UpdateReferences(g_controller_interface);
+
+      // Next profile
+      n++;
+    }
+    return true;
+  }
+  else
+  {
+    m_controllers[0]->LoadDefaults(g_controller_interface);
+    m_controllers[0]->UpdateReferences(g_controller_interface);
+    return false;
+  }
 }
 
 void InputConfig::SaveConfig()
 {
-	std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + m_ini_name + ".ini";
+  std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + m_ini_name + ".ini";
 
-	IniFile inifile;
-	inifile.Load(ini_filename);
+  IniFile inifile;
+  inifile.Load(ini_filename);
 
-	for (auto& controller : m_controllers)
-		controller->SaveConfig(inifile.GetOrCreateSection(controller->GetName()));
+  for (auto& controller : m_controllers)
+    controller->SaveConfig(inifile.GetOrCreateSection(controller->GetName()));
 
-	inifile.Save(ini_filename);
+  inifile.Save(ini_filename);
 }
 
 ControllerEmu* InputConfig::GetController(int index)
 {
-	return m_controllers.at(index).get();
+  return m_controllers.at(index).get();
 }
 
 void InputConfig::ClearControllers()
 {
-	m_controllers.clear();
+  m_controllers.clear();
 }
 
 bool InputConfig::ControllersNeedToBeCreated() const
 {
-	return m_controllers.empty();
+  return m_controllers.empty();
 }
 
 bool InputConfig::IsControllerControlledByGamepadDevice(int index) const
 {
-	if (static_cast<size_t>(index) >= m_controllers.size())
-		return false;
-
-	const auto& controller = m_controllers.at(index).get()->default_device;
-
-	// Filter out anything which obviously not a gamepad
-	return !((controller.source == "Keyboard") // OSX Keyboard/Mouse
-		|| (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse
-		|| (controller.source == "Android" && controller.name == "Touchscreen") // Android Touchscreen
-		|| (controller.source == "DInput" && controller.name == "Keyboard Mouse")); // Windows Keyboard/Mouse
+  if (static_cast<size_t>(index) >= m_controllers.size())
+    return false;
+
+  const auto& controller = m_controllers.at(index).get()->default_device;
+
+  // Filter out anything which obviously not a gamepad
+  return !((controller.source == "Keyboard")    // OSX Keyboard/Mouse
+           || (controller.source == "XInput2")  // Linux and BSD Keyboard/Mouse
+           || (controller.source == "Android" &&
+               controller.name == "Touchscreen")  // Android Touchscreen
+           || (controller.source == "DInput" &&
+               controller.name == "Keyboard Mouse"));  // Windows Keyboard/Mouse
 }