21 files changed, 38 insertions, 38 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;
diff --git a/graphics/video/dxa_decoder.h b/graphics/video/dxa_decoder.h
index 0312828195..d61346324f 100644
--- a/graphics/video/dxa_decoder.h
+++ b/graphics/video/dxa_decoder.h
@@ -45,7 +45,7 @@ public:
 
 	bool load(Common::SeekableReadStream &stream);
 	void close();
-	
+
 	bool isVideoLoaded() const { return _fileStream != 0; }
 	uint16 getWidth() const { return _width; }
 	uint16 getHeight() const { return _height; }
diff --git a/graphics/video/flic_decoder.cpp b/graphics/video/flic_decoder.cpp
index bb5b4f219b..b07e369cd8 100644
--- a/graphics/video/flic_decoder.cpp
+++ b/graphics/video/flic_decoder.cpp
@@ -57,7 +57,7 @@ bool FlicDecoder::load(Common::SeekableReadStream &stream) {
 		return false;
 	}
 
-	
+
 	_frameCount = _fileStream->readUint16LE();
 	uint16 width = _fileStream->readUint16LE();
 	uint16 height = _fileStream->readUint16LE();
@@ -265,7 +265,7 @@ Surface *FlicDecoder::decodeNextFrame() {
 			delete[] data;
 		}
 	}
-	
+
 	_curFrame++;
 
 	if (_curFrame == 0)
diff --git a/graphics/video/qt_decoder.cpp b/graphics/video/qt_decoder.cpp
index a95243ba6a..61b0f5166d 100644
--- a/graphics/video/qt_decoder.cpp
+++ b/graphics/video/qt_decoder.cpp
@@ -206,7 +206,7 @@ void QuickTimeDecoder::stopAudio() {
 
 void QuickTimeDecoder::pauseVideoIntern(bool pause) {
 	if (_audStream)
-		g_system->getMixer()->pauseHandle(_audHandle, pause);		
+		g_system->getMixer()->pauseHandle(_audHandle, pause);
 }
 
 Surface *QuickTimeDecoder::decodeNextFrame() {
diff --git a/graphics/video/video_decoder.cpp b/graphics/video/video_decoder.cpp
index fe4a5848f3..9733afc5cc 100644
--- a/graphics/video/video_decoder.cpp
+++ b/graphics/video/video_decoder.cpp
@@ -64,7 +64,7 @@ void VideoDecoder::setSystemPalette() {
 	delete[] sysPalette;
 }
 
-bool VideoDecoder::needsUpdate() const {	
+bool VideoDecoder::needsUpdate() const {
 	return !endOfVideo() && getTimeToNextFrame() == 0;
 }
 
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 91e32ce1e8..6c2d8f1f7f 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1229,7 +1229,7 @@ void ThemeEngine::restoreState(StoredState *state) {
 		src += state->backBuffer.pitch;
 		dst += _backBuffer.pitch;
 	}
-	
+
 	addDirtyRect(state->r);
 }
 
diff --git a/gui/options.cpp b/gui/options.cpp
index 856eb668fa..0553e5910a 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -790,7 +790,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se
 		return true;
 
 	if (_domain != Common::ConfigManager::kApplicationDomain || ConfMan.hasKey(setting, _domain) || preferredType) {
-		const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain); 
+		const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain);
 		const MusicPlugin::List p = MusicMan.getPlugins();
 
 		for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) {
@@ -810,7 +810,7 @@ bool OptionsDialog::loadMusicDeviceSetting(PopUpWidget *popup, Common::String se
 void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting) {
 	if (!popup || !_enableAudioSettings)
 		return;
-	
+
 	const MusicPlugin::List p = MusicMan.getPlugins();
 	bool found = false;
 	for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end() && !found; ++m) {
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 14cb61006b..6dd79c9d4f 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -218,9 +218,9 @@ Common::String Widget::cleanupHotkey(const Common::String &label) {
 	for (uint i = 0; i < label.size() ; i++)
 		if (label[i] != '~')
 			res = res + label[i];
-	
+
 	return res;
-}	
+}
 
 #pragma mark -
 
@@ -361,7 +361,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Co
 }
 
 ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey)
