[Scummvm-cvs-logs] SF.net SVN: scummvm:[36013] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Jan 23 04:30:41 CET 2009
Revision: 36013
http://scummvm.svn.sourceforge.net/scummvm/?rev=36013&view=rev
Author: fingolfin
Date: 2009-01-23 03:30:40 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
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)
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.h
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/ps2/systemps2.h
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.h
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/system.cpp
scummvm/trunk/common/system.h
scummvm/trunk/common/util.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -181,12 +181,12 @@
#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();
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -254,8 +254,8 @@
Common::SaveFileManager *getSavefileManager();
Common::TimerManager *getTimerManager();
- virtual Common::SeekableReadStream *openConfigFileForReading();
- virtual Common::WriteStream *openConfigFileForWriting();
+ virtual Common::SeekableReadStream *createConfigReadStream();
+ virtual Common::WriteStream *createConfigWriteStream();
};
#endif
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -1312,12 +1312,12 @@
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();
}
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -178,8 +178,8 @@
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);
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -758,7 +758,7 @@
}
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 @@
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);
Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -107,8 +107,8 @@
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>(); }
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -643,12 +643,12 @@
#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();
}
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -142,7 +142,7 @@
virtual void displayMessageOnOSD(const char *msg);
- virtual Common::SeekableReadStream *openConfigFileForReading();
- virtual Common::WriteStream *openConfigFileForWriting();
+ virtual Common::SeekableReadStream *createConfigReadStream();
+ virtual Common::WriteStream *createConfigWriteStream();
};
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -384,12 +384,12 @@
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();
}
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -205,8 +205,8 @@
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;
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -123,12 +123,12 @@
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();
}
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -70,8 +70,8 @@
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
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -463,12 +463,12 @@
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();
}
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -86,8 +86,8 @@
// 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)
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/common/config-manager.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -62,7 +62,7 @@
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 @@
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 {
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/common/system.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -114,12 +114,12 @@
#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
Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/common/system.h 2009-01-23 03:30:40 UTC (rev 36013)
@@ -908,7 +908,7 @@
* 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 @@
*
* May return 0 to indicate that writing to config file is not possible.
*/
- virtual Common::WriteStream *openConfigFileForWriting();
+ virtual Common::WriteStream *createConfigWriteStream();
//@}
};
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2009-01-23 03:23:30 UTC (rev 36012)
+++ scummvm/trunk/common/util.cpp 2009-01-23 03:30:40 UTC (rev 36013)
@@ -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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list