ALL: Remove trailing whitespaces

This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'

10 files changed, 21 insertions, 21 deletions

diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index d54e2dac6b..f61516c91d 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -910,7 +910,7 @@ void DOSBitmap::expandEGAPlanes(Graphics::Surface *surface, Common::SeekableRead
 				j = -1;
 				x++;
 			}
-		}	
+		}
 
 		dst += surface->w;
 	}
diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index 4e5b7186ff..05012bec3d 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -632,7 +632,7 @@ bool RivenConsole::Cmd_Combos(int argc, const char **argv) {
 	uint32 teleCombo = _vm->_vars["tcorrectorder"];
 	uint32 prisonCombo = _vm->_vars["pcorrectorder"];
 	uint32 domeCombo = _vm->_vars["adomecombo"];
-	
+
 	DebugPrintf("Telescope Combo:\n  ");
 	for (int i = 0; i < 5; i++)
 		DebugPrintf("%d ", _vm->_externalScriptHandler->getComboDigit(teleCombo, i));
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index de84b0f13f..56107ad97b 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -459,7 +459,7 @@ public:
 	void setGlobalVisible(bool visible);
 	void startPhase(uint phase);
 	void stop();
-	
+
 protected:
 	bool _starting;
 
diff --git a/engines/mohawk/myst_stacks/demo.cpp b/engines/mohawk/myst_stacks/demo.cpp
index 53d946dd66..5788f4b3a3 100644
--- a/engines/mohawk/myst_stacks/demo.cpp
+++ b/engines/mohawk/myst_stacks/demo.cpp
@@ -69,7 +69,7 @@ void Demo::disablePersistentScripts() {
 
 void Demo::runPersistentScripts() {
 	Intro::runPersistentScripts();
-	
+
 	if (_enabled201) {
 		// Used on Card 2001, 2002 and 2003
 
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 70abf0ccd3..66492d1200 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -397,7 +397,7 @@ uint16 Myst::getVar(uint16 var) {
 		else
 			return 0;
 	case 25: // Fireplace Red Page Present
-		if (_globals.ending != 4) 
+		if (_globals.ending != 4)
 			return !(_globals.redPagesInBook & 32) && (_globals.heldPage != 12);
 		else
 			return 0;
@@ -3269,7 +3269,7 @@ void Myst::generatorControlRoom_run(void) {
 	if (_generatorVoltage == _state.generatorVoltage) {
 		generatorRedrawRocket();
 	} else {
-		// Animate generator gauge		
+		// Animate generator gauge
 		if (_generatorVoltage > _state.generatorVoltage)
 			_generatorVoltage--;
 		else
diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp
index 3a95b83199..37fc73de67 100644
--- a/engines/mohawk/resource.cpp
+++ b/engines/mohawk/resource.cpp
@@ -79,12 +79,12 @@ bool MohawkArchive::open(Common::SeekableReadStream *stream) {
 	}
 
 	_rsrc.version = _mhk->readUint16BE();
-	
+
 	if (_rsrc.version != 0x100) {
 		warning("Unsupported Mohawk resource version %d.%d", (_rsrc.version >> 8) & 0xff, _rsrc.version & 0xff);
 		return false;
 	}
-	
+
 	_rsrc.compaction = _mhk->readUint16BE(); // Only used in creation, not in reading
 	_rsrc.filesize = _mhk->readUint32BE();
 	_rsrc.abs_offset = _mhk->readUint32BE();
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 3514afdb61..8f8bc15990 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -178,7 +178,7 @@ Common::Error MohawkEngine_Riven::run() {
 		changeToCard(1);
 	}
 
-	
+
 	while (!_gameOver && !shouldQuit())
 		handleEvents();
 
@@ -436,7 +436,7 @@ void MohawkEngine_Riven::loadCard(uint16 id) {
 void MohawkEngine_Riven::loadHotspots(uint16 id) {
 	// Clear old hotspots
 	delete[] _hotspots;
-	
+
 	// NOTE: The hotspot scripts are cleared by the RivenScriptManager automatically.
 
 	Common::SeekableReadStream *inStream = getResource(ID_HSPT, id);
@@ -460,8 +460,8 @@ void MohawkEngine_Riven::loadHotspots(uint16 id) {
 		// - tspit 371 (DVD: 377), hotspot 4
 		if (left >= right || top >= bottom) {
 			warning("%s %d hotspot %d is invalid: (%d, %d, %d, %d)", getStackName(_curStack).c_str(), _curCard, i, left, top, right, bottom);
-			left = top = right = bottom = 0; 	 
-			_hotspots[i].enabled = 0; 	 
+			left = top = right = bottom = 0;
+			_hotspots[i].enabled = 0;
 		}
 
 		_hotspots[i].rect = Common::Rect(left, top, right, bottom);
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 8ad05ded13..60e94ea795 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -244,7 +244,7 @@ void RivenExternal::runCredits(uint16 video, uint32 delay) {
 				_vm->_gfx->updateCredits();
 			}
 		} else if (_vm->_video->updateMovies())
-			_vm->_system->updateScreen(); 
+			_vm->_system->updateScreen();
 
 		Common::Event event;
 		while (_vm->_system->getEventManager()->pollEvent(event))
@@ -2060,7 +2060,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
 		_vm->_cursor->setCursor(kRivenMainCursor);
 
 	_vm->_system->updateScreen();
-	
+
 	// OK, Gehn has opened the trap book and has asked us to go in. Let's watch
 	// and see what the player will do...
 	while (_vm->_video->getElapsedTime(video) < endTime && !_vm->shouldQuit()) {
@@ -2216,7 +2216,7 @@ void RivenExternal::xgwatch(uint16 argc, uint16 *argv) {
 			curSound++;
 			soundTime = _vm->_system->getMillis();
 		}
-		
+
 		// Poll events just to check for quitting
 		Common::Event event;
 		while (_vm->_system->getEventManager()->pollEvent(event)) {}
@@ -2525,7 +2525,7 @@ static Common::Rect generateMarbleGridRect(uint16 x, uint16 y) {
 }
 
 void RivenExternal::xt7500_checkmarbles(uint16 argc, uint16 *argv) {
-	// Set apower if the marbles are in their correct spot. 
+	// Set apower if the marbles are in their correct spot.
 
 	bool valid = true;
 	static const uint32 marbleFinalValues[] = { 1114121, 1441798, 0, 65552, 65558, 262146 };
diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp
index 161acb665f..6e3e9a34dc 100644
--- a/engines/mohawk/riven_scripts.cpp
+++ b/engines/mohawk/riven_scripts.cpp
@@ -546,7 +546,7 @@ void RivenScript::storeMovieOpcode(uint16 op, uint16 argc, uint16 *argv) {
 	byte *scriptBuf = (byte *)malloc(scriptSize);
 	WRITE_BE_UINT16(scriptBuf, 1);            // One command
 	WRITE_BE_UINT16(scriptBuf + 2, argv[3]);  // One opcode
-	WRITE_BE_UINT16(scriptBuf + 4, argc - 4); // argc - 4 args      
+	WRITE_BE_UINT16(scriptBuf + 4, argc - 4); // argc - 4 args
 
 	for (int i = 0; i < argc - 4; i++)
 		WRITE_BE_UINT16(scriptBuf + 6 + (i * 2), argv[i + 4]);
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index eec6256276..cd8fc8ef80 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -436,22 +436,22 @@ VideoHandle VideoManager::createVideoHandle(const Common::String &filename, uint
 	entry.filename = filename;
 	entry.loop = loop;
 	entry.enabled = true;
-	
+
 	Common::File *file = new Common::File();
 	if (!file->open(filename)) {
 		delete file;
 		return NULL_VID_HANDLE;
 	}
-	
+
 	entry->loadStream(file);
-	
+
 	// Search for any deleted videos so we can take a formerly used slot
 	for (uint32 i = 0; i < _videoStreams.size(); i++)
 		if (!_videoStreams[i].video) {
 			_videoStreams[i] = entry;
 			return i;
 		}
-			
+
 	// Otherwise, just add it to the list
 	_videoStreams.push_back(entry);
 	return _videoStreams.size() - 1;