Removed trailing spaces.

svn-id: r30664

13 files changed, 112 insertions, 112 deletions

diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp
index b178b4b8df..be17cf0d09 100644
--- a/gui/ThemeClassic.cpp
+++ b/gui/ThemeClassic.cpp
@@ -173,7 +173,7 @@ int ThemeClassic::getTabPadding() const {
 void ThemeClassic::drawDialogBackground(const Common::Rect &r, uint16 hints, WidgetStateInfo state) {
 	if (!_initOk)
 		return;
-	
+
 	restoreBackground(r);
 
 #ifndef CT_NO_TRANSPARENCY
@@ -260,7 +260,7 @@ void ThemeClassic::drawSurface(const Common::Rect &r, const Graphics::Surface &s
 
 	if (!rect.isValidRect())
 		return;
-	
+
 	assert(surface.bytesPerPixel == sizeof(OverlayColor));
 
 	OverlayColor *src = (OverlayColor *)surface.pixels;
@@ -384,7 +384,7 @@ void ThemeClassic::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, c
 		box(r.left + i * tabWidth, r.top+2, tabWidth, tabHeight-2, _color, _shadowcolor);
 		_font->drawString(&_screen, tabs[i], r.left + i * tabWidth, r.top+4, tabWidth, getColor(state), Graphics::kTextAlignCenter, 0, true);
 	}
-	
+
 	if (active >= 0) {
 		box(r.left + active * tabWidth, r.top, tabWidth, tabHeight, _color, _shadowcolor, true);
 		_font->drawString(&_screen, tabs[active], r.left + active * tabWidth, r.top+titleVPad, tabWidth, getColor(kStateHighlight), Graphics::kTextAlignCenter, 0, true);
@@ -395,7 +395,7 @@ void ThemeClassic::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, c
 		_screen.vLine(r.left, r.top + tabHeight, r.bottom - 1, _color);
 		_screen.vLine(r.right - 1, r.top + tabHeight, r.bottom - 1, _shadowcolor);
 	}
-	
+
 	addDirtyRect(r);
 }
 
@@ -601,7 +601,7 @@ void ThemeClassic::blendScreenToDialog() {
 		b = ab * a;
 
 		OverlayColor *ptr = (OverlayColor*)_dialog->screen.getBasePtr(rect.left, rect.top);
-		
+
 		int h = rect.height();
 		int w = rect.width();
 		while (h--) {
@@ -624,7 +624,7 @@ void ThemeClassic::blendScreenToDialog() {
 		b = ab * 3;
 
 		OverlayColor *ptr = (OverlayColor*)_dialog->screen.getBasePtr(rect.left, rect.top);
-		
+
 		int h = rect.height();
 		int w = rect.width();
 
@@ -691,7 +691,7 @@ bool ThemeClassic::loadConfig() {
 	temp.clear();
 	temp = _evaluator->getStringVar("font");
 	if (temp.empty() || 0 == temp.compareToIgnoreCase("builtin")) {
-		if (!_fontName.empty())	
+		if (!_fontName.empty())
 			delete _font;
 		_fontName.clear();
 	} else if (temp != _fontName) {
diff --git a/gui/ThemeClassic.h b/gui/ThemeClassic.h
index 0450da5aee..12dc8d8068 100644
--- a/gui/ThemeClassic.h
+++ b/gui/ThemeClassic.h
@@ -50,7 +50,7 @@ public:
 
 	void clearAll();
 	void updateScreen();
-	
+
 	void resetDrawArea();
 
 	const Graphics::Font *getFont(FontStyle font) const { return _font; }
diff --git a/gui/ThemeModern.cpp b/gui/ThemeModern.cpp
index 99244b85f5..69595eb219 100644
--- a/gui/ThemeModern.cpp
+++ b/gui/ThemeModern.cpp
@@ -141,7 +141,7 @@ bool ThemeModern::init() {
 
 		processExtraValues();
 	}
-	
+
 	for (int i = 0; i < kImageHandlesMax; ++i) {
 		if (!_images[i]) {
 			return false;
@@ -166,7 +166,7 @@ void ThemeModern::refresh() {
 		_system->showOverlay();
 		CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
 		CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
-	}		
+	}
 }
 
 void ThemeModern::enable() {
@@ -196,7 +196,7 @@ void ThemeModern::openDialog(bool topDialog) {
 		// first dialog
 		_dialog->screen.create(_screen.w, _screen.h, sizeof(OverlayColor));
 	}
-	
+
 	if (_dialogShadingCallback && topDialog) {
 		OverlayColor *col = (OverlayColor*)_screen.pixels;
 		for (int y = 0; y < _screen.h; ++y) {
@@ -206,9 +206,9 @@ void ThemeModern::openDialog(bool topDialog) {
 			col += _screen.w;
 		}
 	}
-	
+
 	memcpy(_dialog->screen.pixels, _screen.pixels, _screen.pitch*_screen.h);
-	
+
 	if ((_dialogShadingCallback) && topDialog)
 		addDirtyRect(Common::Rect(0, 0, _screen.w, _screen.h), false, false);
 }
@@ -252,7 +252,7 @@ void ThemeModern::resetDrawArea() {
 }
 
 #define surface(x) (_images[x])
- 
+
 void ThemeModern::drawDialogBackground(const Common::Rect &r, uint16 hints, WidgetStateInfo state) {
 	if (!_initOk)
 		return;
@@ -319,7 +319,7 @@ void ThemeModern::drawWidgetBackground(const Common::Rect &r, uint16 hints, Widg
 		return;
 
 	Common::Rect r2;
-	
+
 	ImageHandles corner, top, left, bkgd;
 	ShadowStyles shadow;
 	ColorHandles start, end;
@@ -394,7 +394,7 @@ void ThemeModern::drawWidgetBackground(const Common::Rect &r, uint16 hints, Widg
 void ThemeModern::drawButton(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, uint16 hints) {
 	if (!_initOk)
 		return;
-	
+
 	Common::Rect r2 = shadowRect(r, kShadowButton);
 
 	if (!(hints & THEME_HINT_NO_BACKGROUND_RESTORE) || state == kStateDisabled)
@@ -446,7 +446,7 @@ void ThemeModern::drawSurface(const Common::Rect &r, const Graphics::Surface &su
 
 	if (!rect.isValidRect())
 		return;
-	
+
 	assert(surface.bytesPerPixel == sizeof(OverlayColor));
 
 	if (alpha != 256)
@@ -499,7 +499,7 @@ void ThemeModern::drawSlider(const Common::Rect &rr, int width, WidgetStateInfo
 	if (r2.right > r.right) {
 		r2.right = r.right;
 	}
-	
+
 	drawShadow(r2, surface(kButtonBkgdCorner), surface(kButtonBkgdTop), surface(kButtonBkgdLeft), surface(kButtonBkgd), kShadowButton);
 
 	OverlayColor start, end;
@@ -565,7 +565,7 @@ void ThemeModern::drawCheckbox(const Common::Rect &r, const Common::String &str,
 
 	const Graphics::Surface *checkBox = surface(checked ? kCheckboxChecked : kCheckboxEmpty);
 	int checkBoxSize = checkBox->w;
-	
+
 	restoreBackground(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h));
 
 	drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256);
@@ -586,7 +586,7 @@ void ThemeModern::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, co
 	drawRectMasked(r, surface(kTabBkgdCorner), surface(kTabBkgdTop), surface(kTabBkgdLeft), surface(kTabBkgd),
 						/*(state == kStateDisabled) ? -30 : */256, _colors[kTabBackgroundStart], _colors[kTabBackgroundEnd],
 						_gradientFactors[kTabFactor]);
-	
+
 	OverlayColor tabEnd = calcGradient(_colors[kTabActiveStart], _colors[kTabActiveEnd], tabHeight, r.height()-1, _gradientFactors[kTabFactor]);
 
 	const int tabOffset = 1;
@@ -609,9 +609,9 @@ void ThemeModern::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, co
 
 		getFont()->drawString(&_screen, tabs[i], tabRect.left, tabRect.top+titleVPad, tabRect.width(), getColor(kStateEnabled), Graphics::kTextAlignCenter, 0, true);
 	}
-	
+
 	// area shadow
-	Common::Rect widgetBackground = Common::Rect(r.left, r.top + tabHeight - 1, r.right, r.top 
+	Common::Rect widgetBackground = Common::Rect(r.left, r.top + tabHeight - 1, r.right, r.top
                  + tabHeight + 20);
 	drawShadow(widgetBackground, surface(kTabBkgdCorner), surface(kTabBkgdTop), surface(kTabBkgdLeft), surface(kTabBkgd),
 					kShadowSmall);
@@ -622,7 +622,7 @@ void ThemeModern::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, co
 						/*(state == kStateDisabled) ? -30 : */256, tabEnd, _colors[kTabActiveEnd],
 						_gradientFactors[kTabFactor]);
 	addDirtyRect(widgetBackground, true);
-	
+
 	// active tab
 	if (active >= 0) {
 		Common::Rect tabRect(r.left + active * (tabWidth + tabOffset), r.top, r.left + active * (tabWidth + tabOffset) + tabWidth, r.top + tabHeight + 5);
@@ -653,10 +653,10 @@ void ThemeModern::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHe
 	// draws the 'up' button
 	OverlayColor buttonStart = _colors[kScrollbarButtonStart];
 	OverlayColor buttonEnd = _colors[kScrollbarButtonEnd];
-	
+
 	if (scrollState == kScrollbarStateUp)
 		getStateColor(buttonStart, buttonEnd, buttonStart, buttonEnd, _colors[kScrollbarButtonHighlightStart], _colors[kScrollbarButtonHighlightEnd], state);
-	
+
 	r2.bottom = r2.top + UP_DOWN_BOX_HEIGHT;
 	drawRectMasked(r2, surface(kScrollbarBkgdCorner), surface(kScrollbarBkgdTop), surface(kScrollbarBkgdLeft), surface(kScrollbarBkgd), 256,
 					buttonStart, buttonEnd, _gradientFactors[kScrollbarBkgdFactor]);
@@ -671,16 +671,16 @@ void ThemeModern::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHe
 	// draws the slider
 	OverlayColor sliderStart = _colors[kScrollbarSliderStart];
 	OverlayColor sliderEnd = _colors[kScrollbarSliderEnd];
-	
+
 	if (scrollState == kScrollbarStateSlider)
 		getStateColor(sliderStart, sliderEnd, sliderStart, sliderEnd, _colors[kScrollbarSliderHighlightStart], _colors[kScrollbarSliderHighlightEnd], state);
-	
+
 	r2 = r;
 	r2.left += 1;
 	r2.right -= 1;
 	r2.top += sliderY;
 	r2.bottom = r2.top + sliderHeight - 1;
-	
+
 	drawShadow(r2, surface(kSliderCorner), surface(kSliderTop), surface(kSliderLeft), surface(kSliderBkgd), kShadowSmall);
 
 	r2.left += 1;
@@ -697,10 +697,10 @@ void ThemeModern::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHe
 	// draws the 'down' button
 	buttonStart = _colors[kScrollbarButtonStart];
 	buttonEnd = _colors[kScrollbarButtonEnd];
-	
+
 	if (scrollState == kScrollbarStateDown)
 		getStateColor(buttonStart, buttonEnd, buttonStart, buttonEnd, _colors[kScrollbarButtonHighlightStart], _colors[kScrollbarButtonHighlightEnd], state);
-	
+
 	r2 = r;
 	r2.top = r2.bottom - UP_DOWN_BOX_HEIGHT;
 	drawRectMasked(r2, surface(kScrollbarBkgdCorner), surface(kScrollbarBkgdTop), surface(kScrollbarBkgdLeft), surface(kScrollbarBkgd), 256,
@@ -815,7 +815,7 @@ void ThemeModern::colorFade(const Common::Rect &r, OverlayColor start, OverlayCo
 	const int w = r.width();
 	const int lastRow = r.height() - 1;
 	const int ptrAdd = _screen.w - r.width();
-	for (int l = 0; l < h; ++l) { 
+	for (int l = 0; l < h; ++l) {
 		OverlayColor col = calcGradient(start, end, l, lastRow, factor);
 		for (int i = 0; i < w; ++i) {
 			*ptr++ = col;
@@ -1164,14 +1164,14 @@ void ThemeModern::resetupGuiRenderer() {
 		// ok same format no need to reload
 		return;
 	}
-	
+
 	_lastUsedBitMask = gBitFormat;
-	
+
 	int i;
 	for (i = 0; i < kImageHandlesMax; ++i) {
 		ImageMan.unregisterSurface(_imageHandles[i]);
 	}
-	
+
 	for (i = 0; i < kImageHandlesMax; ++i) {
 		ImageMan.registerSurface(_imageHandles[i], 0);
 		_images[i] = ImageMan.getSurface(_imageHandles[i]);
@@ -1212,7 +1212,7 @@ void ThemeModern::setupColors() {
 	getColorFromConfig("slider_background_start", _colors[kSliderBackgroundStart]);
 	getColorFromConfig("slider_background_end", _colors[kSliderBackgroundEnd]);
 	getColorFromConfig("slider_start", _colors[kSliderStart]);
-	getColorFromConfig("slider_end", _colors[kSliderEnd]);	
+	getColorFromConfig("slider_end", _colors[kSliderEnd]);
 	getColorFromConfig("slider_highlight_start", _colors[kSliderHighStart]);
 	getColorFromConfig("slider_highlight_end", _colors[kSliderHighEnd]);
 
@@ -1313,7 +1313,7 @@ void ThemeModern::processExtraValues() {
 		_imageHandles[k##type##Top] = _evaluator->getStringVar("pix_"str"_top"); \
 		_imageHandles[k##type##Left] = _evaluator->getStringVar("pix_"str"_left"); \
 		_imageHandles[k##type] = _evaluator->getStringVar("pix_"str"_bkgd")
-	
+
 	loadRectData(DialogBkgd, "dialog");
 	loadRectData(WidgetBkgd, "widget");
 	loadRectData(WidgetSmallBkgd, "widget_small");
@@ -1363,7 +1363,7 @@ void ThemeModern::processExtraValues() {
 	_gradientFactors[kPopUpWidgetFactor] = _evaluator->getVar("gradient_popupwidget", 1);
 
 	_gradientFactors[kEditTextFactor] = _evaluator->getVar("gradient_edittext", 1);
-	
+
 	// load values with default values from the config file
 	_shadowLeftWidth = _evaluator->getVar("shadow_left_width", 2);
 	_shadowRightWidth = _evaluator->getVar("shadow_right_width", 4);
@@ -1374,9 +1374,9 @@ void ThemeModern::processExtraValues() {
 	_cursorHotspotY = _evaluator->getVar("cursor_hotspot_y", 0);
 
 	_cursorTargetScale = _evaluator->getVar("cursor_targetScale", 1);
-	
+
 	// inactive dialog shading stuff
-	
+
 	ShadingStyle shading = (ShadingStyle)_evaluator->getVar("inactive_dialog_shading", kShadingNone);
 
 	switch (shading) {
@@ -1396,7 +1396,7 @@ void ThemeModern::processExtraValues() {
 		} else if (_dimPercentValue > 100) {
 			_dimPercentValue = 100;
 		}
-				
+
 		if (_dimPercentValue != 0) {
 			_dimPercentValue = 256 * (100 - _dimPercentValue) / 100;
 			_dialogShadingCallback = &ThemeModern::calcDimColor;
@@ -1429,14 +1429,14 @@ OverlayColor ThemeModern::calcLuminance(OverlayColor col) {
 	// Note that the approximation below will only produce values between
 	// (and including) 0 and 221.
 	uint lum = (r >> 2) + (g >> 1) + (b >> 3);
-	
+
 	return _system->RGBToColor(lum, lum, lum);
 }
 
 OverlayColor ThemeModern::calcDimColor(OverlayColor col) {
 	uint8 r, g, b;
 	_system->colorToRGB(col, r, g, b);
-	
+
 	r = r * _dimPercentValue >> 8;
 	g = g * _dimPercentValue >> 8;
 	b = b * _dimPercentValue >> 8;
@@ -1500,7 +1500,7 @@ void ThemeModern::createCursor() {
 		}
 		src += _cursorWidth;
 	}
-	
+
 	_useCursor = true;
 	delete [] table;
 }
diff --git a/gui/ThemeModern.h b/gui/ThemeModern.h
index ab1b5a7835..a3cb71510c 100644
--- a/gui/ThemeModern.h
+++ b/gui/ThemeModern.h
@@ -45,13 +45,13 @@ public:
 
 	void enable();
 	void disable();
-	
+
 	void openDialog(bool topDialog);
 	void closeAllDialogs();
 
 	void clearAll();
 	void updateScreen();
-	
+
 	void setDrawArea(const Common::Rect &r);
 	void resetDrawArea();
 
@@ -146,47 +146,47 @@ private:
 		kDialogBkgdTop = 1,
 		kDialogBkgdLeft = 2,
 		kDialogBkgd = 3,
-		
+
 		kWidgetBkgdCorner = 4,
 		kWidgetBkgdTop = 5,
 		kWidgetBkgdLeft = 6,
 		kWidgetBkgd = 7,
-		
+
 		kCheckboxEmpty = 8,
 		kCheckboxChecked = 9,
-		
+
 		kWidgetArrow = 10,
-		
+
 		kTabBkgdCorner = 11,
 		kTabBkgdTop = 12,
 		kTabBkgdLeft = 13,
 		kTabBkgd = 14,
-		
+
 		kSliderBkgdCorner = 15,
 		kSliderBkgdTop = 16,
 		kSliderBkgdLeft = 17,
 		kSliderBkgd = 18,
-		
+
 		kSliderCorner = 19,
 		kSliderTop = 20,
 		kSliderLeft = 21,
 		kSlider = 22,
-		
+
 		kScrollbarBkgdCorner = 23,
 		kScrollbarBkgdTop = 24,
 		kScrollbarBkgdLeft = 25,
 		kScrollbarBkgd = 26,
-		
+
 		kScrollbarCorner = 27,
 		kScrollbarTop = 28,
 		kScrollbarLeft = 29,
 		kScrollbar = 30,
-		
+
 		kButtonBkgdCorner = 31,
 		kButtonBkgdTop = 32,
 		kButtonBkgdLeft = 33,
 		kButtonBkgd = 34,
-		
+
 		kWidgetSmallBkgdCorner = 35,
 		kWidgetSmallBkgdTop = 36,
 		kWidgetSmallBkgdLeft = 37,
@@ -205,15 +205,15 @@ private:
 		kEditTextBkgd = 47,
 
 		kGUICursor = 48,
-	
+
 		kImageHandlesMax
 	};
 
 private:
 	int _dimPercentValue;
-	typedef OverlayColor (ThemeModern::*InactiveDialogCallback)(OverlayColor col);	
+	typedef OverlayColor (ThemeModern::*InactiveDialogCallback)(OverlayColor col);
 	InactiveDialogCallback _dialogShadingCallback;
-	
+
 	OverlayColor calcLuminance(OverlayColor col);
 	OverlayColor calcDimColor(OverlayColor col);
 
@@ -231,56 +231,56 @@ private:
 private:
 	Common::String _imageHandles[kImageHandlesMax];
 	const Graphics::Surface **_images;
-	
+
 	enum ColorHandles {
 		kMainDialogStart = 0,
 		kMainDialogEnd = 1,
-		
+
 		kDialogStart = 2,
 		kDialogEnd = 3,
-		
+
 		kColorStateDisabled = 4,
 		kColorStateHighlight = 5,
 		kColorStateEnabled = 6,
 		kColorTransparency = 7,
-		
+
 		kTextInvertedBackground = 8,
 		kTextInvertedColor = 9,
-		
+
 		kWidgetBackgroundStart = 10,
 		kWidgetBackgroundEnd = 11,
 		kWidgetBackgroundSmallStart = 12,
 		kWidgetBackgroundSmallEnd = 13,
-		
+
 		kButtonBackgroundStart = 14,
 		kButtonBackgroundEnd = 15,
 		kButtonTextEnabled = 16,
 		kButtonTextDisabled = 17,
 		kButtonTextHighlight = 18,
-		
+
 		kSliderBackgroundStart = 19,
 		kSliderBackgroundEnd = 20,
 		kSliderStart = 21,
 		kSliderEnd = 22,
-		
+
 		kTabBackgroundStart = 23,
 		kTabBackgroundEnd = 24,
-		
+
 		kScrollbarBackgroundStart = 25,
 		kScrollbarBackgroundEnd = 26,
 		kScrollbarButtonStart = 27,
 		kScrollbarButtonEnd = 28,
 		kScrollbarSliderStart = 29,
 		kScrollbarSliderEnd = 30,
-		
+
 		kCaretColor = 31,
-		
+
 		kSliderHighStart = 32,
 		kSliderHighEnd = 33,
-		
+
 		kButtonBackgroundHighlightStart = 34,
 		kButtonBackgroundHighlightEnd = 35,
-		
+
 		kScrollbarButtonHighlightStart = 36,
 		kScrollbarButtonHighlightEnd = 37,
 		kScrollbarSliderHighlightStart = 38,
@@ -290,7 +290,7 @@ private:
 		kPopUpWidgetEnd = 41,
 		kPopUpWidgetHighlightStart = 42,
 		kPopUpWidgetHighlightEnd = 43,
-		
+
 		kEditTextBackgroundStart = 44,
 		kEditTextBackgroundEnd = 45,
 
@@ -301,34 +301,34 @@ private:
 
 		kColorHandlesMax
 	};
-	
+
 	OverlayColor _colors[kColorHandlesMax];
-	
+
 	enum GradientFactors {
 		kMainDialogFactor = 0,
 		kDialogFactor = 1,
 		kDialogSpecialFactor = 2,
-		
+
 		kWidgetSmallFactor = 3,
 		kWidgetFactor = 4,
-		
+
 		kButtonFactor = 5,
-		
+
 		kSliderFactor = 6,
 		kSliderBackground = 7,
-		
+
 		kTabFactor = 7,
-		
+
 		kScrollbarFactor = 8,
 		kScrollbarBkgdFactor = 9,
 
 		kPopUpWidgetFactor = 10,
-		
+
 		kEditTextFactor = 11,
-		
+
 		kMaxGradientFactors
 	};
-	
+
 	uint _gradientFactors[kMaxGradientFactors];
 };
 
diff --git a/gui/console.h b/gui/console.h
index c683a1f619..d347112862 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -33,7 +33,7 @@ namespace GUI {
 class ScrollBarWidget;
 
 /*
- FIXME #1: The console dialog code has some fundamental problems. 
+ FIXME #1: The console dialog code has some fundamental problems.
  First of, note the conflict between the (constant) value kCharsPerLine, and the
  (variable) value _pageWidth. Look a bit at the code get familiar with them,
  then return...
@@ -41,26 +41,26 @@ class ScrollBarWidget;
  When the user changes the scaler, the console will get resized. If the dialog
  becomes smaller because of this, we may have to rewrap text. If the resolution
  is then increased again, we'd end up with garbled content.
- 
- One can now either ignore this problem (and modify our code accordingly to 
+
+ One can now either ignore this problem (and modify our code accordingly to
  implement this simple rewrapping -- we currently don't do that at all!).
- 
+
  Or, one can go and implement a more complete console, by replacing the
  _buffer by a real line buffer -- an arrach of char* pointers.
  This will allow one to implement resizing perfectly, but has the drawback
  of making things like scrolling, drawing etc. more complicated.
- 
+
  Either way, the current situation is bad, and we should resolve it one way
  or the other (and if you can think of a thirds, feel free to suggest it).
- 
- 
- 
+
+
+
  FIXME #2: Another problem is that apparently _pageWidth isn't computed quite
  correctly. The current line ends well before reaching the right side of the
  console dialog. That's irritating and should be fixed.
- 
- 
- FIXME #3: The scroll bar is not shown initially, but the area it would 
+
+
+ FIXME #3: The scroll bar is not shown initially, but the area it would
  occupy is not used for anything else. As a result, the gap described above
  becomes even wider and thus even more irritating.
 */
@@ -74,7 +74,7 @@ protected:
 		kBufferSize	= 32768,
 		kCharsPerLine = 128,
 		kLineBufferSize = 256,
-	
+
 		kHistorySize = 20
 	};
 
@@ -156,7 +156,7 @@ public:
 		_completionCallbackProc = proc;
 		_completionCallbackRefCon = refCon;
 	}
-	
+
 	int getCharsPerLine() {
 		return _pageWidth;
 	}
diff --git a/gui/debugger.h b/gui/debugger.h
index da0253c148..ac6ae62e03 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -52,7 +52,7 @@ protected:
 		virtual ~Debuglet() {}
 		virtual bool operator()(int argc, const char **argv) = 0;
 	};
-	
+
 	template <class T>
 	class DelegateDebuglet : public Debuglet {
 		typedef bool (T::*Method)(int argc, const char **argv);
@@ -68,7 +68,7 @@ protected:
 			return (_delegate->*_method)(argc, argv);
 		};
 	};
-	
+
 	// Convenicence macro for registering a method of a debugger class
 	// as the current command.
 	#define WRAP_METHOD(cls, method) \
@@ -95,7 +95,7 @@ protected:
 
 	int _frame_countdown;
 	bool _detach_now;
-	
+
 private:
 	// TODO: Consider replacing the following two arrays by a Hashmap
 	int _dvar_count;
@@ -121,7 +121,7 @@ protected:
 	// handled, false otherwise.
 	virtual bool handleCommand(int argc, const char **argv, bool &keepRunning);
 
-	
+
 private:
 	void detach();
 	void enter();
diff --git a/gui/massadd.h b/gui/massadd.h
index 5723f5a6f8..29d24ca9a5 100644
--- a/gui/massadd.h
+++ b/gui/massadd.h
@@ -44,7 +44,7 @@ public:
 private:
 	Common::Stack<FilesystemNode>  _scanStack;
 	GameList _games;
-	
+
 	int _dirsScanned;
 
 	Widget *_okButton;
diff --git a/gui/module.mk b/gui/module.mk
index 4e93e6b5b3..c572dcbeea 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -27,5 +27,5 @@ MODULE_OBJS := \
 	ThemeModern.o \
 	theme-config.o
 
-# Include common rules 
+# Include common rules
 include $(srcdir)/rules.mk
diff --git a/gui/newgui.h b/gui/newgui.h
index 6a2920048f..bfbe77cdc0 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -128,7 +128,7 @@ protected:
 
 	void setupCursor();
 	void animateCursor();
-	
+
 	Dialog *getTopDialog() const;
 };
 
diff --git a/gui/options.h b/gui/options.h
index 8743528f12..6f0fccf3cb 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -108,7 +108,7 @@ private:
 	StaticTextWidget *_midiGainDesc;
 	SliderWidget *_midiGainSlider;
 	StaticTextWidget *_midiGainLabel;
-	
+
 	//
 	// Subtitle controls
 	//
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index e8adf7c327..e6d8026edb 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -583,9 +583,9 @@ void Theme::processSingleLine(const String &section, const String &prefix, const
 
 	// If we have all 4 parameters, set .x2 and .y2
 	if (npostfix == 3) {
-		_evaluator->setVar(prefixedname + ".x2", 
+		_evaluator->setVar(prefixedname + ".x2",
 			_evaluator->getVar(prefixedname + ".x") + _evaluator->getVar(prefixedname + ".w"));
-		_evaluator->setVar(prefixedname + ".y2", 
+		_evaluator->setVar(prefixedname + ".y2",
 			_evaluator->getVar(prefixedname + ".y") + _evaluator->getVar(prefixedname + ".h"));
 	}
 
@@ -733,7 +733,7 @@ bool Theme::sectionIsSkipped(Common::ConfigFile &config, const char *name, int w
 		default:
 			break;
 		}
-		
+
 		ptr++;
 	}
 
diff --git a/gui/theme.cpp b/gui/theme.cpp
index 1765c3d5f5..a044769bfd 100644
--- a/gui/theme.cpp
+++ b/gui/theme.cpp
@@ -35,7 +35,7 @@ Theme::Theme() : _drawArea(), _stylefile(""), _configFile(), _loadedThemeX(0), _
 
 	_evaluator = new Eval();
 }
-	
+
 Theme::~Theme() {
 	delete _evaluator;
 }
@@ -79,9 +79,9 @@ const Graphics::Font *Theme::loadFont(const char *filename) {
 			unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);
 			unzCloseCurrentFile(zipFile);
 			Common::MemoryReadStream stream(buffer, fileInfo.uncompressed_size+1);
-	
+
 			font = Graphics::NewFont::loadFromCache(stream);
-	
+
 			delete [] buffer;
 			buffer = 0;
 		}
@@ -109,9 +109,9 @@ const Graphics::Font *Theme::loadFont(const char *filename) {
 			unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);
 			unzCloseCurrentFile(zipFile);
 			Common::MemoryReadStream stream(buffer, fileInfo.uncompressed_size+1);
-	
+
 			font = Graphics::NewFont::loadFont(stream);
-	
+
 			delete [] buffer;
 			buffer = 0;
 		}
diff --git a/gui/theme.h b/gui/theme.h
index 69ea122535..4f61609fbd 100644
--- a/gui/theme.h
+++ b/gui/theme.h
@@ -175,7 +175,7 @@ public:
 	 *
 	 * This for examples displays the overlay, clears the
 	 * renderer's temporary screen buffers and does other
-	 * things to make the renderer for use. 
+	 * things to make the renderer for use.
 	 *
 	 * This will NOT back up the data on the overlay.
 	 * So if you've got data in the overlay save it before