diff options
| author | waddlesplash <waddlesplash@gmail.com> | 2015-11-25 23:05:43 -0500 |
|---|---|---|
| committer | waddlesplash <waddlesplash@gmail.com> | 2015-11-25 23:16:54 -0500 |
| commit | 4acd90d570be16c8e5bd8737238a681c43aa8358 (patch) | |
| tree | ccfe3d34374e82902adbf98b90000e9cbd3602f2 /Source/Core/DolphinQt/GameList/GameFile.cpp | |
| parent | 662e4fcca061e3fe67a5d529fee5cbceee741797 (diff) | |
DolphinQt: Get rid of unneeded abbreviation macros.
Diffstat (limited to 'Source/Core/DolphinQt/GameList/GameFile.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/GameList/GameFile.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index 845487b68e..4cc6b9a328 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -23,7 +23,6 @@ #include "DiscIO/VolumeCreator.h" #include "DolphinQt/GameList/GameFile.h" -#include "DolphinQt/Utils/Utils.h" static const u32 CACHE_REVISION = 0x00D; // Last changed in PR 3097 static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2 @@ -66,7 +65,7 @@ static QString GetLanguageString(DiscIO::IVolume::ELanguage language, QMap<DiscI if (!strings.empty()) return strings.cbegin().value(); - return SL(""); + return QStringLiteral(""); } GameFile::GameFile(const QString& fileName) @@ -147,12 +146,12 @@ GameFile::GameFile(const QString& fileName) // files with the same name as the main file is provided as an alternative for those who want to have // multiple files in one folder instead of having a Homebrew Channel-style folder structure. - if (!ReadXML(directory.filePath(info.baseName() + SL(".xml")))) - ReadXML(directory.filePath(SL("meta.xml"))); + if (!ReadXML(directory.filePath(info.baseName() + QStringLiteral(".xml")))) + ReadXML(directory.filePath(QStringLiteral("meta.xml"))); - QImage banner(directory.filePath(info.baseName() + SL(".png"))); + QImage banner(directory.filePath(info.baseName() + QStringLiteral(".png"))); if (banner.isNull()) - banner.load(directory.filePath(SL("icon.png"))); + banner.load(directory.filePath(QStringLiteral("icon.png"))); if (!banner.isNull()) m_banner = QPixmap::fromImage(banner); } @@ -263,7 +262,7 @@ QString GameFile::CreateCacheFilename() const SplitPath(m_file_name.toStdString(), &pathname, &filename, &extension); if (filename.empty()) - return SL(""); // must be a disc drive + return QStringLiteral(""); // must be a disc drive // Filename.extension_HashOfFolderPath_Size.cache // Append hash to prevent ISO name-clashing in different folders. @@ -306,21 +305,21 @@ bool GameFile::ReadXML(const QString& file_path) return false; QXmlStreamReader reader(&file); - if (reader.readNextStartElement() && reader.name() == SL("app")) + if (reader.readNextStartElement() && reader.name() == QStringLiteral("app")) { while (reader.readNextStartElement()) { QStringRef name = reader.name(); - if (name == SL("name")) + if (name == QStringLiteral("name")) { m_short_names = { { DiscIO::IVolume::LANGUAGE_UNKNOWN, reader.readElementText() } }; m_long_names = m_short_names; } - else if (name == SL("short_description")) + else if (name == QStringLiteral("short_description")) { m_descriptions = { { DiscIO::IVolume::LANGUAGE_UNKNOWN, reader.readElementText() } }; } - else if (name == SL("coder")) + else if (name == QStringLiteral("coder")) { m_company = reader.readElementText(); } |
