Merge pull request #2402 from JosJuice/internal-title

Volume: Rename GetName to GetInternalName

8 files changed, 9 insertions, 9 deletions

diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index c0fea6ccc4..4db19e325b 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -76,7 +76,7 @@ public:
 	virtual std::string GetUniqueID() const = 0;
 	virtual std::string GetMakerID() const = 0;
 	virtual int GetRevision() const = 0;
-	virtual std::string GetName() const = 0;
+	virtual std::string GetInternalName() const = 0;
 	virtual std::map<ELanguage, std::string> GetNames() const = 0;
 	virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
 	virtual std::string GetCompany() const { return std::string(); }
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp
index 876848b2d3..846d737ca1 100644
--- a/Source/Core/DiscIO/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@@ -182,7 +182,7 @@ std::string CVolumeDirectory::GetMakerID() const
 	return "VOID";
 }
 
-std::string CVolumeDirectory::GetName() const
+std::string CVolumeDirectory::GetInternalName() const
 {
 	char name[0x60];
 	if (Read(0x20, 0x60, (u8*)name, false))
@@ -194,7 +194,7 @@ std::string CVolumeDirectory::GetName() const
 std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetNames() const
 {
 	std::map<IVolume::ELanguage, std::string> names;
-	std::string name = GetName();
+	std::string name = GetInternalName();
 	if (!name.empty())
 		names[IVolume::ELanguage::LANGUAGE_UNKNOWN] = name;
 	return names;
diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h
index 7187e8a017..45355cb192 100644
--- a/Source/Core/DiscIO/VolumeDirectory.h
+++ b/Source/Core/DiscIO/VolumeDirectory.h
@@ -40,7 +40,7 @@ public:
 	std::string GetMakerID() const override;
 
 	int GetRevision() const override { return 0; }
-	std::string GetName() const override;
+	std::string GetInternalName() const override;
 	std::map<IVolume::ELanguage, std::string> GetNames() const override;
 	void SetName(const std::string&);
 
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index dd18338f63..efac5e8dfe 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -96,7 +96,7 @@ int CVolumeGC::GetRevision() const
 	return revision;
 }
 
-std::string CVolumeGC::GetName() const
+std::string CVolumeGC::GetInternalName() const
 {
 	char name[0x60];
 	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index 3c4abcba31..8820599df9 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -28,7 +28,7 @@ public:
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
 	int GetRevision() const override;
-	virtual std::string GetName() const override;
+	virtual std::string GetInternalName() const override;
 	std::map<ELanguage, std::string> GetNames() const override;
 	std::map<ELanguage, std::string> GetDescriptions() const override;
 	std::string GetCompany() const override;
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 229ec6d31b..37294c650a 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -31,7 +31,7 @@ public:
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
 	int GetRevision() const override;
-	std::string GetName() const override { return ""; }
+	std::string GetInternalName() const override { return ""; }
 	std::map<IVolume::ELanguage, std::string> GetNames() const override;
 	u32 GetFSTSize() const override { return 0; }
 	std::string GetApploaderDate() const override { return ""; }
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
index 7657c0a28d..1e738bc50c 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -193,7 +193,7 @@ int CVolumeWiiCrypted::GetRevision() const
 	return revision;
 }
 
-std::string CVolumeWiiCrypted::GetName() const
+std::string CVolumeWiiCrypted::GetInternalName() const
 {
 	char name_buffer[0x60];
 	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name_buffer, false))
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
index 11092c33d1..9b387b5e65 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -31,7 +31,7 @@ public:
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
 	int GetRevision() const override;
-	std::string GetName() const override;
+	std::string GetInternalName() const override;
 	std::map<IVolume::ELanguage, std::string> GetNames() const override;
 	u32 GetFSTSize() const override;
 	std::string GetApploaderDate() const override;