Reformat all the things. Have fun with merge conflicts.

1 files changed, 240 insertions, 239 deletions

diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
index 886837af52..e61fb9875f 100644
--- a/Source/Core/DolphinWX/ISOFile.cpp
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -25,8 +25,8 @@
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 
-#include "Core/ConfigManager.h"
 #include "Core/Boot/Boot.h"
+#include "Core/ConfigManager.h"
 
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeCreator.h"
@@ -34,141 +34,137 @@
 #include "DolphinWX/ISOFile.h"
 #include "DolphinWX/WxUtils.h"
 
-static const u32 CACHE_REVISION = 0x127; // Last changed in PR 3309
+static const u32 CACHE_REVISION = 0x127;  // Last changed in PR 3309
 
 #define DVD_BANNER_WIDTH 96
 #define DVD_BANNER_HEIGHT 32
 
-static std::string GetLanguageString(DiscIO::IVolume::ELanguage language, std::map<DiscIO::IVolume::ELanguage, std::string> strings)
+static std::string GetLanguageString(DiscIO::IVolume::ELanguage language,
+                                     std::map<DiscIO::IVolume::ELanguage, std::string> strings)
 {
-	auto end = strings.end();
-	auto it = strings.find(language);
-	if (it != end)
-		return it->second;
-
-	// English tends to be a good fallback when the requested language isn't available
-	if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH)
-	{
-		it = strings.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
-		if (it != end)
-			return it->second;
-	}
-
-	// If English isn't available either, just pick something
-	if (!strings.empty())
-		return strings.cbegin()->second;
-
-	return "";
+  auto end = strings.end();
+  auto it = strings.find(language);
+  if (it != end)
+    return it->second;
+
+  // English tends to be a good fallback when the requested language isn't available
+  if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH)
+  {
+    it = strings.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
+    if (it != end)
+      return it->second;
+  }
+
+  // If English isn't available either, just pick something
+  if (!strings.empty())
+    return strings.cbegin()->second;
+
+  return "";
 }
 
