libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

COMMON: Make getDefaultConfigFileName return a Path instead of a String

Browse Source
This commit is contained in:
Le Philousophe 2023-09-02 19:22:08 +02:00 committed by Eugene Sandulenko
parent d9a8131ba2
commit 01ebece807
37 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/platform/3ds/osystem.cpp
View File

@ -167,7 +167,7 @@ void OSystem_3DS::updateConfig() {
}
}
Common::String OSystem_3DS::getDefaultConfigFileName() {
Common::Path OSystem_3DS::getDefaultConfigFileName() {
return "sdmc:/3ds/scummvm/scummvm.ini";
}

2
backends/platform/3ds/osystem.h
View File

@ -126,7 +126,7 @@ public:
virtual void fatalError();
virtual void quit();
virtual Common::String getDefaultConfigFileName();
virtual Common::Path getDefaultConfigFileName();
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority) override;
// Graphics

4
backends/platform/android/android.cpp
View File

@ -192,7 +192,7 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
_thirdPointerId(-1),
_trackball_scale(2),
_joystick_scale(10),
_defaultConfigFileName(""),
_defaultConfigFileName(),
_defaultLogFileName(),
_systemPropertiesSummaryStr(""),
_systemSDKdetectedStr(""),
@ -578,7 +578,7 @@ void OSystem_Android::initBackend() {
BaseBackend::initBackend();
}
Common::String OSystem_Android::getDefaultConfigFileName() {
Common::Path OSystem_Android::getDefaultConfigFileName() {
// if possible, skip JNI call which is more costly (performance wise)
if (_defaultConfigFileName.empty()) {
_defaultConfigFileName = JNI::getScummVMConfigPath();

4
backends/platform/android/android.h
View File

@ -165,7 +165,7 @@ private:
TouchControls _touchControls;
Common::String _defaultConfigFileName;
Common::Path _defaultConfigFileName;
Common::Path _defaultLogFileName;
Common::String _systemPropertiesSummaryStr;
Common::String _systemSDKdetectedStr;
@ -222,7 +222,7 @@ public:
Common::KeymapArray getGlobalKeymaps() override;
Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
void registerDefaultSettings(const Common::String &target) const override;

13
backends/platform/atari/osystem_atari.cpp
View File

@ -419,18 +419,15 @@ void OSystem_Atari::addSysArchivesToSearchSet(Common::SearchSet &s, int priority
#endif
}
Common::String OSystem_Atari::getDefaultConfigFileName() {
const Common::String baseConfigName = OSystem::getDefaultConfigFileName();
Common::String configFile;
Common::Path OSystem_Atari::getDefaultConfigFileName() {
const Common::Path baseConfigName = OSystem::getDefaultConfigFileName();
const char *envVar = getenv("HOME");
if (envVar && *envVar) {
configFile = envVar;
configFile += '/';
configFile += baseConfigName;
Common::Path configFile(envVar);
confgFile.joinInPlace(baseConfigName);
if (configFile.size() < MAXPATHLEN)
if (configFile.toString(Common::Path::kNativeSeparator).size() < MAXPATHLEN)
return configFile;
}

2
backends/platform/atari/osystem_atari.h
View File

@ -44,7 +44,7 @@ public:
void logMessage(LogMessageType::Type type, const char *message) override;
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority) override;
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
void update();

5
backends/platform/ios7/ios7_osys_main.cpp
View File

@ -418,9 +418,8 @@ OSystem_iOS7 *OSystem_iOS7::sharedInstance() {
return instance;
}
Common::String OSystem_iOS7::getDefaultConfigFileName() {
Common::String path = "/Preferences";
return path;
Common::Path OSystem_iOS7::getDefaultConfigFileName() {
return Common::Path("/Preferences");
}
void OSystem_iOS7::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {

2
backends/platform/ios7/ios7_osys_main.h
View File

@ -142,7 +142,7 @@ public:
void startSoundsystem();
void stopSoundsystem();
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
void logMessage(LogMessageType::Type type, const char *message) override;
void fatalError() override;

2
backends/platform/libretro/include/libretro-os.h
View File

@ -161,7 +161,7 @@ public:
/* Utils */
void getTimeAndDate(TimeDate &t, bool skipRecord) const override;
Audio::Mixer *getMixer(void) override;
Common::String getDefaultConfigFileName(void) override;
Common::Path getDefaultConfigFileName(void) override;
void logMessage(LogMessageType::Type type, const char *message) override;
int testGame(const char *filedata, bool autodetect);
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override {}

6
backends/platform/libretro/src/libretro-os-utils.cpp
View File

@ -55,11 +55,11 @@ void OSystem_libretro::getTimeAndDate(TimeDate &t, bool skipRecord) const {
t.tm_mday = dayno + 1;
}
Common::String OSystem_libretro::getDefaultConfigFileName() {
Common::Path OSystem_libretro::getDefaultConfigFileName() {
if (s_systemDir.empty())
return Common::String("scummvm.ini");
return Common::Path("scummvm.ini");
else
return s_systemDir + "/scummvm.ini";
return Common::Path(s_systemDir).appendComponent("scummvm.ini");
}
void OSystem_libretro::logMessage(LogMessageType::Type type, const char *message) {

2
backends/platform/psp/osys_psp.cpp
View File

@ -437,6 +437,6 @@ void OSystem_PSP::getTimeAndDate(TimeDate &td, bool skipRecord) const {
td.tm_wday = t.tm_wday;
}
Common::String OSystem_PSP::getDefaultConfigFileName() {
Common::Path OSystem_PSP::getDefaultConfigFileName() {
return "ms0:/scummvm.ini";
}

2
backends/platform/psp/osys_psp.h
View File

@ -141,7 +141,7 @@ public:
void logMessage(LogMessageType::Type type, const char *message);
virtual Common::String getDefaultConfigFileName();
virtual Common::Path getDefaultConfigFileName();
};
#endif /* OSYS_PSP_H */

2
backends/platform/samsungtv/samsungtv.cpp
View File

@ -53,7 +53,7 @@ void OSystem_SDL_SamsungTV::fatalError() {
for (;;) {}
}
Common::String OSystem_SDL_SamsungTV::getDefaultConfigFileName() {
Common::Path OSystem_SDL_SamsungTV::getDefaultConfigFileName() {
return "/mtd_rwarea/.scummvmrc";
}

2
backends/platform/samsungtv/samsungtv.h
View File

@ -34,7 +34,7 @@ public:
virtual bool hasFeature(Feature f);
protected:
virtual Common::String getDefaultConfigFileName();
virtual Common::Path getDefaultConfigFileName();
virtual Common::Path getDefaultLogFileName();
};

4
backends/platform/sdl/kolibrios/kolibrios.cpp
View File

@ -85,8 +85,8 @@ void OSystem_KolibriOS::initBackend() {
OSystem_SDL::initBackend();
}
Common::String OSystem_KolibriOS::getDefaultConfigFileName() {
return _writablePath.join("scummvm.ini").toString();
Common::Path OSystem_KolibriOS::getDefaultConfigFileName() {
return _writablePath.join("scummvm.ini");
}
Common::String OSystem_KolibriOS::getDefaultIconsPath() {

2
backends/platform/sdl/kolibrios/kolibrios.h
View File

@ -38,7 +38,7 @@ public:
const Common::Path& getExePath() const { return _exePath; }
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
AudioCDManager *createAudioCDManager() override;

7
backends/platform/sdl/macosx/macosx.cpp
View File

@ -220,17 +220,16 @@ Common::String OSystem_MacOSX::getSystemLanguage() const {
#endif // USE_DETECTLANG
}
Common::String OSystem_MacOSX::getDefaultConfigFileName() {
Common::Path OSystem_MacOSX::getDefaultConfigFileName() {
const Common::String baseConfigName = "Library/Preferences/" + getMacBundleName() + " Preferences";
Common::String configFile;
Common::Path configFile;
Common::String prefix = getenv("HOME");
if (!prefix.empty() && (prefix.size() + 1 + baseConfigName.size()) < MAXPATHLEN) {
configFile = prefix;
configFile += '/';
configFile += baseConfigName;
configFile.joinInPlace(baseConfigName);
} else {
configFile = baseConfigName;
}

2
backends/platform/sdl/macosx/macosx.h
View File

@ -55,7 +55,7 @@ public:
Common::String getScreenshotsPath() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
// Override createAudioCDManager() to get our Mac-specific

2
backends/platform/sdl/miyoo/miyoo.cpp
View File

@ -198,7 +198,7 @@ void OSystem_SDL_Miyoo::initBackend() {
OSystem_SDL::initBackend();
}
Common::String OSystem_SDL_Miyoo::getDefaultConfigFileName() {
Common::Path OSystem_SDL_Miyoo::getDefaultConfigFileName() {
return CONFIG_FILE;
}

2
backends/platform/sdl/miyoo/miyoo.h
View File

@ -35,7 +35,7 @@ public:
Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
};

2
backends/platform/sdl/opendingux/opendingux.cpp
View File

@ -173,7 +173,7 @@ void OSystem_SDL_Opendingux::initBackend() {
OSystem_SDL::initBackend();
}
Common::String OSystem_SDL_Opendingux::getDefaultConfigFileName() {
Common::Path OSystem_SDL_Opendingux::getDefaultConfigFileName() {
return CONFIG_FILE;
}

2
backends/platform/sdl/opendingux/opendingux.h
View File

@ -35,7 +35,7 @@ public:
Common::KeymapperDefaultBindings *getKeymapperDefaultBindings() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
};

2
backends/platform/sdl/posix/posix.cpp
View File

@ -111,7 +111,7 @@ bool OSystem_POSIX::hasFeature(Feature f) {
return OSystem_SDL::hasFeature(f);
}
Common::String OSystem_POSIX::getDefaultConfigFileName() {
Common::Path OSystem_POSIX::getDefaultConfigFileName() {
const Common::String baseConfigName = "scummvm.ini";
Common::String configFile;

2
backends/platform/sdl/posix/posix.h
View File

@ -41,7 +41,7 @@ public:
Common::String getScreenshotsPath() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
Common::String getXdgUserDir(const char *name);

2
backends/platform/sdl/ps3/ps3.cpp
View File

@ -104,7 +104,7 @@ void OSystem_PS3::initBackend() {
OSystem_SDL::initBackend();
}
Common::String OSystem_PS3::getDefaultConfigFileName() {
Common::Path OSystem_PS3::getDefaultConfigFileName() {
return PREFIX "/scummvm.ini";
}

2
backends/platform/sdl/ps3/ps3.h
View File

@ -32,7 +32,7 @@ public:
Common::HardwareInputSet *getHardwareInputSet() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
};

2
backends/platform/sdl/psp2/psp2.cpp
View File

@ -182,7 +182,7 @@ void OSystem_PSP2::logMessage(LogMessageType::Type type, const char *message) {
#endif
}
Common::String OSystem_PSP2::getDefaultConfigFileName() {
Common::Path OSystem_PSP2::getDefaultConfigFileName() {
return "ux0:data/scummvm/scummvm.ini";
}

2
backends/platform/sdl/psp2/psp2.h
View File

@ -38,7 +38,7 @@ public:
Common::HardwareInputSet *getHardwareInputSet() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
};

2
backends/platform/sdl/riscos/riscos.cpp
View File

@ -151,7 +151,7 @@ void OSystem_RISCOS::messageBox(LogMessageType::Type type, const char *message)
_kernel_swi(Wimp_ReportError, &regs, &regs);
}
Common::String OSystem_RISCOS::getDefaultConfigFileName() {
Common::Path OSystem_RISCOS::getDefaultConfigFileName() {
return "/<Choices$Write>/ScummVM/scummvmrc";
}

2
backends/platform/sdl/riscos/riscos.h
View File

@ -37,7 +37,7 @@ public:
virtual void messageBox(LogMessageType::Type type, const char *message);
protected:
virtual Common::String getDefaultConfigFileName();
virtual Common::Path getDefaultConfigFileName();
virtual Common::Path getDefaultLogFileName();
};

4
backends/platform/sdl/win32/win32.cpp
View File

@ -327,7 +327,7 @@ Common::String OSystem_Win32::getScreenshotsPath() {
return Win32::tcharToString(picturesPath);
}
Common::String OSystem_Win32::getDefaultConfigFileName() {
Common::Path OSystem_Win32::getDefaultConfigFileName() {
TCHAR configFile[MAX_PATH];
// if this is the first time the default config file name is requested
@ -374,7 +374,7 @@ Common::String OSystem_Win32::getDefaultConfigFileName() {
}
}
return Win32::tcharToString(configFile);
return Common::Path(Win32::tcharToString(configFile), Common::Path::kNativeSeparator);
}
Common::Path OSystem_Win32::getDefaultLogFileName() {

2
backends/platform/sdl/win32/win32.h
View File

@ -54,7 +54,7 @@ public:
Common::String getScreenshotsPath() override;
protected:
Common::String getDefaultConfigFileName() override;
Common::Path getDefaultConfigFileName() override;
Common::Path getDefaultLogFileName() override;
// Override createAudioCDManager() to get our Windows-specific

14
common/config-manager.cpp
View File

@ -78,7 +78,7 @@ void ConfigManager::copyFrom(ConfigManager &source) {
}
bool ConfigManager::loadDefaultConfigFile(const String &fallbackFilename) {
bool ConfigManager::loadDefaultConfigFile(const Path &fallbackFilename) {
// Open the default config file
assert(g_system);
SeekableReadStream *stream = g_system->createConfigReadStream();
@ -103,22 +103,22 @@ bool ConfigManager::loadDefaultConfigFile(const String &fallbackFilename) {
return loadResult;
}
bool ConfigManager::loadConfigFile(const String &filename, const String &fallbackFilename) {
bool ConfigManager::loadConfigFile(const Path &filename, const Path &fallbackFilename) {
_filename = filename;
FSNode node(filename);
File cfg_file;
if (!cfg_file.open(node)) {
if (!loadFallbackConfigFile(fallbackFilename))
debug("Creating configuration file: %s", filename.c_str());
debug("Creating configuration file: %s", filename.toString(Common::Path::kNativeSeparator).c_str());
} else {
debug("Using configuration file: %s", _filename.c_str());
debug("Using configuration file: %s", _filename.toString(Common::Path::kNativeSeparator).c_str());
return loadFromStream(cfg_file);
}
return true;
}
bool ConfigManager::loadFallbackConfigFile(const String &filename) {
bool ConfigManager::loadFallbackConfigFile(const Path &filename) {
if (filename.empty())
return false;
@ -126,7 +126,7 @@ bool ConfigManager::loadFallbackConfigFile(const String &filename) {
if (!fallbackFile.open(FSNode(filename)))
return false;
debug("Using initial configuration file: %s", filename.c_str());
debug("Using initial configuration file: %s", filename.toString(Common::Path::kNativeSeparator).c_str());
loadFromStream(fallbackFile);
return true;
}
@ -298,7 +298,7 @@ void ConfigManager::flushToDisk() {
assert(dump);
if (!dump->open(_filename)) {
warning("Unable to write configuration file: %s", _filename.c_str());
warning("Unable to write configuration file: %s", _filename.toString(Common::Path::kNativeSeparator).c_str());
delete dump;
return;
}

10
common/config-manager.h
View File

@ -126,8 +126,8 @@ public:
static char const *const kCloudDomain;
#endif
bool loadDefaultConfigFile(const String &fallbackFilename); /*!< Load the default configuration file. */
bool loadConfigFile(const String &filename, const String &fallbackFilename); /*!< Load a specific configuration file. */
bool loadDefaultConfigFile(const Path &fallbackFilename); /*!< Load the default configuration file. */
bool loadConfigFile(const Path &filename, const Path &fallbackFilename); /*!< Load a specific configuration file. */
/**
* Retrieve the config domain with the given name.
@ -222,7 +222,7 @@ public:
DomainMap::iterator beginGameDomains() { return _gameDomains.begin(); } /*!< Return the beginning position of game domains. */
DomainMap::iterator endGameDomains() { return _gameDomains.end(); } /*!< Return the ending position of game domains. */
const String &getCustomConfigFileName() { return _filename; } /*!< Return the custom config file being used, or an empty string when using the default config file */
const Path &getCustomConfigFileName() { return _filename; } /*!< Return the custom config file being used, or an empty string when using the default config file */
static void defragment(); /*!< Move the configuration in memory to reduce fragmentation. */
void copyFrom(ConfigManager &source); /*!< Copy from a ConfigManager instance. */
@ -231,7 +231,7 @@ private:
friend class Singleton<SingletonBaseType>;
ConfigManager();
bool loadFallbackConfigFile(const String &filename);
bool loadFallbackConfigFile(const Path &filename);
bool loadFromStream(SeekableReadStream &stream);
void addDomain(const String &domainName, const Domain &domain);
void writeDomain(WriteStream &stream, const String &name, const Domain &domain);
@ -256,7 +256,7 @@ private:
String _activeDomainName;
Domain * _activeDomain;
String _filename;
Path _filename;
};
/** @} */

2
common/system.cpp
View File

@ -242,7 +242,7 @@ Common::WriteStream *OSystem::createConfigWriteStream() {
#endif
}
Common::String OSystem::getDefaultConfigFileName() {
Common::Path OSystem::getDefaultConfigFileName() {
return "scummvm.ini";
}

2
common/system.h
View File

@ -1803,7 +1803,7 @@ public:
*
* Note that not all ports can use this.
*/
virtual Common::String getDefaultConfigFileName();
virtual Common::Path getDefaultConfigFileName();
/**
* Get the default file name (or even path) where the scummvm.log

6
gui/options.cpp
View File

@ -2480,15 +2480,15 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
new ButtonWidget(boss, prefix + "PluginsButton", _("Plugins Path:"), Common::U32String(), kChoosePluginsDirCmd);
else
new ButtonWidget(boss, prefix + "PluginsButton", _c("Plugins Path:", "lowres"), Common::U32String(), kChoosePluginsDirCmd);
_pluginsPath = new StaticTextWidget(boss, prefix + "PluginsPath", _c("None", "path"));
_pluginsPath = new PathWidget(boss, prefix + "PluginsPath", Common::Path(), _c("None", "path"));
_pluginsPathClearButton = addClearButton(boss, "GlobalOptions_Paths.PluginsPathClearButton", kPluginsPathClearCmd);
#endif // DYNAMIC_MODULES
#endif // !defined(__DC__)
Common::U32String confPath = ConfMan.getCustomConfigFileName();
Common::U32String confPath = ConfMan.getCustomConfigFileName().toString(Common::Path::kNativeSeparator);
if (confPath.empty())
confPath = g_system->getDefaultConfigFileName();
confPath = g_system->getDefaultConfigFileName().toString(Common::Path::kNativeSeparator);
StaticTextWidget *configPathWidget = new StaticTextWidget(boss, prefix + "ConfigPath", _("ScummVM config path: ") + confPath, confPath);
if (ConfMan.isKeyTemporary("config"))
configPathWidget->setFontColor(ThemeEngine::FontColor::kFontColorOverride);