From 01e324eed04a4d497f9b953ec4af88ce64fc6e6a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 13 Jun 2015 18:43:10 +0200 Subject: [PATCH] Move GetCompany() to ISOFile.h/GameFile.h For consistency with the other Get methods. --- Source/Core/DolphinQt/GameList/GameFile.cpp | 5 ----- Source/Core/DolphinQt/GameList/GameFile.h | 2 +- Source/Core/DolphinWX/ISOFile.cpp | 5 ----- Source/Core/DolphinWX/ISOFile.h | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index d1a5f5fc99..a89b5ce9ad 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -247,11 +247,6 @@ QString GameFile::CreateCacheFilename() return fullname; } -QString GameFile::GetCompany() const -{ - return m_company; -} - QString GameFile::GetDescription(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_descriptions); diff --git a/Source/Core/DolphinQt/GameList/GameFile.h b/Source/Core/DolphinQt/GameList/GameFile.h index 30ea33d50d..00e79c7720 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.h +++ b/Source/Core/DolphinQt/GameList/GameFile.h @@ -26,7 +26,7 @@ public: QString GetName(bool prefer_long) const; QString GetDescription(DiscIO::IVolume::ELanguage language) const; QString GetDescription() const; - QString GetCompany() const; + QString GetCompany() const { return m_company; } u16 GetRevision() const { return m_revision; } const QString GetUniqueID() const { return m_unique_id; } const QString GetWiiFSPath() const; diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index e823b90aa0..a7a4706fad 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -201,11 +201,6 @@ std::string GameListItem::CreateCacheFilename() return fullname; } -std::string GameListItem::GetCompany() const -{ - return m_company; -} - std::string GameListItem::GetDescription(DiscIO::IVolume::ELanguage language) const { return GetLanguageString(language, m_descriptions); diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index 1b7f5dd09e..f2a843cf67 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -30,7 +30,7 @@ public: std::string GetDescription(DiscIO::IVolume::ELanguage language) const; std::string GetDescription() const; std::vector GetLanguages() const; - std::string GetCompany() const; + std::string GetCompany() const { return m_company; } u16 GetRevision() const { return m_Revision; } const std::string& GetUniqueID() const {return m_UniqueID;} const std::string GetWiiFSPath() const;