-GameListItem::GameListItem(const std::string& _rFileName, const std::unordered_map<std::string, std::string>& custom_titles)
-	: m_FileName(_rFileName)
-	, m_title_id(0)
-	, m_emu_state(0)
-	, m_FileSize(0)
-	, m_Country(DiscIO::IVolume::COUNTRY_UNKNOWN)
-	, m_Revision(0)
-	, m_Valid(false)
-	, m_ImageWidth(0)
-	, m_ImageHeight(0)
-	, m_disc_number(0)
-	, m_has_custom_name(false)
+GameListItem::GameListItem(const std::string& _rFileName,
+                           const std::unordered_map<std::string, std::string>& custom_titles)
+    : m_FileName(_rFileName), m_title_id(0), m_emu_state(0), m_FileSize(0),
+      m_Country(DiscIO::IVolume::COUNTRY_UNKNOWN), m_Revision(0), m_Valid(false), m_ImageWidth(0),
+      m_ImageHeight(0), m_disc_number(0), m_has_custom_name(false)
 {
-	if (LoadFromCache())
-	{
-		m_Valid = true;
-
-		// Wii banners can only be read if there is a savefile,
-		// so sometimes caches don't contain banners. Let's check
-		// if a banner has become available after the cache was made.
-		if (m_pImage.empty())
-		{
-			std::vector<u32> buffer = DiscIO::IVolume::GetWiiBanner(&m_ImageWidth, &m_ImageHeight, m_title_id);
-			ReadVolumeBanner(buffer, m_ImageWidth, m_ImageHeight);
-			if (!m_pImage.empty())
-				SaveToCache();
-		}
-	}
-	else
-	{
-		std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(_rFileName));
-
-		if (volume != nullptr)
-		{
-			m_Platform = volume->GetVolumeType();
-
-			m_names = volume->GetNames(true);
-			m_descriptions = volume->GetDescriptions();
-			m_company = volume->GetCompany();
-
-			m_Country = volume->GetCountry();
-			m_blob_type = volume->GetBlobType();
-			m_FileSize = volume->GetRawSize();
-			m_VolumeSize = volume->GetSize();
-
-			m_UniqueID = volume->GetUniqueID();
-			volume->GetTitleID(&m_title_id);
-			m_disc_number = volume->GetDiscNumber();
-			m_Revision = volume->GetRevision();
-
-			std::vector<u32> buffer = volume->GetBanner(&m_ImageWidth, &m_ImageHeight);
-			ReadVolumeBanner(buffer, m_ImageWidth, m_ImageHeight);
-
-			m_Valid = true;
-			SaveToCache();
-		}
-	}
-
-	if (m_company.empty() && m_UniqueID.size() >= 6)
-		m_company = DiscIO::GetCompanyFromID(m_UniqueID.substr(4, 2));
-
-	if (IsValid())
-	{
-		std::string game_id = m_UniqueID;
-
-		// Ignore publisher ID for WAD files
-		if (m_Platform == DiscIO::IVolume::WII_WAD && game_id.size() > 4)
-			game_id.erase(4);
-
-		auto it = custom_titles.find(game_id);
-		if (it != custom_titles.end())
-		{
-			m_custom_name_titles_txt = it->second;
-		}
-
-		ReloadINI();
-	}
-
-	if (!IsValid() && IsElfOrDol())
-	{
-		m_Valid = true;
-		m_FileSize = File::GetSize(_rFileName);
-		m_Platform = DiscIO::IVolume::ELF_DOL;
-		m_blob_type = DiscIO::BlobType::DIRECTORY;
-	}
-
-	std::string path, name;
-	SplitPath(m_FileName, &path, &name, nullptr);
-
-	// A bit like the Homebrew Channel icon, except there can be multiple files in a folder with their own icons.
-	// Useful for those who don't want to have a Homebrew Channel-style folder structure.
-	if (ReadPNGBanner(path + name + ".png"))
-		return;
-
-	// Homebrew Channel icon. Typical for DOLs and ELFs, but can be also used with volumes.
-	if (ReadPNGBanner(path + "icon.png"))
-		return;
-
-	// Volume banner. Typical for everything that isn't a DOL or ELF.
-	if (!m_pImage.empty())
-	{
-		wxImage image(m_ImageWidth, m_ImageHeight, &m_pImage[0], true);
-		m_Bitmap = ScaleBanner(&image);
-		return;
-	}
-
-	// Fallback in case no banner is available.
-	ReadPNGBanner(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP + "nobanner.png");
+  if (LoadFromCache())
+  {
+    m_Valid = true;
+
+    // Wii banners can only be read if there is a savefile,
+    // so sometimes caches don't contain banners. Let's check
+    // if a banner has become available after the cache was made.
+    if (m_pImage.empty())
+    {
+      std::vector<u32> buffer =
+          DiscIO::IVolume::GetWiiBanner(&m_ImageWidth, &m_ImageHeight, m_title_id);
+      ReadVolumeBanner(buffer, m_ImageWidth, m_ImageHeight);
+      if (!m_pImage.empty())
+        SaveToCache();
+    }
+  }
+  else
+  {
+    std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(_rFileName));
+
+    if (volume != nullptr)
+    {
+      m_Platform = volume->GetVolumeType();
+
+      m_names = volume->GetNames(true);
+      m_descriptions = volume->GetDescriptions();
+      m_company = volume->GetCompany();
+
+      m_Country = volume->GetCountry();
+      m_blob_type = volume->GetBlobType();
+      m_FileSize = volume->GetRawSize();
+      m_VolumeSize = volume->GetSize();
+
+      m_UniqueID = volume->GetUniqueID();
+      volume->GetTitleID(&m_title_id);
+      m_disc_number = volume->GetDiscNumber();
+      m_Revision = volume->GetRevision();
+
+      std::vector<u32> buffer = volume->GetBanner(&m_ImageWidth, &m_ImageHeight);
+      ReadVolumeBanner(buffer, m_ImageWidth, m_ImageHeight);
+
+      m_Valid = true;
+      SaveToCache();
+    }
+  }
+
+  if (m_company.empty() && m_UniqueID.size() >= 6)
+    m_company = DiscIO::GetCompanyFromID(m_UniqueID.substr(4, 2));
+
+  if (IsValid())
+  {
+    std::string game_id = m_UniqueID;
+
+    // Ignore publisher ID for WAD files
+    if (m_Platform == DiscIO::IVolume::WII_WAD && game_id.size() > 4)
+      game_id.erase(4);
+
+    auto it = custom_titles.find(game_id);
+    if (it != custom_titles.end())
+    {
+      m_custom_name_titles_txt = it->second;
+    }
+
+    ReloadINI();
+  }
+
+  if (!IsValid() && IsElfOrDol())
+  {
+    m_Valid = true;
+    m_FileSize = File::GetSize(_rFileName);
+    m_Platform = DiscIO::IVolume::ELF_DOL;
+    m_blob_type = DiscIO::BlobType::DIRECTORY;
+  }
+
+  std::string path, name;
+  SplitPath(m_FileName, &path, &name, nullptr);
+
+  // A bit like the Homebrew Channel icon, except there can be multiple files in a folder with their
+  // own icons.
+  // Useful for those who don't want to have a Homebrew Channel-style folder structure.
+  if (ReadPNGBanner(path + name + ".png"))
+    return;
+
+  // Homebrew Channel icon. Typical for DOLs and ELFs, but can be also used with volumes.
+  if (ReadPNGBanner(path + "icon.png"))
+    return;
+
+  // Volume banner. Typical for everything that isn't a DOL or ELF.
+  if (!m_pImage.empty())
+  {
+    wxImage image(m_ImageWidth, m_ImageHeight, &m_pImage[0], true);
+    m_Bitmap = ScaleBanner(&image);
+    return;
+  }
+
+  // Fallback in case no banner is available.
+  ReadPNGBanner(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP + "nobanner.png");
 }
 
 GameListItem::~GameListItem()