-	: StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss), 
+	: StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss),
 	  _cmd(cmd) {
 	if (hotkey == 0)
 		_hotkey = parseHotkey(label);
diff --git a/gui/widget.h b/gui/widget.h
index 7b5fe9253f..25e4b9a235 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -164,7 +164,7 @@ class GuiManager;
 class Tooltip : public GuiObject {
 public:
 	Tooltip(GuiManager *guiManager);
-	
+
 	bool isVisible() const { return _visible; }
 	void draw();
 	void reflowLayout();
@@ -272,7 +272,7 @@ class RadiobuttonWidget : public ButtonWidget {
 protected:
 	bool	_state;
 	int _value;
-	
+
 public:
 	RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0);
 	RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0);
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index a092e6c29d..b3efb2cefe 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -393,7 +393,7 @@ Timestamp convertTimeToStreamPos(const Timestamp &where, int rate, bool isStereo
 	//
 	// An example is when converting the timestamp 500ms to a 11025 Hz based
 	// stream. It would have an internal frame counter of 5512.5. Now when
-	// doing calculations at frame precision, this might lead to unexpected 
+	// doing calculations at frame precision, this might lead to unexpected
 	// results: The frame difference between a timestamp 1000ms and the above
 	// mentioned timestamp (both with 11025 as framerate) would be 5512,
 	// instead of 5513, which is what a frame-precision based code would expect.
diff --git a/sound/decoders/mp3.cpp b/sound/decoders/mp3.cpp
index 732ae58b67..f22eae5102 100644
--- a/sound/decoders/mp3.cpp
+++ b/sound/decoders/mp3.cpp
@@ -349,13 +349,13 @@ int MP3Stream::readBuffer(int16 *buffer, const int numSamples) {
 SeekableAudioStream *makeMP3Stream(
 	Common::SeekableReadStream *stream,
 	DisposeAfterUse::Flag disposeAfterUse) {
-	
+
 #if defined(__PSP__)
 	SeekableAudioStream *s = 0;
-	
+
 	if (Mp3PspStream::isOkToCreateStream())
 		s = new Mp3PspStream(stream, disposeAfterUse);
-		
+
 	if (!s)	// go to regular MAD mp3 stream if ME fails
 		s = new MP3Stream(stream, disposeAfterUse);
 #else
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index aaff78bf92..8dc165c3d6 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -94,7 +94,7 @@ MusicType MidiDriver::getMusicType(MidiDriver::DeviceHandle handle) {
 			}
 		}
 	}
-	
+
 	return MT_INVALID;
 }
 
@@ -139,7 +139,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		if (flags & MDT_PCJR)
 			return hdl;
 		break;
-	
+
 	case MT_CMS:
 		if (flags & MDT_CMS)
 			return hdl;
@@ -149,7 +149,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		if (flags & MDT_ADLIB)
 			return hdl;
 		break;
-		
+
 	case MT_TOWNS:
 		if (flags & MDT_TOWNS)
 			return hdl;
diff --git a/sound/mididrv.h b/sound/mididrv.h
index 5fffd430fb..1184adee6c 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -124,7 +124,7 @@ public:
 
 	/** Returns device handle based on the present devices and the flags parameter. */
 	static DeviceHandle detectDevice(int flags);
-		
+
 	/** Find the music driver matching the given driver name/description. */
 	static DeviceHandle getDeviceHandle(const Common::String &identifier);
 
diff --git a/sound/musicplugin.h b/sound/musicplugin.h
index 3823f2fd3d..bbb4ed778c 100644
--- a/sound/musicplugin.h
+++ b/sound/musicplugin.h
@@ -50,7 +50,7 @@ public:
 	 * device name (if it isn't the default one) and the name of the driver.
 	 */
 	Common::String getCompleteName();
-	
+
 	/**
 	 * Returns a user readable string that contains the name of the current
 	 * device name (if it isn't the default one) and the id of the driver.
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 95263a040d..54366a4300 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -149,7 +149,7 @@ static void drawProgress(float progress) {
 	Common::Rect r(x, y, x + w, y + h);
 
 	uint32 col;
-	
+
 	if (screenFormat.bytesPerPixel > 1)
 		col = screenFormat.RGBToColor(0, 171, 0);
 	else
@@ -184,7 +184,7 @@ static void drawMessage(int offset, const Common::String &text) {
 	uint16 y = g_system->getHeight() / 2 - h / 2 + offset * (h + 1);
 
 	uint32 col;
-	
+
 	if (screenFormat.bytesPerPixel > 1)
 		col = screenFormat.RGBToColor(0, 0, 0);
 	else
diff --git a/test/common/tokenizer.h b/test/common/tokenizer.h
index 3420b562aa..9c14875b81 100644
--- a/test/common/tokenizer.h
+++ b/test/common/tokenizer.h
@@ -5,7 +5,7 @@
 class TokenizerTestSuite : public CxxTest::TestSuite {
 public:
 	void test_nextToken() {
-		
+
 		// test normal behavior
 		Common::StringTokenizer strTokenizer("Now, this is a test!", " ,!");
 		Common::String tokenArray[] = {"Now", "this", "is", "a", "test"};
@@ -17,7 +17,7 @@ public:
 		TS_ASSERT(strTokenizer.empty());
 
 		// Test edge cases:
-	
+
 		// empty string
 		Common::StringTokenizer s1("");
 		TS_ASSERT_EQUALS("", s1.nextToken());
@@ -37,7 +37,7 @@ public:
 		TS_ASSERT_EQUALS("af", s4.nextToken());
 	}
 
-	void test_resetAndEmpty() {	
+	void test_resetAndEmpty() {
 		Common::StringTokenizer strTokenizer("Just, another test!", " ,!");
 
 		// test reset()
@@ -48,10 +48,10 @@ public:
 		TS_ASSERT_EQUALS(token2, "Just");
 
 		// test empty()
-		TS_ASSERT(!strTokenizer.empty()); 
+		TS_ASSERT(!strTokenizer.empty());
 		strTokenizer.nextToken(); //another
 		strTokenizer.nextToken(); //test
-		TS_ASSERT(strTokenizer.empty()); 
+		TS_ASSERT(strTokenizer.empty());
 	}
 
 };