COMMON: Renaming getDefaultIconPath() -> getDefaultIconsPath()

This commit is contained in:
Thunderforge 2022-06-21 12:16:03 -05:00 committed by Eugene Sandulenko
parent b5fac9671d
commit 9afd41b195
8 changed files with 9 additions and 9 deletions

View File

@ -261,7 +261,7 @@ Common::String OSystem_MacOSX::getDefaultLogFileName() {
return Common::String(prefix) + "/Library/Logs/scummvm.log";
}
Common::String OSystem_MacOSX::getDefaultIconPath() {
Common::String OSystem_MacOSX::getDefaultIconsPath() {
const char *prefix = getenv("HOME");
if (prefix == nullptr) {
return Common::String();

View File

@ -48,7 +48,7 @@ public:
GraphicsManagerType getDefaultGraphicsManager() const override;
#endif
Common::String getDefaultIconPath() override;
Common::String getDefaultIconsPath() override;
Common::String getScreenshotsPath() override;
protected:

View File

@ -235,7 +235,7 @@ Common::String OSystem_POSIX::getXdgUserDir(const char *name) {
return directoryPath;
}
Common::String OSystem_POSIX::getDefaultIconPath() {
Common::String OSystem_POSIX::getDefaultIconsPath() {
Common::String iconsPath;
// On POSIX systems we follow the XDG Base Directory Specification for

View File

@ -35,7 +35,7 @@ public:
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
Common::String getDefaultIconPath() override;
Common::String getDefaultIconsPath() override;
Common::String getScreenshotsPath() override;
protected:

View File

@ -302,7 +302,7 @@ void OSystem_SDL::initBackend() {
_presence = new DiscordPresence();
#endif
ConfMan.registerDefault("iconspath", this->getDefaultIconPath());
ConfMan.registerDefault("iconspath", this->getDefaultIconsPath());
_inited = true;
@ -763,7 +763,7 @@ Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
}
//Not specified in base class
Common::String OSystem_SDL::getDefaultIconPath() {
Common::String OSystem_SDL::getDefaultIconsPath() {
Common::String path = ConfMan.get("iconspath");
if (!path.empty() && !path.hasSuffix("/"))
path += "/";

View File

@ -90,7 +90,7 @@ public:
Common::TimerManager *getTimerManager() override;
Common::SaveFileManager *getSavefileManager() override;
virtual Common::String getDefaultIconPath();
virtual Common::String getDefaultIconsPath();
virtual Common::String getScreenshotsPath();
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)

View File

@ -253,7 +253,7 @@ Common::String OSystem_Win32::getSystemLanguage() const {
return OSystem_SDL::getSystemLanguage();
}
Common::String OSystem_Win32::getDefaultIconPath() {
Common::String OSystem_Win32::getDefaultIconsPath() {
TCHAR iconsPath[MAX_PATH];
if (_isPortable) {

View File

@ -48,7 +48,7 @@ public:
Common::String getSystemLanguage() const override;
Common::String getDefaultIconPath() override;
Common::String getDefaultIconsPath() override;
Common::String getScreenshotsPath() override;
protected: