[Scummvm-cvs-logs] scummvm master -> 354aa0f5f34d33e32b6f35bcbf4e6f18e2bac783
lordhoto
lordhoto at gmail.com
Sat Jan 26 19:41:44 CET 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b4d0a8ba66 JANITORIAL: Enforce "} // End of namespace" with a single space after }.
354aa0f5f3 JANITORIAL: Use "End of anonymous namespace" as comment for anonymous namespaces.
Commit: b4d0a8ba66e2c99949d1fa14d801c7de77db76ba
https://github.com/scummvm/scummvm/commit/b4d0a8ba66e2c99949d1fa14d801c7de77db76ba
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-26T10:38:02-08:00
Commit Message:
JANITORIAL: Enforce "} // End of namespace" with a single space after }.
Changed paths:
audio/mods/maxtrax.cpp
audio/mods/maxtrax.h
audio/mods/tfmx.cpp
audio/mods/tfmx.h
backends/fs/ds/ds-fs.h
backends/platform/ds/arm9/source/blitters.cpp
backends/platform/ds/arm9/source/blitters.h
backends/platform/ds/arm9/source/cdaudio.cpp
backends/platform/ds/arm9/source/cdaudio.h
backends/platform/ds/arm9/source/dsmain.cpp
backends/platform/ds/arm9/source/dsmain.h
backends/platform/ds/arm9/source/dsoptions.cpp
backends/platform/ds/arm9/source/dsoptions.h
backends/platform/ds/arm9/source/keys.cpp
backends/platform/ds/arm9/source/keys.h
backends/platform/ds/arm9/source/scummhelp.cpp
backends/platform/ds/arm9/source/scummhelp.h
backends/platform/ds/arm9/source/touchkeyboard.cpp
backends/platform/ds/arm9/source/touchkeyboard.h
backends/platform/ds/arm9/source/wordcompletion.cpp
backends/platform/ds/arm9/source/wordcompletion.h
common/bufferedstream.h
common/config-file.cpp
common/config-file.h
common/config-manager.h
common/debug-channels.h
common/debug.cpp
common/file.cpp
common/fs.cpp
common/func.h
common/hash-str.h
common/hashmap.cpp
common/hashmap.h
common/iff_container.cpp
common/language.h
common/memorypool.h
common/memstream.h
common/mutex.cpp
common/platform.h
common/random.cpp
common/random.h
common/rect.h
common/singleton.h
common/str.cpp
common/stream.cpp
common/stream.h
common/taskbar.h
common/textconsole.cpp
common/textconsole.h
common/unzip.cpp
common/unzip.h
common/updates.h
common/zlib.cpp
common/zlib.h
engines/agi/logic.h
engines/agi/lzw.h
engines/agi/preagi_winnie.h
engines/composer/resource.cpp
engines/cruise/linker.h
engines/mohawk/installer_archive.cpp
engines/mohawk/resource.cpp
engines/queen/sound.cpp
engines/testbed/config-params.cpp
engines/testbed/config.cpp
engines/testbed/sound.cpp
engines/toltecs/detection.cpp
graphics/primitives.cpp
graphics/primitives.h
gui/debugger.cpp
gui/debugger.h
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index 6f55d21..0834b69 100644
--- a/audio/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -105,7 +105,7 @@ inline uint32 pow2Fixed(int32 val) {
}
#endif
-} // End of namespace
+} // End of namespace
namespace Audio {
@@ -1032,6 +1032,6 @@ void MaxTrax::outPutEvent(const Event &ev, int num) {}
void MaxTrax::outPutScore(const Score &sc, int num) {}
#endif // #ifndef NDEBUG
-} // End of namespace Audio
+} // End of namespace Audio
#endif // #if defined(AUDIO_MODS_MAXTRAX_H)
diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h
index ffb176c..8288aef 100644
--- a/audio/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -214,6 +214,6 @@ private:
static void outPutEvent(const Event &ev, int num = -1);
static void outPutScore(const Score &sc, int num = -1);
};
-} // End of namespace Audio
+} // End of namespace Audio
#endif // !defined(AUDIO_MODS_MAXTRAX_H)
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index 2957529..5829ab5 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -1095,7 +1095,7 @@ int Tfmx::doSfx(uint16 sfxIndex, bool unlockChannel) {
return -1;
}
-} // End of namespace Audio
+} // End of namespace Audio
// some debugging functions
#if 0
diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h
index ebe1172..a8852d7 100644
--- a/audio/mods/tfmx.h
+++ b/audio/mods/tfmx.h
@@ -273,6 +273,6 @@ private:
void noteCommand(uint8 note, uint8 param1, uint8 param2, uint8 param3);
};
-} // End of namespace Audio
+} // End of namespace Audio
#endif // !defined(AUDIO_MODS_TFMX_H)
diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h
index a6a6b97..862f4c3 100644
--- a/backends/fs/ds/ds-fs.h
+++ b/backends/fs/ds/ds-fs.h
@@ -226,6 +226,6 @@ void std_clearerr(FILE *handle);
int std_fflush(FILE *handle);
int std_ferror(FILE *handle);
-} // End of namespace DS
+} // End of namespace DS
#endif //_DS_FS_H
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 1e8d566..ef2dc9c 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -391,4 +391,4 @@ void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStr
}
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h
index 7700b4d..de6e218 100644
--- a/backends/platform/ds/arm9/source/blitters.h
+++ b/backends/platform/ds/arm9/source/blitters.h
@@ -35,7 +35,7 @@ void asmCopy8Col(byte *dst, int dstPitch, const byte *src, int height);
void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette);
void Rescale_320x256x1555_To_256x256x1555(u16 *dest, const u16 *src, int destStride, int srcStride);
-} // End of namespace DS
+} // End of namespace DS
#else
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp
index 6612e0f..277e1f4 100644
--- a/backends/platform/ds/arm9/source/cdaudio.cpp
+++ b/backends/platform/ds/arm9/source/cdaudio.cpp
@@ -536,4 +536,4 @@ bool isPlaying() {
}
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h
index fc16f2f..8a0e0c5 100644
--- a/backends/platform/ds/arm9/source/cdaudio.h
+++ b/backends/platform/ds/arm9/source/cdaudio.h
@@ -38,6 +38,6 @@ bool isPlaying();
void update();
}
-} // End of namespace DS
+} // End of namespace DS
#endif
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index cedbdcb..830c782 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -3225,7 +3225,7 @@ int main(void) {
return 0;
}
-} // End of namespace DS
+} // End of namespace DS
int main() {
diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h
index 9c0d326..ad49ae2 100644
--- a/backends/platform/ds/arm9/source/dsmain.h
+++ b/backends/platform/ds/arm9/source/dsmain.h
@@ -153,7 +153,7 @@ void* fastRamAlloc(int size);
void exitGame();
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp
index 7154d4a..ac552bd 100644
--- a/backends/platform/ds/arm9/source/dsoptions.cpp
+++ b/backends/platform/ds/arm9/source/dsoptions.cpp
@@ -432,4 +432,4 @@ void setOptions() {
firstLoad = false;
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h
index 9148060..9949b8b 100644
--- a/backends/platform/ds/arm9/source/dsoptions.h
+++ b/backends/platform/ds/arm9/source/dsoptions.h
@@ -78,6 +78,6 @@ protected:
extern void showOptionsDialog();
extern void setOptions();
-} // End of namespace DS
+} // End of namespace DS
#endif
diff --git a/backends/platform/ds/arm9/source/keys.cpp b/backends/platform/ds/arm9/source/keys.cpp
index aec7d57..fdb981d 100644
--- a/backends/platform/ds/arm9/source/keys.cpp
+++ b/backends/platform/ds/arm9/source/keys.cpp
@@ -133,4 +133,4 @@ uint32 keysUp(void) {
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/keys.h b/backends/platform/ds/arm9/source/keys.h
index 71c770d..9d6b41c 100644
--- a/backends/platform/ds/arm9/source/keys.h
+++ b/backends/platform/ds/arm9/source/keys.h
@@ -30,4 +30,4 @@ uint32 keysDownRepeat(void);
void keysSetRepeat(u8 setDelay, u8 setRepeat);
uint32 keysUp(void);
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp
index 112ba49..a3fdaac 100644
--- a/backends/platform/ds/arm9/source/scummhelp.cpp
+++ b/backends/platform/ds/arm9/source/scummhelp.cpp
@@ -91,7 +91,7 @@ void updateStrings(byte gameId, byte version, Common::Platform platform,
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/scummhelp.h b/backends/platform/ds/arm9/source/scummhelp.h
index 2735727..41fc8f9 100644
--- a/backends/platform/ds/arm9/source/scummhelp.h
+++ b/backends/platform/ds/arm9/source/scummhelp.h
@@ -31,7 +31,7 @@ namespace DS {
void updateStrings(byte gameId, byte version, Common::Platform platform,
int page, Common::String &title, Common::String *&key, Common::String *&dsc);
-} // End of namespace DS
+} // End of namespace DS
#endif
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp
index 581509f..77da9cc 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.cpp
+++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp
@@ -585,4 +585,4 @@ void addKeyboardEvents() {
}
-} // End of namespace DS
+} // End of namespace DS
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.h b/backends/platform/ds/arm9/source/touchkeyboard.h
index ae056e8..dc20601 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.h
+++ b/backends/platform/ds/arm9/source/touchkeyboard.h
@@ -46,6 +46,6 @@ void clearAutoComplete();
void setCharactersEntered(int count);
void releaseAllKeys();
-} // End of namespace DS
+} // End of namespace DS
#endif
diff --git a/backends/platform/ds/arm9/source/wordcompletion.cpp b/backends/platform/ds/arm9/source/wordcompletion.cpp
index 5f3b80c..51f93df 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.cpp
+++ b/backends/platform/ds/arm9/source/wordcompletion.cpp
@@ -198,6 +198,6 @@ bool findWordCompletions(const char *input) {
}
-} // End of namespace DS
+} // End of namespace DS
#endif
diff --git a/backends/platform/ds/arm9/source/wordcompletion.h b/backends/platform/ds/arm9/source/wordcompletion.h
index 3d352f6..c355d29 100644
--- a/backends/platform/ds/arm9/source/wordcompletion.h
+++ b/backends/platform/ds/arm9/source/wordcompletion.h
@@ -27,4 +27,4 @@ extern bool findWordCompletions(const char *input);
extern void addAutoCompleteLine(const char *line);
extern void sortAutoCompleteWordList();
-} // End of namespace DS
+} // End of namespace DS
diff --git a/common/bufferedstream.h b/common/bufferedstream.h
index 55ea8dc..6c859c9 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 4224d74..fe042e9 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 7bc5604..8bd731c 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 02d4ec3..d43a7be 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 54de9d4..40d1ea6 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 9c3a93e..ba5479c 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 12d73c9..7ad6bc2 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 0143c93..19a0107 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 db57d73..a4a80e5 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 08f0558..190e692 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 ff8f9db..e505d1d 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 7cf5499..42509d6 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 ffaa5c6..9c6e5f1 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 db552fc..03b9eba 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 9a4e523..1cd725b 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 497a178..260fb64 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 4e63165..f912e79 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 1891c70..5a4f3f1 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 55fa3cb..fd75534 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 90f2ed5..c8aec58 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 8d1243f..5790cf7 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 d707836..6e47f11 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 8210ca6..61fdcfa 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 85647bf..a240d4e 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 26c04e5..33ebc95 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 6f28028..b4ec673 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 ffa42e6..a721c12 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 364c49b..12f15e5 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 ab65934..69b9ff6 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 06480b0..2e0dae8 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 4d58a21..0012808 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 62904cb..920338e 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 2772ffb..d940f3f 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
diff --git a/engines/agi/logic.h b/engines/agi/logic.h
index fecc2e3..14137f0 100644
--- a/engines/agi/logic.h
+++ b/engines/agi/logic.h
@@ -37,6 +37,6 @@ struct AgiLogic {
const char **texts; /**< message list */
};
-} // End of namespace Agi
+} // End of namespace Agi
#endif /* AGI_LOGIC_H */
diff --git a/engines/agi/lzw.h b/engines/agi/lzw.h
index e3fbafe..c732491 100644
--- a/engines/agi/lzw.h
+++ b/engines/agi/lzw.h
@@ -27,6 +27,6 @@ namespace Agi {
void lzwExpand(uint8 *, uint8 *, int32);
-} // End of namespace Agi
+} // End of namespace Agi
#endif /* AGI_LZW_H */
diff --git a/engines/agi/preagi_winnie.h b/engines/agi/preagi_winnie.h
index 96ae659..f34c80c 100644
--- a/engines/agi/preagi_winnie.h
+++ b/engines/agi/preagi_winnie.h
@@ -355,6 +355,6 @@ private:
void printStrWinnie(char *szMsg);
};
-} // End of namespace Agi
+} // End of namespace Agi
#endif
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp
index 83e4997..fa29cc8 100644
--- a/engines/composer/resource.cpp
+++ b/engines/composer/resource.cpp
@@ -400,4 +400,4 @@ void OldPipe::nextFrame() {
_currFrame++;
}
-} // End of namespace Composer
+} // End of namespace Composer
diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h
index ce212f6..25f4a5c 100644
--- a/engines/cruise/linker.h
+++ b/engines/cruise/linker.h
@@ -27,5 +27,5 @@ namespace Cruise {
void updateAllScriptsImports();
-} // End of namespace Cruise
+} // End of namespace Cruise
#endif
diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp
index 636b7ae..5af95f2 100644
--- a/engines/mohawk/installer_archive.cpp
+++ b/engines/mohawk/installer_archive.cpp
@@ -133,4 +133,4 @@ Common::SeekableReadStream *InstallerArchive::createReadStreamForMember(const Co
return Common::decompressDCL(_stream, entry.compressedSize, entry.uncompressedSize);
}
-} // End of namespace Mohawk
+} // End of namespace Mohawk
diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp
index f01375b..d7e8291 100644
--- a/engines/mohawk/resource.cpp
+++ b/engines/mohawk/resource.cpp
@@ -464,4 +464,4 @@ bool DOSArchive_v2::openStream(Common::SeekableReadStream *stream) {
return true;
}
-} // End of namespace Mohawk
+} // End of namespace Mohawk
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index dd01a7e..6731a51 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -771,4 +771,4 @@ bool AmigaSound::playSpecialSfx(int16 sfx) {
return true;
}
-} //End of namespace Queen
+} // End of namespace Queen
diff --git a/engines/testbed/config-params.cpp b/engines/testbed/config-params.cpp
index d7ead48..e89da0b 100644
--- a/engines/testbed/config-params.cpp
+++ b/engines/testbed/config-params.cpp
@@ -69,4 +69,4 @@ void ConfigParams::deleteWriteStream() {
}
}
-} // End of namespace Testbed
+} // End of namespace Testbed
diff --git a/engines/testbed/config.cpp b/engines/testbed/config.cpp
index 6bd4c82..6b56616 100644
--- a/engines/testbed/config.cpp
+++ b/engines/testbed/config.cpp
@@ -304,4 +304,4 @@ void TestbedConfigManager::selectTestsuites() {
_configFileInterface.clear();
}
-} // End of namespace Testbed
+} // End of namespace Testbed
diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp
index bb7ae2c..5af1d8c 100644
--- a/engines/testbed/sound.cpp
+++ b/engines/testbed/sound.cpp
@@ -277,4 +277,4 @@ SoundSubsystemTestSuite::SoundSubsystemTestSuite() {
addTest("SampleRates", &SoundSubsystem::sampleRates, true);
}
-} // End of namespace Testbed
+} // End of namespace Testbed
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 4016bec..788f813 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -324,7 +324,7 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in
}
return SaveStateDescriptor();
-} // End of namespace Toltecs
+} // End of namespace Toltecs
#if PLUGIN_ENABLED_DYNAMIC(TOLTECS)
REGISTER_PLUGIN_DYNAMIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine);
diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp
index b88db39..c140dc8 100644
--- a/graphics/primitives.cpp
+++ b/graphics/primitives.cpp
@@ -78,4 +78,4 @@ void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color
drawLine(x0 + x, y0 + y, x1 + x, y1 + y, color, plotProc, data);
}
-} // End of namespace Graphics
+} // End of namespace Graphics
diff --git a/graphics/primitives.h b/graphics/primitives.h
index f0780af..f4a9268 100644
--- a/graphics/primitives.h
+++ b/graphics/primitives.h
@@ -27,6 +27,6 @@ namespace Graphics {
void drawLine(int x0, int y0, int x1, int y1, int color, void (*plotProc)(int, int, int, void *), void *data);
void drawThickLine(int x0, int y0, int x1, int y1, int penX, int penY, int color, void (*plotProc)(int, int, int, void *), void *data);
-} // End of namespace Graphics
+} // End of namespace Graphics
#endif
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 972163d..35627dd 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -554,4 +554,4 @@ bool Debugger::debuggerCompletionCallback(GUI::ConsoleDialog *console, const cha
#endif
-} // End of namespace GUI
+} // End of namespace GUI
diff --git a/gui/debugger.h b/gui/debugger.h
index 3a587d2..b79e872 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -207,6 +207,6 @@ public:
};
-} // End of namespace GUI
+} // End of namespace GUI
#endif
Commit: 354aa0f5f34d33e32b6f35bcbf4e6f18e2bac783
https://github.com/scummvm/scummvm/commit/354aa0f5f34d33e32b6f35bcbf4e6f18e2bac783
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-26T10:38:02-08:00
Commit Message:
JANITORIAL: Use "End of anonymous namespace" as comment for anonymous namespaces.
Changed paths:
audio/mods/maxtrax.cpp
common/stream.cpp
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index 0834b69..a2d470c 100644
--- a/audio/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -105,7 +105,7 @@ inline uint32 pow2Fixed(int32 val) {
}
#endif
-} // End of namespace
+} // End of anonymous namespace
namespace Audio {
diff --git a/common/stream.cpp b/common/stream.cpp
index a240d4e..57b1b8b 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 anonymous 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 anonymous namespace
SeekableReadStream *wrapBufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream) {
if (parentStream)
@@ -482,7 +482,7 @@ public:
};
-} // End of nameless namespace
+} // End of anonymous namespace
WriteStream *wrapBufferedWriteStream(WriteStream *parentStream, uint32 bufSize) {
if (parentStream)
More information about the Scummvm-git-logs
mailing list