diff options
| author | Johannes Schickel | 2009-05-24 15:17:42 +0000 | 
|---|---|---|
| committer | Johannes Schickel | 2009-05-24 15:17:42 +0000 | 
| commit | b3c6751b9b7fc1401fd5e87a034cdaec92b67b20 (patch) | |
| tree | aa00dba58fb88ea2e095b886963370c7290c692b /gui | |
| parent | 7c1eb057146af11793c627327f3fefe309d27fbb (diff) | |
| download | scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.gz scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.bz2 scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.zip  | |
Strip trailing whitespaces in the whole code base.
svn-id: r40867
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/GuiManager.cpp | 2 | ||||
| -rw-r--r-- | gui/ListWidget.cpp | 2 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 14 | ||||
| -rw-r--r-- | gui/ThemeLayout.cpp | 6 | ||||
| -rw-r--r-- | gui/launcher.cpp | 2 | ||||
| -rw-r--r-- | gui/themebrowser.cpp | 4 | ||||
| -rw-r--r-- | gui/widget.cpp | 2 | ||||
| -rw-r--r-- | gui/widget.h | 2 | 
8 files changed, 17 insertions, 17 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp index 6f31ff9658..cf8b7b2d9d 100644 --- a/gui/GuiManager.cpp +++ b/gui/GuiManager.cpp @@ -95,7 +95,7 @@ void GuiManager::initKeymap() {  	act = new Action(guiMap, "CLOS", "Close", kGenericActionType, kStartKeyType);  	act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0)); -	 +  	act = new Action(guiMap, "CLIK", "Mouse click");  	act->addLeftClickEvent(); diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp index 7f6c315ac0..06cbcdcbd9 100644 --- a/gui/ListWidget.cpp +++ b/gui/ListWidget.cpp @@ -403,7 +403,7 @@ void ListWidget::drawWidget() {  			buffer = _list[pos];  			width = _w - r.left - scrollbarW;  			g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight - 2), -									buffer, _state, Graphics::kTextAlignLeft, inverted, pad, true);			 +									buffer, _state, Graphics::kTextAlignLeft, inverted, pad, true);  		}  		_textWidth[i] = width; diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 30aab03812..fe93a1f7d6 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -382,7 +382,7 @@ bool ThemeEngine::init() {  		if (node.getName().hasSuffix(".zip") && !node.isDirectory()) {  #ifdef USE_ZLIB  			Common::ZipArchive *zipArchive = new Common::ZipArchive(node); -	 +  			if (!zipArchive || !zipArchive->isOpen()) {  				delete zipArchive;  				zipArchive = 0; @@ -397,7 +397,7 @@ bool ThemeEngine::init() {  			_themeArchive = new Common::FSDirectory(node);  		}  	} -	 +  	// Load the theme  	// We pass the theme file here by default, so the user will  	// have a descriptive error message. The only exception will @@ -415,7 +415,7 @@ void ThemeEngine::clearAll() {  }  void ThemeEngine::refresh() { -	 +  	// Flush all bitmaps if the overlay pixel format changed.  	if (_overlayFormat != _system->getOverlayFormat()) {  		for (ImagesMap::iterator i = _bitmaps.begin(); i != _bitmaps.end(); ++i) { @@ -622,7 +622,7 @@ void ThemeEngine::loadTheme(const Common::String &themeId) {  		// Load the archive containing image and XML data  		_themeOk = loadThemeXML(themeId);  	} -	 +  	if (!_themeOk) {  		warning("Failed to load theme '%s'", themeId.c_str());  		return; @@ -1487,10 +1487,10 @@ void ThemeEngine::listUsableThemes(Common::FSNode node, Common::List<ThemeDescri  			list.push_back(td);  		}  	} -	 +  	fileList.clear();  #endif -	 +  	// Check if we exceeded the given recursion depth  	if (depth - 1 == -1)  		return; @@ -1509,7 +1509,7 @@ Common::String ThemeEngine::getThemeFile(const Common::String &id) {  	// of the builtin one.  	if (id.equalsIgnoreCase("default"))  		return Common::String(); -	 +  	// For our builtin theme we don't have to do anything for now too  	if (id.equalsIgnoreCase("builtin"))  		return Common::String(); diff --git a/gui/ThemeLayout.cpp b/gui/ThemeLayout.cpp index ab6d4c7a0e..3afded5504 100644 --- a/gui/ThemeLayout.cpp +++ b/gui/ThemeLayout.cpp @@ -192,7 +192,7 @@ void ThemeLayoutStacked::reflowLayoutVertical() {  		// Advance the vertical offset by the height of the newest item, plus  		// the item spacing value.  		curY += _children[i]->getHeight() + _spacing; -		 +  		// Update width and height of this stack layout  		_w = MAX(_w, (int16)(_children[i]->getWidth() + _padding.left + _padding.right));  		_h += _children[i]->getHeight() + _spacing; @@ -205,7 +205,7 @@ void ThemeLayoutStacked::reflowLayoutVertical() {  	// If there were any items with undetermined height, then compute and set  	// their height now. We do so by determining how much space is left, and -	// then distributing this equally over all items which need auto-resizing.  +	// then distributing this equally over all items which need auto-resizing.  	if (rescount) {  		int newh = (getParentHeight() - _h - _padding.bottom) / rescount; @@ -268,7 +268,7 @@ void ThemeLayoutStacked::reflowLayoutHorizontal() {  	// If there were any items with undetermined width, then compute and set  	// their width now. We do so by determining how much space is left, and -	// then distributing this equally over all items which need auto-resizing.  +	// then distributing this equally over all items which need auto-resizing.  	if (rescount) {  		int neww = (getParentWidth() - _w - _padding.right) / rescount; diff --git a/gui/launcher.cpp b/gui/launcher.cpp index b2841b2781..de58fe463d 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -915,7 +915,7 @@ void LauncherDialog::updateButtons() {  		? "Mass Add"  		: "Add Game"; -	if (_addButton->getLabel() != newAddButtonLabel)  +	if (_addButton->getLabel() != newAddButtonLabel)  		_addButton->setLabel(newAddButtonLabel);  } diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp index f5dfd5950c..0dd6aef401 100644 --- a/gui/themebrowser.cpp +++ b/gui/themebrowser.cpp @@ -72,7 +72,7 @@ void ThemeBrowser::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)  		if (selection < 0)  			break; -		// TODO:  +		// TODO:  		// Currently ThemeEngine::listUseableThemes uses a  		// list. Thus we can not use operator[] here but  		// need to iterate through the list. We might want @@ -97,7 +97,7 @@ void ThemeBrowser::updateListing() {  	ThemeEngine::listUsableThemes(_themes); -	const Common::String currentThemeId = g_gui.theme()->getThemeId();	 +	const Common::String currentThemeId = g_gui.theme()->getThemeId();  	int currentThemeIndex = 0, index = 0;  	Common::StringList list; diff --git a/gui/widget.cpp b/gui/widget.cpp index 478e1d87f4..12da012c7b 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -228,7 +228,7 @@ void StaticTextWidget::drawWidget() {  #pragma mark -  ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &label, uint32 cmd, uint8 hotkey) -	: StaticTextWidget(boss, x, y, w, h, label, Graphics::kTextAlignCenter), CommandSender(boss),  +	: StaticTextWidget(boss, x, y, w, h, label, Graphics::kTextAlignCenter), CommandSender(boss),  	  _cmd(cmd), _hotkey(hotkey) {  	setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);  	_type = kButtonWidget; diff --git a/gui/widget.h b/gui/widget.h index 3f4b4c04ae..95f146a414 100644 --- a/gui/widget.h +++ b/gui/widget.h @@ -45,7 +45,7 @@ enum {  	WIDGET_CLEARBG		= 1 <<  5,  	WIDGET_WANT_TICKLE	= 1 <<  7,  	WIDGET_TRACK_MOUSE	= 1 <<  8, -	// Retain focus on mouse up. By default widgets lose focus on mouseup,  +	// Retain focus on mouse up. By default widgets lose focus on mouseup,  	// but some widgets might want to retain it - widgets where you enter  	// text, for instance  	WIDGET_RETAIN_FOCUS	= 1 <<  9,  | 
