From aa0c0f494fbaffb29f93bf14297d9e1ac7625f8c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 25 Oct 2022 13:54:27 +0300 Subject: [PATCH] ENGINES: Pass const strings by reference in AdvancedMetaEngineDetection --- engines/advancedDetector.cpp | 8 ++++---- engines/advancedDetector.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index 8e72a9703a1..6f455e0e69e 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -517,9 +517,9 @@ static char flagsToMD5Prefix(uint32 flags) { return 'f'; } -static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps); +static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps); -bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const { +bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const { Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes); if (MD5Man.contains(hashname)) { @@ -538,11 +538,11 @@ bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, con return res; } -bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const { +bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const { return getFilePropertiesIntern(md5Bytes, allFiles, game, fname, fileProps); } -static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) { +static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) { if (game.flags & ADGF_MACRESFORK) { FileMapArchive fileMapArchive(allFiles); diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 0b74dbb0b34..5aa2e5046de 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -460,7 +460,7 @@ protected: void composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth, const Common::String &parentName = Common::String()) const; /** Get the properties (size and MD5) of this file. */ - bool getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const; + bool getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const; /** Convert an AD game description into the shared game description format. */ virtual DetectedGame toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo = nullptr) const; @@ -529,7 +529,7 @@ public: * * Based on @ref MetaEngine::getFileProperties. */ - bool getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const; + bool getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const; }; /**