diff options
author | Johannes Schickel | 2010-07-21 18:17:51 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-07-21 18:17:51 +0000 |
commit | e5e94d45118781902465024fc9a85c7aa0bfd3ce (patch) | |
tree | bd33dbdb2c7334bfae212b5fdbf058e8ff4f6883 /common | |
parent | fcc9de35e254d62d58aac0c68b314bb2f7b5b6db (diff) | |
download | scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.tar.gz scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.tar.bz2 scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.zip |
Strip trailing whitespaces in our common code base.
svn-id: r51094
Diffstat (limited to 'common')
-rw-r--r-- | common/ptr.h | 6 | ||||
-rw-r--r-- | common/singleton.h | 2 | ||||
-rw-r--r-- | common/textconsole.cpp | 2 | ||||
-rw-r--r-- | common/translation.cpp | 2 | ||||
-rw-r--r-- | common/unarj.cpp | 4 | ||||
-rw-r--r-- | common/util.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/common/ptr.h b/common/ptr.h index 25ce6dcd64..7307038936 100644 --- a/common/ptr.h +++ b/common/ptr.h @@ -242,7 +242,7 @@ public: */ operator bool() const { return _pointer != 0; } - ~ScopedPtr() { + ~ScopedPtr() { delete _pointer; } @@ -255,14 +255,14 @@ public: } /** - * Returns the plain pointer value. + * Returns the plain pointer value. * * @return the pointer the ScopedPtr manages */ PointerType get() const { return _pointer; } /** - * Returns the plain pointer value and releases ScopedPtr. + * Returns the plain pointer value and releases ScopedPtr. * After release() call you need to delete object yourself * * @return the pointer the ScopedPtr manages diff --git a/common/singleton.h b/common/singleton.h index d66fb84cc2..2f721a65f7 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -95,7 +95,7 @@ protected: * Note that you need to use this macro from the global namespace. * * This is because C++ requires initial explicit specialization - * to be placed in the same namespace as the template. + * to be placed in the same namespace as the template. * It has to be put in the global namespace to assure the correct * namespace Common is referenced. */ diff --git a/common/textconsole.cpp b/common/textconsole.cpp index b959b8ec23..0d0b0aead9 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -162,7 +162,7 @@ void NORETURN_PRE error(const char *s, ...) { #ifdef __PSP__ PspDebugTrace(false, "%s", buf_output); // write to file #endif - + // Finally exit. quit() will terminate the program if g_system is present if (g_system) g_system->quit(); diff --git a/common/translation.cpp b/common/translation.cpp index 093f26510f..ab6a922c6e 100644 --- a/common/translation.cpp +++ b/common/translation.cpp @@ -65,7 +65,7 @@ TranslationManager::TranslationManager() { // http://msdn.microsoft.com/en-us/library/dd318101%28VS.85%29.aspx // On the other hand the locale constants used, seem to exist on Windows 98 too, // check this for that: http://msdn.microsoft.com/en-us/library/dd464799%28v=VS.85%29.aspx - // + // // I am not exactly sure what is the truth now, it might be very well that this breaks // support for systems older than Windows 2000.... // diff --git a/common/unarj.cpp b/common/unarj.cpp index c130533dc1..2b2af3c54f 100644 --- a/common/unarj.cpp +++ b/common/unarj.cpp @@ -738,7 +738,7 @@ ArjArchive::ArjArchive(const String &filename) : _arjFilename(filename) { warning("ArjArchive::ArjArchive(): Could not find the archive file"); return; } - + int32 firstHeaderOffset = findHeader(arjFile); if (firstHeaderOffset < 0) { @@ -828,7 +828,7 @@ SeekableReadStream *ArjArchive::createReadStreamForMember(const String &name) co delete decoder; } - return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES); + return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES); } Archive *makeArjArchive(const String &name) { diff --git a/common/util.cpp b/common/util.cpp index 521a12e4c7..9e36e0f161 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -345,7 +345,7 @@ const String getGameGUIOptionsDescriptionLanguage(Language lang) { uint32 parseGameGUIOptions(const String &str) { uint32 res = 0; - + for (int i = 0; g_gameOptions[i].desc; i++) if (str.contains(g_gameOptions[i].desc)) res |= g_gameOptions[i].option; |