diff options
author | Johannes Schickel | 2013-01-26 19:33:27 +0100 |
---|---|---|
committer | Johannes Schickel | 2013-01-26 19:38:02 +0100 |
commit | b4d0a8ba66e2c99949d1fa14d801c7de77db76ba (patch) | |
tree | d633de60fb87682583ba68d9aea914f5af8a758d /common | |
parent | da8eeb9dbed2102764b3ca0697d6882bae0402cc (diff) | |
download | scummvm-rg350-b4d0a8ba66e2c99949d1fa14d801c7de77db76ba.tar.gz scummvm-rg350-b4d0a8ba66e2c99949d1fa14d801c7de77db76ba.tar.bz2 scummvm-rg350-b4d0a8ba66e2c99949d1fa14d801c7de77db76ba.zip |
JANITORIAL: Enforce "} // End of namespace" with a single space after }.
Diffstat (limited to 'common')
-rw-r--r-- | common/bufferedstream.h | 2 | ||||
-rw-r--r-- | common/config-file.cpp | 2 | ||||
-rw-r--r-- | common/config-file.h | 2 | ||||
-rw-r--r-- | common/config-manager.h | 2 | ||||
-rw-r--r-- | common/debug-channels.h | 2 | ||||
-rw-r--r-- | common/debug.cpp | 2 | ||||
-rw-r--r-- | common/file.cpp | 2 | ||||
-rw-r--r-- | common/fs.cpp | 2 | ||||
-rw-r--r-- | common/func.h | 2 | ||||
-rw-r--r-- | common/hash-str.h | 2 | ||||
-rw-r--r-- | common/hashmap.cpp | 2 | ||||
-rw-r--r-- | common/hashmap.h | 2 | ||||
-rw-r--r-- | common/iff_container.cpp | 2 | ||||
-rw-r--r-- | common/language.h | 2 | ||||
-rw-r--r-- | common/memorypool.h | 2 | ||||
-rw-r--r-- | common/memstream.h | 2 | ||||
-rw-r--r-- | common/mutex.cpp | 2 | ||||
-rw-r--r-- | common/platform.h | 2 | ||||
-rw-r--r-- | common/random.cpp | 2 | ||||
-rw-r--r-- | common/random.h | 2 | ||||
-rw-r--r-- | common/rect.h | 2 | ||||
-rw-r--r-- | common/singleton.h | 2 | ||||
-rw-r--r-- | common/str.cpp | 2 | ||||
-rw-r--r-- | common/stream.cpp | 8 | ||||
-rw-r--r-- | common/stream.h | 2 | ||||
-rw-r--r-- | common/taskbar.h | 2 | ||||
-rw-r--r-- | common/textconsole.cpp | 2 | ||||
-rw-r--r-- | common/textconsole.h | 2 | ||||
-rw-r--r-- | common/unzip.cpp | 2 | ||||
-rw-r--r-- | common/unzip.h | 2 | ||||
-rw-r--r-- | common/updates.h | 2 | ||||
-rw-r--r-- | common/zlib.cpp | 2 | ||||
-rw-r--r-- | common/zlib.h | 2 |
33 files changed, 36 insertions, 36 deletions
diff --git a/common/bufferedstream.h b/common/bufferedstream.h index 55ea8dc13b..6c859c98fe 100644 --- a/common/bufferedstream.h +++ b/common/bufferedstream.h @@ -61,6 +61,6 @@ SeekableReadStream *wrapBufferedSeekableReadStream(SeekableReadStream *parentStr */ WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/config-file.cpp b/common/config-file.cpp index 4224d7491d..fe042e9eda 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -380,4 +380,4 @@ void ConfigFile::Section::removeKey(const String &key) { } } -} // End of namespace Common +} // End of namespace Common diff --git a/common/config-file.h b/common/config-file.h index 7bc5604b4c..8bd731c038 100644 --- a/common/config-file.h +++ b/common/config-file.h @@ -134,6 +134,6 @@ private: */ -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/config-manager.h b/common/config-manager.h index 02d4ec3438..d43a7bec51 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -175,7 +175,7 @@ private: String _filename; }; -} // End of namespace Common +} // End of namespace Common /** Shortcut for accessing the configuration manager. */ #define ConfMan Common::ConfigManager::instance() diff --git a/common/debug-channels.h b/common/debug-channels.h index 54de9d491e..40d1ea667e 100644 --- a/common/debug-channels.h +++ b/common/debug-channels.h @@ -124,6 +124,6 @@ private: /** Shortcut for accessing the debug manager. */ #define DebugMan Common::DebugManager::instance() -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/debug.cpp b/common/debug.cpp index 9c3a93e5a6..ba5479c34d 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -102,7 +102,7 @@ bool DebugManager::isDebugChannelEnabled(uint32 channel) { return (gDebugChannelsEnabled & channel) != 0; } -} // End of namespace Common +} // End of namespace Common #ifndef DISABLE_TEXT_CONSOLE diff --git a/common/file.cpp b/common/file.cpp index 12d73c9973..7ad6bc2e81 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -202,4 +202,4 @@ bool DumpFile::flush() { return _handle->flush(); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/fs.cpp b/common/fs.cpp index 0143c936d4..19a01074ea 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -335,4 +335,4 @@ int FSDirectory::listMembers(ArchiveMemberList &list) const { } -} // End of namespace Common +} // End of namespace Common diff --git a/common/func.h b/common/func.h index db57d73668..a4a80e5406 100644 --- a/common/func.h +++ b/common/func.h @@ -535,6 +535,6 @@ GENERATE_TRIVIAL_HASH_FUNCTOR(unsigned long); #undef GENERATE_TRIVIAL_HASH_FUNCTOR -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/hash-str.h b/common/hash-str.h index 08f0558bfd..190e6922eb 100644 --- a/common/hash-str.h +++ b/common/hash-str.h @@ -79,7 +79,7 @@ typedef HashMap<String, String, IgnoreCase_Hash, IgnoreCase_EqualTo> StringMap; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/hashmap.cpp b/common/hashmap.cpp index ff8f9db9ce..e505d1dd25 100644 --- a/common/hashmap.cpp +++ b/common/hashmap.cpp @@ -106,4 +106,4 @@ void updateHashCollisionStats(int collisions, int dummyHits, int lookups, int ar } #endif -} // End of namespace Common +} // End of namespace Common diff --git a/common/hashmap.h b/common/hashmap.h index 7cf54997e8..42509d67e5 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -632,6 +632,6 @@ void HashMap<Key, Val, HashFunc, EqualFunc>::erase(const Key &key) { #undef HASHMAP_DUMMY_NODE -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/iff_container.cpp b/common/iff_container.cpp index ffaa5c6d06..9c6e5f124a 100644 --- a/common/iff_container.cpp +++ b/common/iff_container.cpp @@ -122,4 +122,4 @@ uint32 PackBitsReadStream::read(void *dataPtr, uint32 dataSize) { return dataSize - left; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/language.h b/common/language.h index db552fc9c4..03b9ebaf8e 100644 --- a/common/language.h +++ b/common/language.h @@ -81,6 +81,6 @@ const String getGameGUIOptionsDescriptionLanguage(Common::Language lang); // TODO: Document this GUIO related function bool checkGameGUIOptionLanguage(Common::Language lang, const String &str); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/memorypool.h b/common/memorypool.h index 9a4e523d53..1cd725b99d 100644 --- a/common/memorypool.h +++ b/common/memorypool.h @@ -141,7 +141,7 @@ public: } }; -} // End of namespace Common +} // End of namespace Common /** * A custom placement new operator, using an arbitrary MemoryPool. diff --git a/common/memstream.h b/common/memstream.h index 497a178ab9..260fb64d84 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -173,6 +173,6 @@ public: bool seek(int32 offset, int whence = SEEK_SET); }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/mutex.cpp b/common/mutex.cpp index 4e6316528c..f912e79591 100644 --- a/common/mutex.cpp +++ b/common/mutex.cpp @@ -75,4 +75,4 @@ void StackLock::unlock() { g_system->unlockMutex(_mutex); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/platform.h b/common/platform.h index 1891c7096d..5a4f3f1802 100644 --- a/common/platform.h +++ b/common/platform.h @@ -75,6 +75,6 @@ extern const char *getPlatformCode(Platform id); extern const char *getPlatformAbbrev(Platform id); extern const char *getPlatformDescription(Platform id); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/random.cpp b/common/random.cpp index 55fa3cbd30..fd75534c44 100644 --- a/common/random.cpp +++ b/common/random.cpp @@ -59,4 +59,4 @@ uint RandomSource::getRandomNumberRng(uint min, uint max) { return getRandomNumber(max - min) + min; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/random.h b/common/random.h index 90f2ed5cb0..c8aec58946 100644 --- a/common/random.h +++ b/common/random.h @@ -74,6 +74,6 @@ public: uint getRandomNumberRng(uint min, uint max); }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/rect.h b/common/rect.h index 8d1243f7e4..5790cf7c0f 100644 --- a/common/rect.h +++ b/common/rect.h @@ -266,6 +266,6 @@ struct Rect { } }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/singleton.h b/common/singleton.h index d7078360f3..6e47f119ba 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -97,6 +97,6 @@ protected: #define DECLARE_SINGLETON(T) \ template<> T *Singleton<T>::_singleton = 0 -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/str.cpp b/common/str.cpp index 8210ca6bb8..61fdcfaf31 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -850,7 +850,7 @@ size_t strlcat(char *dst, const char *src, size_t size) { return dstLength + (src - srcStart); } -} // End of namespace Common +} // End of namespace Common // Portable implementation of stricmp / strcasecmp / strcmpi. // TODO: Rename this to Common::strcasecmp diff --git a/common/stream.cpp b/common/stream.cpp index 85647bfe3a..a240d4e790 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -342,7 +342,7 @@ uint32 BufferedReadStream::read(void *dataPtr, uint32 dataSize) { return alreadyRead + dataSize; } -} // End of nameless namespace +} // End of nameless namespace ReadStream *wrapBufferedReadStream(ReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) { @@ -400,7 +400,7 @@ bool BufferedSeekableReadStream::seek(int32 offset, int whence) { return true; } -} // End of nameless namespace +} // End of nameless namespace SeekableReadStream *wrapBufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) { if (parentStream) @@ -482,7 +482,7 @@ public: }; -} // End of nameless namespace +} // End of nameless namespace WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize) { if (parentStream) @@ -490,4 +490,4 @@ WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize) return 0; } -} // End of namespace Common +} // End of namespace Common diff --git a/common/stream.h b/common/stream.h index 26c04e5bf6..33ebc95a86 100644 --- a/common/stream.h +++ b/common/stream.h @@ -454,6 +454,6 @@ public: }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/taskbar.h b/common/taskbar.h index 6f28028e74..b4ec673739 100644 --- a/common/taskbar.h +++ b/common/taskbar.h @@ -136,7 +136,7 @@ public: virtual void clearError() {} }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/textconsole.cpp b/common/textconsole.cpp index ffa42e63a0..a721c121d5 100644 --- a/common/textconsole.cpp +++ b/common/textconsole.cpp @@ -40,7 +40,7 @@ void setErrorHandler(ErrorHandler handler) { } -} // End of namespace Common +} // End of namespace Common #ifndef DISABLE_TEXT_CONSOLE diff --git a/common/textconsole.h b/common/textconsole.h index 364c49b2e9..12f15e5e4b 100644 --- a/common/textconsole.h +++ b/common/textconsole.h @@ -56,7 +56,7 @@ typedef void (*ErrorHandler)(const char *msg); */ void setErrorHandler(ErrorHandler handler); -} // End of namespace Common +} // End of namespace Common void NORETURN_PRE error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN_POST; diff --git a/common/unzip.cpp b/common/unzip.cpp index ab659343a2..69b9ff67cb 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -1534,4 +1534,4 @@ Archive *makeZipArchive(SeekableReadStream *stream) { return new ZipArchive(zipFile); } -} // End of namespace Common +} // End of namespace Common diff --git a/common/unzip.h b/common/unzip.h index 06480b0054..2e0dae831a 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -56,6 +56,6 @@ Archive *makeZipArchive(const FSNode &node); */ Archive *makeZipArchive(SeekableReadStream *stream); -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/updates.h b/common/updates.h index 4d58a216fb..0012808a17 100644 --- a/common/updates.h +++ b/common/updates.h @@ -95,7 +95,7 @@ public: virtual UpdateInterval getUpdateCheckInterval() { return kUpdateIntervalNotSupported; } }; -} // End of namespace Common +} // End of namespace Common #endif diff --git a/common/zlib.cpp b/common/zlib.cpp index 62904cb150..920338e57e 100644 --- a/common/zlib.cpp +++ b/common/zlib.cpp @@ -419,4 +419,4 @@ WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped) { } -} // End of namespace Common +} // End of namespace Common diff --git a/common/zlib.h b/common/zlib.h index 2772ffba06..d940f3f3a1 100644 --- a/common/zlib.h +++ b/common/zlib.h @@ -131,6 +131,6 @@ SeekableReadStream *wrapCompressedReadStream(SeekableReadStream *toBeWrapped, ui */ WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped); -} // End of namespace Common +} // End of namespace Common #endif |