libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 03:31:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed OSystem::openConfigFileForReading & openConfigFileForWriting to createConfigReadStream & createConfigWriteStream, in order to make it clear that the *caller* is responsible for deleting the streams (i.e., 'owns' them)

Browse Source 
svn-id: r36013
This commit is contained in:
Max Horn 2009-01-23 03:30:40 +00:00
parent 3e7155981e
commit e4b013f616
18 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backends/platform/PalmOS/Src/be_base.cpp
View File

@ -181,12 +181,12 @@ Common::TimerManager *OSystem_PalmBase::getTimerManager() {
#define PALMOS_CONFIG_FILE "/PALM/Programs/ScummVM/scummvm.ini"
Common::SeekableReadStream *OSystem_PalmBase::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_PalmBase::createConfigReadStream() {
Common::FSNode file(PALMOS_CONFIG_FILE);
return file.openForReading();
}
Common::WriteStream *OSystem_PalmBase::openConfigFileForWriting() {
Common::WriteStream *OSystem_PalmBase::createConfigWriteStream() {
Common::FSNode file(PALMOS_CONFIG_FILE);
return file.openForWriting();
}

4
backends/platform/PalmOS/Src/be_base.h
View File

@ -254,8 +254,8 @@ public:
Common::SaveFileManager *getSavefileManager();
Common::TimerManager *getTimerManager();
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
};
#endif

4
backends/platform/iphone/osys_iphone.cpp
View File

@ -1312,12 +1312,12 @@ OSystem *OSystem_IPHONE_create() {
return new OSystem_IPHONE();
}
Common::SeekableReadStream *OSystem_IPHONE::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_IPHONE::createConfigReadStream() {
Common::FSNode file(SCUMMVM_PREFS_PATH);
return file.openForReading();
}
Common::WriteStream *OSystem_IPHONE::openConfigFileForWriting() {
Common::WriteStream *OSystem_IPHONE::createConfigWriteStream() {
Common::FSNode file(SCUMMVM_PREFS_PATH);
return file.openForWriting();
}

4
backends/platform/iphone/osys_iphone.h
View File

@ -178,8 +178,8 @@ public:
void startSoundsystem();
void stopSoundsystem();
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
protected:
inline void addDirtyRect(int16 x1, int16 y1, int16 w, int16 h);

6
backends/platform/ps2/systemps2.cpp
View File

@ -758,7 +758,7 @@ void OSystem_PS2::quit(void) {
}
void OSystem_PS2::makeConfigPath(char *dest) {
// FIXME: Maybe merge this method into openConfigFileForReading/openConfigFileForWriting ?
// FIXME: Maybe merge this method into createConfigReadStream/createConfigWriteStream ?
FILE *handle;
strcpy(dest, "cdfs:/ScummVM.ini");
handle = ps2_fopen(dest, "r");
@ -772,14 +772,14 @@ void OSystem_PS2::makeConfigPath(char *dest) {
strcpy(dest, "mc0:ScummVM/scummvm.ini");
}
Common::SeekableReadStream *OSystem_PS2::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_PS2::createConfigReadStream() {
char configFile[MAXPATHLEN];
makeConfigPath(configFile);
Common::FSNode file(configFile);
return file.openForReading();
}
Common::WriteStream *OSystem_PS2::openConfigFileForWriting() {
Common::WriteStream *OSystem_PS2::createConfigWriteStream() {
char configFile[MAXPATHLEN];
makeConfigPath(configFile);
Common::FSNode file(configFile);

4
backends/platform/ps2/systemps2.h
View File

@ -107,8 +107,8 @@ public:
virtual void quit();
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<555>(); }

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

@ -643,12 +643,12 @@ void OSystem_PSP::displayMessageOnOSD(const char *msg) {
#define PSP_CONFIG_FILE "ms0:/scummvm.ini"
Common::SeekableReadStream *OSystem_PSP::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_PSP::createConfigReadStream() {
Common::FSNode file(PSP_CONFIG_FILE);
return file.openForReading();
}
Common::WriteStream *OSystem_PSP::openConfigFileForWriting() {
Common::WriteStream *OSystem_PSP::createConfigWriteStream() {
Common::FSNode file(PSP_CONFIG_FILE);
return file.openForWriting();
}

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

@ -142,7 +142,7 @@ public:
virtual void displayMessageOnOSD(const char *msg);
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
};

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

@ -384,12 +384,12 @@ static Common::String getDefaultConfigFileName() {
return configFile;
}
Common::SeekableReadStream *OSystem_SDL::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_SDL::createConfigReadStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForReading();
}
Common::WriteStream *OSystem_SDL::openConfigFileForWriting() {
Common::WriteStream *OSystem_SDL::createConfigWriteStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForWriting();
}

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

@ -205,8 +205,8 @@ public:
virtual FilesystemFactory *getFilesystemFactory();
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
protected:
bool _inited;

4
backends/platform/symbian/src/SymbianOS.cpp
View File

@ -123,12 +123,12 @@ static Common::String getDefaultConfigFileName() {
return configFile;
}
Common::SeekableReadStream *OSystem_SDL_Symbian::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_SDL_Symbian::createConfigReadStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForReading();
}
Common::WriteStream *OSystem_SDL_Symbian::openConfigFileForWriting() {
Common::WriteStream *OSystem_SDL_Symbian::createConfigWriteStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForWriting();
}

4
backends/platform/symbian/src/SymbianOS.h
View File

@ -70,8 +70,8 @@ protected:
static void symbianMixCallback(void *s, byte *samples, int len);
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
public:
// vibration support
#ifdef USE_VIBRA_SE_PXXX

4
backends/platform/wince/wince-sdl.cpp
View File

@ -463,12 +463,12 @@ static Common::String getDefaultConfigFileName() {
return configFile;
}
Common::SeekableReadStream *OSystem_WINCE3::openConfigFileForReading() {
Common::SeekableReadStream *OSystem_WINCE3::createConfigReadStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForReading();
}
Common::WriteStream *OSystem_WINCE3::openConfigFileForWriting() {
Common::WriteStream *OSystem_WINCE3::createConfigWriteStream() {
Common::FSNode file(getDefaultConfigFileName());
return file.openForWriting();
}

4
backends/platform/wince/wince-sdl.h
View File

@ -86,8 +86,8 @@ public:
// Overloaded from OSystem
//void engineInit();
void getTimeAndDate(struct tm &t) const;
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
// Overloaded from SDL_Common (FIXME)

4
common/config-manager.cpp
View File

@ -62,7 +62,7 @@ ConfigManager::ConfigManager()
void ConfigManager::loadDefaultConfigFile() {
// Open the default config file
SeekableReadStream *stream = g_system->openConfigFileForReading();
SeekableReadStream *stream = g_system->createConfigReadStream();
_filename.clear(); // clear the filename to indicate that we are using the default config file
// ... load it, if available ...
@ -190,7 +190,7 @@ void ConfigManager::flushToDisk() {
if (_filename.empty()) {
// Write to the default config file
stream = g_system->openConfigFileForWriting();
stream = g_system->createConfigWriteStream();
if (!stream) // If writing to the config file is not possible, do nothing
return;
} else {

4
common/system.cpp
View File

@ -114,12 +114,12 @@ void OSystem::clearScreen() {
#define DEFAULT_CONFIG_FILE "scummvm.ini"
#endif
Common::SeekableReadStream *OSystem::openConfigFileForReading() {
Common::SeekableReadStream *OSystem::createConfigReadStream() {
Common::FSNode file(DEFAULT_CONFIG_FILE);
return file.openForReading();
}
Common::WriteStream *OSystem::openConfigFileForWriting() {
Common::WriteStream *OSystem::createConfigWriteStream() {
#ifdef __DC__
return 0;
#else

4
common/system.h
View File

@ -908,7 +908,7 @@ public:
* ReadStream instance. It is the callers responsiblity to delete
* the stream after use.
*/
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::SeekableReadStream *createConfigReadStream();
/**
* Open the default config file for writing, by returning a suitable
@ -917,7 +917,7 @@ public:
*
* May return 0 to indicate that writing to config file is not possible.
*/
virtual Common::WriteStream *openConfigFileForWriting();
virtual Common::WriteStream *createConfigWriteStream();
//@}
};

2
common/util.cpp
View File

@ -27,6 +27,8 @@
#include "common/system.h"
#include "gui/debugger.h"
#include <stdarg.h> // For va_list etc.
#ifdef _WIN32_WCE
// This is required for the debugger attachment
extern bool isSmartphone(void);