@@ -177,184 +173,189 @@ GameListItem::~GameListItem()
 
 void GameListItem::ReloadINI()
 {
-	if (!IsValid())
-		return;
-
-	IniFile ini = SConfig::LoadGameIni(m_UniqueID, m_Revision);
-	ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state, 0);
-	ini.GetIfExists("EmuState", "EmulationIssues", &m_issues, std::string());
-
-	m_custom_name.clear();
-	m_has_custom_name = ini.GetIfExists("EmuState", "Title", &m_custom_name);
-	if (!m_has_custom_name && !m_custom_name_titles_txt.empty())
-	{
-		m_custom_name = m_custom_name_titles_txt;
-		m_has_custom_name = true;
-	}
+  if (!IsValid())
+    return;
+
+  IniFile ini = SConfig::LoadGameIni(m_UniqueID, m_Revision);
+  ini.GetIfExists("EmuState", "EmulationStateId", &m_emu_state, 0);
+  ini.GetIfExists("EmuState", "EmulationIssues", &m_issues, std::string());
+
+  m_custom_name.clear();
+  m_has_custom_name = ini.GetIfExists("EmuState", "Title", &m_custom_name);
+  if (!m_has_custom_name && !m_custom_name_titles_txt.empty())
+  {
+    m_custom_name = m_custom_name_titles_txt;
+    m_has_custom_name = true;
+  }
 }
 
 bool GameListItem::LoadFromCache()
 {
-	return CChunkFileReader::Load<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
+  return CChunkFileReader::Load<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
 }
 
 void GameListItem::SaveToCache()
 {
-	if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
-		File::CreateDir(File::GetUserPath(D_CACHE_IDX));
+  if (!File::IsDirectory(File::GetUserPath(D_CACHE_IDX)))
+    File::CreateDir(File::GetUserPath(D_CACHE_IDX));
 
-	CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
+  CChunkFileReader::Save<GameListItem>(CreateCacheFilename(), CACHE_REVISION, *this);
 }
 
