Merge pull request #4401 from JosJuice/rename-getuniqueid

DiscIO/SConfig: Rename GetUniqueID to GetGameID

9 files changed, 12 insertions, 12 deletions

diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index a73a3b9bb6..44af039cba 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -37,7 +37,7 @@ public:
 
   virtual bool GetTitleID(u64*) const { return false; }
   virtual std::vector<u8> GetTMD() const { return {}; }
-  virtual std::string GetUniqueID() const = 0;
+  virtual std::string GetGameID() const = 0;
   virtual std::string GetMakerID() const = 0;
   virtual u16 GetRevision() const = 0;
   virtual std::string GetInternalName() const = 0;
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp
index f37bfb44aa..9828319c08 100644
--- a/Source/Core/DiscIO/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@@ -35,7 +35,7 @@ CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
   m_rootDirectory = ExtractDirectoryName(_rDirectory);
 
   // create the default disk header
-  SetUniqueID("AGBJ01");
+  SetGameID("AGBJ01");
   SetName("Default name");
 
   if (_bIsWii)
@@ -154,12 +154,12 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt
   return true;
 }
 
-std::string CVolumeDirectory::GetUniqueID() const
+std::string CVolumeDirectory::GetGameID() const
 {
   return std::string(m_diskHeader.begin(), m_diskHeader.begin() + MAX_ID_LENGTH);
 }
 
-void CVolumeDirectory::SetUniqueID(const std::string& id)
+void CVolumeDirectory::SetGameID(const std::string& id)
 {
   memcpy(m_diskHeader.data(), id.c_str(), std::min(id.length(), MAX_ID_LENGTH));
 }
diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h
index f83f11cc2d..f06b47fded 100644
--- a/Source/Core/DiscIO/VolumeDirectory.h
+++ b/Source/Core/DiscIO/VolumeDirectory.h
@@ -40,8 +40,8 @@ public:
 
   bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
 
-  std::string GetUniqueID() const override;
-  void SetUniqueID(const std::string& _ID);
+  std::string GetGameID() const override;
+  void SetGameID(const std::string& _ID);
 
   std::string GetMakerID() const override;
 
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 6dcbff569a..58faed4fe8 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -44,7 +44,7 @@ bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const
   return m_pReader->Read(_Offset, _Length, _pBuffer);
 }
 
-std::string CVolumeGC::GetUniqueID() const
+std::string CVolumeGC::GetGameID() const
 {
   static const std::string NO_UID("NO_UID");
   if (m_pReader == nullptr)
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index 6bf9693f7e..ca461949e2 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -27,7 +27,7 @@ public:
   CVolumeGC(std::unique_ptr<IBlobReader> reader);
   ~CVolumeGC();
   bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
-  std::string GetUniqueID() const override;
+  std::string GetGameID() const override;
   std::string GetMakerID() const override;
   u16 GetRevision() const override;
   std::string GetInternalName() const override;
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
index 90ad2045be..158be3dbca 100644
--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -74,7 +74,7 @@ Country CVolumeWAD::GetCountry() const
   return CountrySwitch(country_code);
 }
 
-std::string CVolumeWAD::GetUniqueID() const
+std::string CVolumeWAD::GetGameID() const
 {
   char GameCode[6];
   if (!Read(m_offset + 0x01E0, 4, (u8*)GameCode))
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 93980fdf1b..68fc6a7612 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -30,7 +30,7 @@ public:
   ~CVolumeWAD();
   bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
   bool GetTitleID(u64* buffer) const override;
-  std::string GetUniqueID() const override;
+  std::string GetGameID() const override;
   std::string GetMakerID() const override;
   u16 GetRevision() const override;
   std::string GetInternalName() const override { return ""; }
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
index f58b85876e..09224e04aa 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -140,7 +140,7 @@ std::vector<u8> CVolumeWiiCrypted::GetTMD() const
   return buffer;
 }
 
-std::string CVolumeWiiCrypted::GetUniqueID() const
+std::string CVolumeWiiCrypted::GetGameID() const
 {
   if (m_pReader == nullptr)
     return std::string();
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
index 74c3c4a62e..9bb449980d 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -31,7 +31,7 @@ public:
   bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
   bool GetTitleID(u64* buffer) const override;
   std::vector<u8> GetTMD() const override;
-  std::string GetUniqueID() const override;
+  std::string GetGameID() const override;
   std::string GetMakerID() const override;
   u16 GetRevision() const override;
   std::string GetInternalName() const override;