JANITORIAL: Enforce "} // End of namespace" with a single space after }.

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)

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)

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

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)

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

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

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
 

backends/platform/ds/arm9/source/cdaudio.cpp

@@ -536,4 +536,4 @@ bool isPlaying() {
 }
 
 }
-}	// End of namespace DS
+} // End of namespace DS

backends/platform/ds/arm9/source/cdaudio.h

@@ -38,6 +38,6 @@ bool isPlaying();
 void update();
 
 }
-}	// End of namespace DS
+} // End of namespace DS
 
 #endif

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() {

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
 
 
 

backends/platform/ds/arm9/source/dsoptions.cpp

@@ -432,4 +432,4 @@ void setOptions() {
 	firstLoad = false;
 }
 
-}	// End of namespace DS
+} // End of namespace DS

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

backends/platform/ds/arm9/source/keys.cpp

@@ -133,4 +133,4 @@ uint32 keysUp(void) {
 }
 
 
-}	// End of namespace DS
+} // End of namespace DS

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

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
 
 
 

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

backends/platform/ds/arm9/source/touchkeyboard.cpp

@@ -585,4 +585,4 @@ void addKeyboardEvents() {
 
 }
 
-}	// End of namespace DS
+} // End of namespace DS

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

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

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

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

common/config-file.cpp

@@ -380,4 +380,4 @@ void ConfigFile::Section::removeKey(const String &key) {
 	}
 }
 
-}	// End of namespace Common
+} // End of namespace Common

common/config-file.h

@@ -134,6 +134,6 @@ private:
 
 */
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif

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()

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

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

common/file.cpp

@@ -202,4 +202,4 @@ bool DumpFile::flush() {
 	return _handle->flush();
 }
 
-}	// End of namespace Common
+} // End of namespace Common

common/fs.cpp

@@ -335,4 +335,4 @@ int FSDirectory::listMembers(ArchiveMemberList &list) const {
 }
 
 
-}	// End of namespace Common
+} // End of namespace Common

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

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

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

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

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

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

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.

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

common/mutex.cpp

@@ -75,4 +75,4 @@ void StackLock::unlock() {
 	g_system->unlockMutex(_mutex);
 }
 
-}	// End of namespace Common
+} // End of namespace Common

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

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

common/random.h

@@ -74,6 +74,6 @@ public:
 	uint getRandomNumberRng(uint min, uint max);
 };
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif

common/rect.h

@@ -266,6 +266,6 @@ struct Rect {
 	}
 };
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif

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

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

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

common/stream.h

@@ -454,6 +454,6 @@ public:
 };
 
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif

common/taskbar.h

@@ -136,7 +136,7 @@ public:
 	virtual void clearError() {}
 };
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif
 

common/textconsole.cpp

@@ -40,7 +40,7 @@ void setErrorHandler(ErrorHandler handler) {
 }
 
 
-}	// End of namespace Common
+} // End of namespace Common
 
 
 #ifndef DISABLE_TEXT_CONSOLE

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;

common/unzip.cpp

@@ -1534,4 +1534,4 @@ Archive *makeZipArchive(SeekableReadStream *stream) {
 	return new ZipArchive(zipFile);
 }
 
-}	// End of namespace Common
+} // End of namespace Common

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

common/updates.h

@@ -95,7 +95,7 @@ public:
 	virtual UpdateInterval getUpdateCheckInterval() { return kUpdateIntervalNotSupported; }
 };
 
-}	// End of namespace Common
+} // End of namespace Common
 
 #endif
 

common/zlib.cpp

@@ -419,4 +419,4 @@ WriteStream *wrapCompressedWriteStream(WriteStream *toBeWrapped) {
 }
 
 
-}	// End of namespace Common
+} // End of namespace Common

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

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 */

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 */

engines/agi/preagi_winnie.h

@@ -355,6 +355,6 @@ private:
 	void printStrWinnie(char *szMsg);
 };
 
-}  // End of namespace Agi
+} // End of namespace Agi
 
 #endif

engines/composer/resource.cpp

@@ -400,4 +400,4 @@ void OldPipe::nextFrame() {
 	_currFrame++;
 }
 
-}	// End of namespace Composer
+} // End of namespace Composer

engines/cruise/linker.h

@@ -27,5 +27,5 @@ namespace Cruise {
 
 void updateAllScriptsImports();
 
-}				// End of namespace Cruise
+} // End of namespace Cruise
 #endif

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

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

engines/queen/sound.cpp

@@ -771,4 +771,4 @@ bool AmigaSound::playSpecialSfx(int16 sfx) {
 	return true;
 }
 
-} //End of namespace Queen
+} // End of namespace Queen

engines/testbed/config-params.cpp

@@ -69,4 +69,4 @@ void ConfigParams::deleteWriteStream() {
 	}
 }
 
-}	// End of namespace Testbed
+} // End of namespace Testbed

engines/testbed/config.cpp

@@ -304,4 +304,4 @@ void TestbedConfigManager::selectTestsuites() {
 	_configFileInterface.clear();
 }
 
-}	// End of namespace Testbed
+} // End of namespace Testbed

engines/testbed/sound.cpp

@@ -277,4 +277,4 @@ SoundSubsystemTestSuite::SoundSubsystemTestSuite() {
 	addTest("SampleRates", &SoundSubsystem::sampleRates, true);
 }
 
-}	// End of namespace Testbed
+} // End of namespace Testbed

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);

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

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

gui/debugger.cpp

@@ -554,4 +554,4 @@ bool Debugger::debuggerCompletionCallback(GUI::ConsoleDialog *console, const cha
 
 #endif
 
-}	// End of namespace GUI
+} // End of namespace GUI

gui/debugger.h

@@ -207,6 +207,6 @@ public:
 
 };
 
-}	// End of namespace GUI
+} // End of namespace GUI
 
 #endif