-void GameListItem::DoState(PointerWrap &p)
+void GameListItem::DoState(PointerWrap& p)
 {
-	p.Do(m_names);
-	p.Do(m_descriptions);
-	p.Do(m_company);
-	p.Do(m_UniqueID);
-	p.Do(m_title_id);
-	p.Do(m_FileSize);
-	p.Do(m_VolumeSize);
-	p.Do(m_Country);
-	p.Do(m_blob_type);
-	p.Do(m_pImage);
-	p.Do(m_ImageWidth);
-	p.Do(m_ImageHeight);
-	p.Do(m_Platform);
-	p.Do(m_disc_number);
-	p.Do(m_Revision);
+  p.Do(m_names);
+  p.Do(m_descriptions);
+  p.Do(m_company);
+  p.Do(m_UniqueID);
+  p.Do(m_title_id);
+  p.Do(m_FileSize);
+  p.Do(m_VolumeSize);
+  p.Do(m_Country);
+  p.Do(m_blob_type);
+  p.Do(m_pImage);
+  p.Do(m_ImageWidth);
+  p.Do(m_ImageHeight);
+  p.Do(m_Platform);
+  p.Do(m_disc_number);
+  p.Do(m_Revision);
 }
 
 bool GameListItem::IsElfOrDol() const
 {
-	if (m_FileName.size() < 4)
-		return false;
+  if (m_FileName.size() < 4)
+    return false;
 
-	std::string name_end = m_FileName.substr(m_FileName.size() - 4);
-	std::transform(name_end.begin(), name_end.end(), name_end.begin(), ::tolower);
-	return name_end == ".elf" || name_end == ".dol";
+  std::string name_end = m_FileName.substr(m_FileName.size() - 4);
+  std::transform(name_end.begin(), name_end.end(), name_end.begin(), ::tolower);
+  return name_end == ".elf" || name_end == ".dol";
 }
 
 std::string GameListItem::CreateCacheFilename() const
 {
-	std::string Filename, LegalPathname, extension;
-	SplitPath(m_FileName, &LegalPathname, &Filename, &extension);
-
-	if (Filename.empty()) return Filename; // Disc Drive
-
-	// Filename.extension_HashOfFolderPath_Size.cache
-	// Append hash to prevent ISO name-clashing in different folders.
-	Filename.append(StringFromFormat("%s_%x_%" PRIx64 ".cache",
-		extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()),
-		File::GetSize(m_FileName)));
-
-	std::string fullname(File::GetUserPath(D_CACHE_IDX));
-	fullname += Filename;
-	return fullname;
+  std::string Filename, LegalPathname, extension;
+  SplitPath(m_FileName, &LegalPathname, &Filename, &extension);
+
+  if (Filename.empty())
+    return Filename;  // Disc Drive
+
+  // Filename.extension_HashOfFolderPath_Size.cache
+  // Append hash to prevent ISO name-clashing in different folders.
+  Filename.append(
+      StringFromFormat("%s_%x_%" PRIx64 ".cache", extension.c_str(),
+                       HashFletcher((const u8*)LegalPathname.c_str(), LegalPathname.size()),
+                       File::GetSize(m_FileName)));
+
+  std::string fullname(File::GetUserPath(D_CACHE_IDX));
+  fullname += Filename;
+  return fullname;
 }
 
 // Outputs to m_pImage
 void GameListItem::ReadVolumeBanner(const std::vector<u32>& buffer, int width, int height)
 {
-	m_pImage.resize(width * height * 3);
-	for (int i = 0; i < width * height; i++)
-	{
-		m_pImage[i * 3 + 0] = (buffer[i] & 0xFF0000) >> 16;
-		m_pImage[i * 3 + 1] = (buffer[i] & 0x00FF00) >> 8;
-		m_pImage[i * 3 + 2] = (buffer[i] & 0x0000FF) >> 0;
-	}
+  m_pImage.resize(width * height * 3);
+  for (int i = 0; i < width * height; i++)
+  {
+    m_pImage[i * 3 + 0] = (buffer[i] & 0xFF0000) >> 16;
+    m_pImage[i * 3 + 1] = (buffer[i] & 0x00FF00) >> 8;
+    m_pImage[i * 3 + 2] = (buffer[i] & 0x0000FF) >> 0;
+  }
 }
 
 // Outputs to m_Bitmap
 bool GameListItem::ReadPNGBanner(const std::string& path)
 {
-	if (!File::Exists(path))
-		return false;
+  if (!File::Exists(path))
+    return false;
 
-	wxImage image(StrToWxStr(path), wxBITMAP_TYPE_PNG);
-	m_Bitmap = ScaleBanner(&image);
-	return true;
+  wxImage image(StrToWxStr(path), wxBITMAP_TYPE_PNG);
+  m_Bitmap = ScaleBanner(&image);
+  return true;
 }
 
 wxBitmap GameListItem::ScaleBanner(wxImage* image)
 {
-	const double gui_scale = wxTheApp->GetTopWindow()->GetContentScaleFactor();
-	const double target_width = DVD_BANNER_WIDTH * gui_scale;
-	const double target_height = DVD_BANNER_HEIGHT * gui_scale;
-	const double banner_scale = std::min(target_width / image->GetWidth(), target_height / image->GetHeight());
-	image->Rescale(image->GetWidth() * banner_scale, image->GetHeight() * banner_scale, wxIMAGE_QUALITY_HIGH);
-	image->Resize(wxSize(target_width, target_height), wxPoint(), 0xFF, 0xFF, 0xFF);
+  const double gui_scale = wxTheApp->GetTopWindow()->GetContentScaleFactor();
+  const double target_width = DVD_BANNER_WIDTH * gui_scale;
+  const double target_height = DVD_BANNER_HEIGHT * gui_scale;
+  const double banner_scale =
+      std::min(target_width / image->GetWidth(), target_height / image->GetHeight());
+  image->Rescale(image->GetWidth() * banner_scale, image->GetHeight() * banner_scale,
+                 wxIMAGE_QUALITY_HIGH);
+  image->Resize(wxSize(target_width, target_height), wxPoint(), 0xFF, 0xFF, 0xFF);
 #ifdef __APPLE__
-	return wxBitmap(*image, -1, gui_scale);
+  return wxBitmap(*image, -1, gui_scale);
 #else
-	return wxBitmap(*image, -1);
+  return wxBitmap(*image, -1);
 #endif
 }
 
 std::string GameListItem::GetDescription(DiscIO::IVolume::ELanguage language) const
 {
-	return GetLanguageString(language, m_descriptions);
+  return GetLanguageString(language, m_descriptions);
 }
 
 std::string GameListItem::GetDescription() const
 {
-	bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
-	return GetDescription(SConfig::GetInstance().GetCurrentLanguage(wii));
+  bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
+  return GetDescription(SConfig::GetInstance().GetCurrentLanguage(wii));
 }
 
 std::string GameListItem::GetName(DiscIO::IVolume::ELanguage language) const
 {
-	return GetLanguageString(language, m_names);
+  return GetLanguageString(language, m_names);
 }
 
 std::string GameListItem::GetName() const
 {
-	if (m_has_custom_name)
-		return m_custom_name;
-
-	bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
-	std::string name = GetName(SConfig::GetInstance().GetCurrentLanguage(wii));
-	if (!name.empty())
-		return name;
-
-	// No usable name, return filename (better than nothing)
-	std::string ext;
-	SplitPath(GetFileName(), nullptr, &name, &ext);
-	return name + ext;
+  if (m_has_custom_name)
+    return m_custom_name;
+
+  bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC;
+  std::string name = GetName(SConfig::GetInstance().GetCurrentLanguage(wii));
+  if (!name.empty())
+    return name;
+
+  // No usable name, return filename (better than nothing)
+  std::string ext;
+  SplitPath(GetFileName(), nullptr, &name, &ext);
+  return name + ext;
 }
 
 std::vector<DiscIO::IVolume::ELanguage> GameListItem::GetLanguages() const
 {
-	std::vector<DiscIO::IVolume::ELanguage> languages;
-	for (std::pair<DiscIO::IVolume::ELanguage, std::string> name : m_names)
-		languages.push_back(name.first);
-	return languages;
+  std::vector<DiscIO::IVolume::ELanguage> languages;
+  for (std::pair<DiscIO::IVolume::ELanguage, std::string> name : m_names)
+    languages.push_back(name.first);
+  return languages;
 }
 
 const std::string GameListItem::GetWiiFSPath() const
 {
-	std::unique_ptr<DiscIO::IVolume> iso(DiscIO::CreateVolumeFromFilename(m_FileName));
-	std::string ret;
+  std::unique_ptr<DiscIO::IVolume> iso(DiscIO::CreateVolumeFromFilename(m_FileName));
+  std::string ret;
 
-	if (iso == nullptr)
-		return ret;
+  if (iso == nullptr)
+    return ret;
 
-	if (iso->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC)
-	{
-		u64 title_id = 0;
-		iso->GetTitleID(&title_id);
+  if (iso->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC)
+  {
+    u64 title_id = 0;
+    iso->GetTitleID(&title_id);
 
-		const std::string path = StringFromFormat("%s/title/%08x/%08x/data/",
-				File::GetUserPath(D_WIIROOT_IDX).c_str(), (u32)(title_id >> 32), (u32)title_id);
+    const std::string path =
+        StringFromFormat("%s/title/%08x/%08x/data/", File::GetUserPath(D_WIIROOT_IDX).c_str(),
+                         (u32)(title_id >> 32), (u32)title_id);
 
-		if (!File::Exists(path))
-			File::CreateFullPath(path);
+    if (!File::Exists(path))
+      File::CreateFullPath(path);
 
-		if (path[0] == '.')
-			ret = WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR));
-		else
-			ret = path;
-	}
+    if (path[0] == '.')
+      ret = WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR));
+    else
+      ret = path;
+  }
 
-	return ret;
+  return ret;
 }