diff options
author | Eugene Sandulenko | 2010-09-02 17:11:45 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 23:32:32 +0000 |
commit | 06bce68860696f67f0a0ac1e9682635081918801 (patch) | |
tree | aa64e048a3c8870f5305db8f112194ab874409d5 /engines/sword25/input | |
parent | 086f5961b6575c50bb386750b6e9a3ed1efdd8cd (diff) | |
download | scummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.tar.gz scummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.tar.bz2 scummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.zip |
SWORD25: Comply to the code conventions for several classes
svn-id: r53310
Diffstat (limited to 'engines/sword25/input')
-rw-r--r-- | engines/sword25/input/scummvminput.cpp | 22 | ||||
-rw-r--r-- | engines/sword25/input/scummvminput.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/sword25/input/scummvminput.cpp b/engines/sword25/input/scummvminput.cpp index 0b8f4fbb66..34763b0125 100644 --- a/engines/sword25/input/scummvminput.cpp +++ b/engines/sword25/input/scummvminput.cpp @@ -335,27 +335,27 @@ void ScummVMInput::ReportCommand(KEY_COMMANDS Command) { // Persistenz // ----------------------------------------------------------------------------- -bool ScummVMInput::Persist(OutputPersistenceBlock &Writer) { +bool ScummVMInput::persist(OutputPersistenceBlock &writer) { // Anzahl an Command-Callbacks persistieren. - Writer.Write(m_CommandCallbacks.size()); + writer.write(m_CommandCallbacks.size()); // Alle Command-Callbacks einzeln persistieren. { Common::List<CommandCallback>::const_iterator It = m_CommandCallbacks.begin(); while (It != m_CommandCallbacks.end()) { - Writer.Write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); + writer.write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); ++It; } } // Anzahl an Character-Callbacks persistieren. - Writer.Write(m_CharacterCallbacks.size()); + writer.write(m_CharacterCallbacks.size()); // Alle Character-Callbacks einzeln persistieren. { Common::List<CharacterCallback>::const_iterator It = m_CharacterCallbacks.begin(); while (It != m_CharacterCallbacks.end()) { - Writer.Write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); + writer.write(CallbackRegistry::getInstance().resolveCallbackPointer(*It)); ++It; } } @@ -365,18 +365,18 @@ bool ScummVMInput::Persist(OutputPersistenceBlock &Writer) { // ----------------------------------------------------------------------------- -bool ScummVMInput::Unpersist(InputPersistenceBlock &Reader) { +bool ScummVMInput::unpersist(InputPersistenceBlock &reader) { // Command-Callbackliste leeren. m_CommandCallbacks.clear(); // Anzahl an Command-Callbacks lesen. uint CommandCallbackCount; - Reader.Read(CommandCallbackCount); + reader.read(CommandCallbackCount); // Alle Command-Callbacks wieder herstellen. for (uint i = 0; i < CommandCallbackCount; ++i) { Common::String CallbackFunctionName; - Reader.Read(CallbackFunctionName); + reader.read(CallbackFunctionName); m_CommandCallbacks.push_back(reinterpret_cast<CommandCallback>( CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); @@ -387,17 +387,17 @@ bool ScummVMInput::Unpersist(InputPersistenceBlock &Reader) { // Anzahl an Character-Callbacks lesen. uint CharacterCallbackCount; - Reader.Read(CharacterCallbackCount); + reader.read(CharacterCallbackCount); // Alle Character-Callbacks wieder herstellen. for (uint i = 0; i < CharacterCallbackCount; ++i) { Common::String CallbackFunctionName; - Reader.Read(CallbackFunctionName); + reader.read(CallbackFunctionName); m_CharacterCallbacks.push_back(reinterpret_cast<CharacterCallback>(CallbackRegistry::getInstance().resolveCallbackFunction(CallbackFunctionName))); } - return Reader.IsGood(); + return reader.isGood(); } } // End of namespace Sword25 diff --git a/engines/sword25/input/scummvminput.h b/engines/sword25/input/scummvminput.h index 23ab179a64..dcb6b8733f 100644 --- a/engines/sword25/input/scummvminput.h +++ b/engines/sword25/input/scummvminput.h @@ -72,8 +72,8 @@ public: virtual void ReportCharacter(byte Character); virtual void ReportCommand(KEY_COMMANDS Command); - bool Persist(OutputPersistenceBlock &Writer); - bool Unpersist(InputPersistenceBlock &Reader); + bool persist(OutputPersistenceBlock &writer); + bool unpersist(InputPersistenceBlock &reader); private: void TestForLeftDoubleClick(); |