Sat Jul 30 14:15:12 CEST 2005

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/gui

Modified Files:
	Actions.cpp Actions.h EditTextWidget.cpp EditTextWidget.h 
	KeysDialog.cpp ListWidget.cpp ListWidget.h PopUpWidget.cpp 
	PopUpWidget.h ScrollBarWidget.h TabWidget.cpp about.cpp 
	about.h browser.cpp chooser.cpp console.h dialog.h 
	editable.cpp editable.h launcher.cpp launcher.h message.cpp 
	newgui.cpp newgui.h options.cpp widget.cpp widget.h 
Log Message:
Remove trailing whitespaces.


Index: Actions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/Actions.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

--- Actions.cpp	5 Jul 2005 20:22:37 -0000	1.1
+++ Actions.cpp	30 Jul 2005 21:11:00 -0000	1.2
@@ -34,8 +34,8 @@
 
 namespace GUI {
 
-Actions* Actions::Instance() {		
-	return _instance;		
+Actions* Actions::Instance() {
+	return _instance;
 }
 
 Actions::Actions(GameDetector &detector) :
@@ -91,9 +91,9 @@
 
 bool Actions::performMapped(unsigned int keyCode, bool pushed) {
 	int i;
-	
+
 	for (i=0; i<size(); i++) {
-		if (_action_mapping[i] == keyCode && _action_enabled[i]) 
+		if (_action_mapping[i] == keyCode && _action_enabled[i])
 				return perform((ActionType)i, pushed);
 	}
 
@@ -159,11 +159,11 @@
 	return _key_action[action];
 }
 
-// Game detector 
+// Game detector
 GameDetector& Actions::gameDetector(){
 	return *_detector;
 }
 Actions *Actions::_instance = NULL;
 
-	
+
 } // namespace GUI

Index: Actions.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/Actions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Actions.h	5 Jul 2005 20:22:37 -0000	1.1
+++ Actions.h	30 Jul 2005 21:11:00 -0000	1.2
@@ -28,7 +28,7 @@
 #include "base/gameDetector.h"
 #include "gui/Key.h"
 namespace GUI {
-	
+
 #define MAX_ACTIONS 20
 
 typedef int ActionType;
@@ -65,7 +65,7 @@
 
 	virtual ~Actions();
 
-    // Game detector 
+    // Game detector
     GameDetector& gameDetector();
 protected:
 	Actions(GameDetector &detector);

Index: EditTextWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- EditTextWidget.cpp	24 Jun 2005 16:08:17 -0000	1.35
+++ EditTextWidget.cpp	30 Jul 2005 21:11:00 -0000	1.36
@@ -72,7 +72,7 @@
 
 Common::Rect EditTextWidget::getEditRect() const {
 	Common::Rect r(2, 1, _w - 2, _h);
-	
+
 	return r;
 }
 

Index: EditTextWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- EditTextWidget.h	20 May 2005 15:03:25 -0000	1.20
+++ EditTextWidget.h	30 Jul 2005 21:11:00 -0000	1.21
@@ -46,7 +46,7 @@
 	void drawWidget(bool hilite);
 	void receivedFocusWidget();
 	void lostFocusWidget();
-	
+
 	void startEditMode();
 	void endEditMode();
 	void abortEditMode();

Index: KeysDialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/KeysDialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KeysDialog.cpp	5 Jul 2005 20:22:37 -0000	1.1
+++ KeysDialog.cpp	30 Jul 2005 21:11:00 -0000	1.2
@@ -70,7 +70,7 @@
 	// Get actions names
 	Common::StringList l;
 
-	for (int i = 0; i < Actions::Instance()->size(); i++) 
+	for (int i = 0; i < Actions::Instance()->size(); i++)
 		l.push_back(Actions::Instance()->actionName((ActionType)i));
 
 	_actionsList->setList(l);

Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ListWidget.cpp	24 Jun 2005 16:08:19 -0000	1.55
+++ ListWidget.cpp	30 Jul 2005 21:11:00 -0000	1.56
@@ -28,13 +28,13 @@
 
 ListWidget::ListWidget(GuiObject *boss, int x, int y, int w, int h, WidgetSize ws)
 	: EditableWidget(boss, x, y, w, h, ws), CommandSender(boss) {
-	
+
 	if (ws == kBigWidgetSize) {
 		_w = w - kBigScrollBarWidth;
 	} else {
 		_w = w - kNormalScrollBarWidth;
 	}
-	
+
 	_flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE;
 	_type = kListWidget;
 	_editMode = false;
@@ -45,7 +45,7 @@
 	_scrollBar = new ScrollBarWidget(boss, _x + _w, _y, (ws == kBigWidgetSize ? kBigScrollBarWidth : kNormalScrollBarWidth), _h);
 	_scrollBar->setTarget(this);
 	_currentKeyDown = 0;
-	
+
 	_quickSelectTime = 0;
 
 	// The item is selected, thus _bgcolor is used to draw the caret and _textcolorhi to erase it
@@ -129,7 +129,7 @@
 		_selectedItem = newSelectedItem;
 		sendCommand(kListSelectionChangedCmd, _selectedItem);
 	}
-	
+
 	// TODO: Determine where inside the string the user clicked and place the
 	// caret accordingly. See _editScrollOffset and EditTextWidget::handleMouseDown.
 	draw();
@@ -182,7 +182,7 @@
 			_quickSelectStr += (char)ascii;
 		}
 		_quickSelectTime = time + 300;	// TODO: Turn this into a proper constant (kQuickSelectDelay ?)
-		
+
 
 		// FIXME: This is bad slow code (it scans the list linearly each time a
 		// key is pressed); it could be much faster. Only of importance if we have
@@ -331,7 +331,7 @@
 			buffer = _editString;
 			adjustOffset();
 			deltax = -_editScrollOffset;
-	
+
 			gui->drawString(buffer, _x + r.left, y, r.width(), textColor, kTextAlignLeft, deltax, false);
 		} else {
 			buffer = _list[pos];
@@ -353,7 +353,7 @@
 		sprintf(temp, "%2d. ", (_list.size() - 1 + _numberingMode));
 		r.left += g_gui.getStringWidth(temp);
 	}
-	
+
 	return r;
 }
 

Index: ListWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ListWidget.h	3 Jun 2005 11:33:15 -0000	1.33
+++ ListWidget.h	30 Jul 2005 21:11:00 -0000	1.34
@@ -56,14 +56,14 @@
 	int				_selectedItem;
 	ScrollBarWidget	*_scrollBar;
 	int				_currentKeyDown;
-	
+
 	String			_quickSelectStr;
 	uint32			_quickSelectTime;
 
 public:
 	ListWidget(GuiObject *boss, int x, int y, int w, int h, WidgetSize ws = kDefaultWidgetSize);
 	virtual ~ListWidget();
-	
+
 	void setList(const StringList& list);
 	const StringList& getList()	const			{ return _list; }
 	int getSelected() const						{ return _selectedItem; }
@@ -73,7 +73,7 @@
 	bool isEditable() const						{ return _editable; }
 	void setEditable(bool editable)				{ _editable = editable; }
 	void scrollTo(int item);
-	
+
 	virtual void handleTickle();
 	virtual void handleMouseDown(int x, int y, int button, int clickCount);
 	virtual void handleMouseUp(int x, int y, int button, int clickCount);
@@ -95,7 +95,7 @@
 	void scrollBarRecalc();
 
 	void abortEditMode();
-	
+
 	Common::Rect getEditRect() const;
 
 	void lostFocusWidget();

Index: PopUpWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- PopUpWidget.cpp	24 Jun 2005 15:22:41 -0000	1.38
+++ PopUpWidget.cpp	30 Jul 2005 21:11:00 -0000	1.39
@@ -40,7 +40,7 @@
 	uint32		_openTime;
 public:
 	PopUpDialog(PopUpWidget *boss, int clickX, int clickY, WidgetSize ws = kDefaultWidgetSize);
-	
+
 	void drawDialog();
 
 	void handleMouseUp(int x, int y, int button, int clickCount);
@@ -50,11 +50,11 @@
 
 protected:
 	void drawMenuEntry(int entry, bool hilite);
-	
+
 	int findItem(int x, int y) const;
 	void setSelection(int item);
 	bool isMouseDown();
-	
+
 	void moveUp();
 	void moveDown();
 };
@@ -71,7 +71,7 @@
 	_y = _popUpBoss->getAbsY() - _popUpBoss->_selectedItem * kLineHeight;
 	_h = _popUpBoss->_entries.size() * kLineHeight + 2;
 	_w = _popUpBoss->_w - kLineHeight + 2 - _popUpBoss->_labelWidth;
-	
+
 	// Perform clipping / switch to scrolling mode if we don't fit on the screen
 	// FIXME - OSystem should send out notification messages when the screen
 	// resolution changes... we could generalize CommandReceiver and CommandSender.
@@ -112,7 +112,7 @@
 }
 
 void PopUpDialog::handleMouseUp(int x, int y, int button, int clickCount) {
-	// Mouse was released. If it wasn't moved much since the original mouse down, 
+	// Mouse was released. If it wasn't moved much since the original mouse down,
 	// let the popup stay open. If it did move, assume the user made his selection.
 	int dist = (_clickX - x) * (_clickX - x) + (_clickY - y) * (_clickY - y);
 	if (dist > 3 * 3 || getMillis() - _openTime > 300) {
@@ -201,7 +201,7 @@
 	// TODO/FIXME - need a way to determine whether any mouse buttons are pressed or not.
 	// Sure, we could just count mouse button up/down events, but that is cumbersome and
 	// error prone. Would be much nicer to add an API to OSystem for this...
-	
+
 	return false;
 }
 

Index: PopUpWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- PopUpWidget.h	3 Jun 2005 09:32:58 -0000	1.15
+++ PopUpWidget.h	30 Jul 2005 21:11:00 -0000	1.16
@@ -35,7 +35,7 @@
  * Popup or dropdown widget which, when clicked, "pop up" a list of items and
  * lets the user pick on of them.
  *
- * Implementation wise, when the user selects an item, then a kPopUpItemSelectedCmd 
+ * Implementation wise, when the user selects an item, then a kPopUpItemSelectedCmd
  * is broadcast, with data being equal to the tag value of the selected entry.
  */
 class PopUpWidget : public Widget, public CommandSender {
@@ -65,7 +65,7 @@
 
 	/** Select the entry at the given index. */
 	void setSelected(int item);
-	
+
 	/** Select the first entry matching the given tag. */
 	void setSelectedTag(uint32 tag);
 

Index: ScrollBarWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ScrollBarWidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ScrollBarWidget.h	15 May 2005 18:02:10 -0000	1.10
+++ ScrollBarWidget.h	30 Jul 2005 21:11:00 -0000	1.11
@@ -46,7 +46,7 @@
 		kPageUpPart,
 		kPageDownPart
 	} Part;
-	
+
 	Part	_part;
 	int		_sliderHeight;
 	int		_sliderPos;

Index: TabWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/TabWidget.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- TabWidget.cpp	24 Jun 2005 15:22:41 -0000	1.18
+++ TabWidget.cpp	30 Jul 2005 21:11:00 -0000	1.19
@@ -146,12 +146,12 @@
 
 void TabWidget::drawWidget(bool hilite) {
 	NewGui *gui = &g_gui;
-	
+
 	const int left1  = _x + 1;
 	const int right1 = _x + kTabLeftOffset + _activeTab * (_tabWidth + kTabSpacing);
 	const int left2  = right1 + _tabWidth;
 	const int right2 = _x + _w - 2;
-	
+
 	// Draw horizontal line
 	gui->hLine(left1, _y + _tabHeight - 2, right1, gui->_shadowcolor);
 	gui->hLine(left2, _y + _tabHeight - 2, right2, gui->_shadowcolor);
@@ -160,7 +160,7 @@
 	int i, x = _x + kTabLeftOffset;
 	for (i = 0; i < (int)_tabs.size(); ++i) {
 		OverlayColor color = (i == _activeTab) ? gui->_color : gui->_shadowcolor;
-		int yOffset = (i == _activeTab) ? 0 : 2; 
+		int yOffset = (i == _activeTab) ? 0 : 2;
 		box(x, _y + yOffset, _tabWidth, _tabHeight - yOffset, color, color, (i == _activeTab));
 		gui->drawString(_tabs[i].title, x + kTabPadding, _y + yOffset / 2 + (_tabHeight - gui->getFontHeight() - 3), _tabWidth - 2 * kTabPadding, gui->_textcolor, kTextAlignCenter);
 		x += _tabWidth + kTabSpacing;

Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- about.cpp	24 Jun 2005 15:22:41 -0000	1.38
+++ about.cpp	30 Jul 2005 21:11:00 -0000	1.39
@@ -71,12 +71,12 @@
 AboutDialog::AboutDialog()
 	: Dialog(10, 20, 300, 174),
 	_scrollPos(0), _scrollTime(0), _modifiers(0), _willClose(false) {
-	
+
 	int i;
-	
+
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
-	
+
 	int outerBorder;
 
 	if (screenW >= 400 && screenH >= 300) {
@@ -91,7 +91,7 @@
 
 	_w = screenW - 2 * outerBorder;
 	_h = screenH - 2 * outerBorder;
-	
+
 	_lineHeight = g_gui.getFontHeight() + 3;
 
 	// Heuristic to compute 'optimal' dialog width
@@ -123,10 +123,10 @@
 	addLine(features.c_str());
 
 	_lines.push_back("");
-	
+
 	for (i = 0; i < ARRAYSIZE(credits_intro); i++)
 		addLine(credits_intro[i]);
-	
+
 	for (i = 0; i < ARRAYSIZE(credits); i++)
 		addLine(credits[i]);
 
@@ -155,13 +155,13 @@
 			break;
 		}
 	}
-	
+
 	if (*str == 0) {
 		_lines.push_back(format);
 	} else {
 		Common::StringList wrappedLines;
 		g_gui.getFont().wordWrapText(str, _w - 2*xOff, wrappedLines);
-		
+
 		for (Common::StringList::const_iterator i = wrappedLines.begin(); i != wrappedLines.end(); ++i) {
 			_lines.push_back(format + *i);
 		}
@@ -252,7 +252,7 @@
 		if (align == Graphics::kTextAlignCenter)
 			while (*str && *str == ' ')
 				str++;
-	
+
 		g_gui.drawString(str, _x + xOff, y, _w - 2 * xOff, color, align, 0, false);
 		y += _lineHeight;
 	}

Index: about.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- about.h	3 Jun 2005 12:07:53 -0000	1.15
+++ about.h	30 Jul 2005 21:11:01 -0000	1.16
@@ -37,9 +37,9 @@
 	byte		_modifiers;
 	bool		_willClose;
 	Graphics::Surface	_canvas;
-	
+
 	int xOff, yOff;
-	
+
 	void addLine(const char *str);
 
 public:

Index: browser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/browser.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- browser.cpp	24 Jun 2005 16:08:31 -0000	1.34
+++ browser.cpp	30 Jul 2005 21:11:01 -0000	1.35
@@ -57,7 +57,7 @@
 	NavReplyRecord reply;
 	OSStatus err;
 	bool choiceMade = false;
-	
+
 	// If in fullscreen mode, switch to windowed mode
 	bool wasFullscreen = g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
 	if (wasFullscreen)
@@ -65,21 +65,21 @@
 
 	// Temporarily show the real mouse
 	ShowCursor();
-	
+
 	err = NavGetDefaultDialogCreationOptions(&options);
 	assert(err == noErr);
 	options.windowTitle = _titleRef;
 //	options.message = CFSTR("Select your game directory");
 	options.modality = kWindowModalityAppModal;
-	
+
 	if (_isDirBrowser)
 		err = NavCreateChooseFolderDialog(&options, 0, 0, 0, &dialogRef);
 	else
 		err = NavCreateChooseFileDialog(&options, 0, 0, 0, 0, 0, &dialogRef);
 	assert(err == noErr);
-	
+
 	windowRef = NavDialogGetWindow(dialogRef);
-	
+
 	err = NavDialogRun(dialogRef);
 	assert(err == noErr);
 
@@ -90,12 +90,12 @@
 	if (result == kNavUserActionChoose) {
 		err = NavDialogGetReply(dialogRef, &reply);
 		assert(err == noErr);
-		
+
 		if (reply.validRecord && err == noErr) {
 			SInt32 theCount;
 			AECountItems(&reply.selection, &theCount);
 			assert(theCount == 1);
-	
+
 			AEKeyword keyword;
 			FSRef ref;
 			char buf[4096];
@@ -103,11 +103,11 @@
 			assert(err == noErr);
 			err = FSRefMakePath(&ref, (UInt8*)buf, sizeof(buf)-1);
 			assert(err == noErr);
-			
+
 			_choice = FilesystemNode(buf);
 			choiceMade = true;
 		}
- 
+
 		err = NavDisposeReply(&reply);
 		assert(err == noErr);
 	}
@@ -184,7 +184,7 @@
 
 	// Alway refresh file list
 	updateListing();
-	
+
 	// Call super implementation
 	Dialog::open();
 }

Index: chooser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/chooser.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- chooser.cpp	24 Jun 2005 15:22:41 -0000	1.18
+++ chooser.cpp	30 Jul 2005 21:11:01 -0000	1.19
@@ -70,7 +70,7 @@
 	// it's used to list savegames in the 320x200 version of the GUI.
 	_list = new ListWidget(this, 10, yoffset, _w - 2 * 10, _h - yoffset - buttonHeight - 12, ws);
 	_list->setNumberingMode(kListNumberingOff);
-	
+
 	// Buttons
 	addButton(this, _w - 2 * (buttonWidth + 10), _h - buttonHeight - 8, "Cancel", kCloseCmd, 0, ws);
 	_chooseButton = addButton(this, _w - (buttonWidth + 10), _h - buttonHeight - 8, buttonLabel, kChooseCmd, 0, ws);

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- console.h	13 Jul 2005 14:38:26 -0000	1.33
+++ console.h	30 Jul 2005 21:11:01 -0000	1.34
@@ -53,26 +53,26 @@
 	int		_currentPos;
 	int		_scrollLine;
 	int		_firstLineInBuffer;
-	
+
 	int		_promptStartPos;
 	int 	_promptEndPos;
 
 	bool	_caretVisible;
 	uint32	_caretTime;
-	
+
 	enum SlideMode {
 		kNoSlideMode,
 		kUpSlideMode,
 		kDownSlideMode
 	};
-		
+
 	SlideMode	_slideMode;
 	uint32	_slideTime;
 
 	ScrollBarWidget *_scrollBar;
 
 	// The _callbackProc is called whenver a data line is entered
-	// 
+	//
 	InputCallbackProc _callbackProc;
 	void *_callbackRefCon;
 
@@ -106,7 +106,7 @@
 	int vprintf(const char *format, va_list argptr);
 #undef putchar
 	void putchar(int c);
-	
+
 	void setInputCallback(InputCallbackProc proc, void *refCon) {
 		_callbackProc = proc;
 		_callbackRefCon = refCon;

Index: dialog.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dialog.h	2 Jun 2005 12:29:01 -0000	1.40
+++ dialog.h	30 Jul 2005 21:11:01 -0000	1.41
@@ -61,7 +61,7 @@
 protected:
 	virtual void open();
 	virtual void close();
-	
+
 	virtual void draw();
 	virtual void drawDialog();
 
@@ -74,7 +74,7 @@
 	virtual void handleMouseMoved(int x, int y, int button);
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 	virtual void handleScreenChanged() {}
-	
+
 	Widget *findWidget(int x, int y); // Find the widget at pos x,y if any
 
 	ButtonWidget *addButton(GuiObject *boss, int x, int y, const Common::String &label, uint32 cmd, char hotkey, WidgetSize ws = kDefaultWidgetSize);

Index: editable.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/editable.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- editable.cpp	24 Jun 2005 16:08:31 -0000	1.8
+++ editable.cpp	30 Jul 2005 21:11:01 -0000	1.9
@@ -151,7 +151,7 @@
 
 	if (y < 0 || y + editRect.height() - 2 >= _h)
 		return;
-	
+
 	x += getAbsX();
 	y += getAbsY();
 
@@ -169,7 +169,7 @@
 
 bool EditableWidget::adjustOffset() {
 	// check if the caret is still within the textbox; if it isn't,
-	// adjust _editScrollOffset 
+	// adjust _editScrollOffset
 
 	int caretpos = getCaretOffset();
 	const int editWidth = getEditRect().width();

Index: editable.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/editable.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- editable.h	3 Jun 2005 11:33:15 -0000	1.5
+++ editable.h	30 Jul 2005 21:11:01 -0000	1.6
@@ -65,7 +65,7 @@
 	void drawCaret(bool erase);
 	bool setCaretPos(int newPos);
 	bool adjustOffset();
-	
+
 	virtual bool tryInsertChar(char c, int pos);
 };
 

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- launcher.cpp	24 Jun 2005 15:22:41 -0000	1.126
+++ launcher.cpp	30 Jul 2005 21:11:01 -0000	1.127
@@ -58,8 +58,8 @@
 	kEditGameCmd = 'EDTG',
 	kRemoveGameCmd = 'REMG',
 	kQuitCmd = 'QUIT',
-	
-	
+
+
 	kCmdGlobalGraphicsOverride = 'OGFX',
 	kCmdGlobalAudioOverride = 'OSFX',
 	kCmdGlobalMIDIOverride = 'OMID',
@@ -82,7 +82,7 @@
 	DomainEditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, WidgetSize ws = kNormalWidgetSize)
 		: EditTextWidget(boss, x, y, w, h, text, ws) {
 	}
-	
+
 protected:
 	bool tryInsertChar(char c, int pos) {
 		if (isalnum(c) || c == '-' || c == '_') {
@@ -141,7 +141,7 @@
 
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
-	
+
 	_w = screenW - 2 * 10;
 
 	GUI::WidgetSize ws;
@@ -162,7 +162,7 @@
 		buttonWidth = kButtonWidth;
 		labelWidth = 60;
 	}
-	
+
 	const int x = 5;
 	const int w = _w - 15;
 	const int vBorder = 5;	// Tab border
@@ -426,7 +426,7 @@
 	}
 
 	// Change path for extra game data (eg, using sword cutscenes when playing via CD)
-	case kCmdExtraBrowser: { 
+	case kCmdExtraBrowser: {
 		BrowserDialog browser("Select additional game directory", true);
 		if (browser.runModal() > 0) {
 			// User made his choice...
@@ -490,9 +490,9 @@
 
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
-	
+
 	const int hBorder = 10;
-	
+
 	_w = screenW;
 	_h = screenH;
 
@@ -546,7 +546,7 @@
 	// Restore last selection
 	String last = ConfMan.get(String("lastselectedgame"), ConfigManager::kApplicationDomain);
 	selectGame(last);
-	
+
 	// En-/disable the buttons depending on the list selection
 	updateButtons();
 
@@ -575,11 +575,11 @@
 	// Save last selection
 	const int sel = _list->getSelected();
 	if (sel >= 0)
-		ConfMan.set(String("lastselectedgame"), _domains[sel], ConfigManager::kApplicationDomain);	
+		ConfMan.set(String("lastselectedgame"), _domains[sel], ConfigManager::kApplicationDomain);
 	else
 		ConfMan.removeKey(String("lastselectedgame"), ConfigManager::kApplicationDomain);
- 
-	ConfMan.flushToDisk();	
+
+	ConfMan.flushToDisk();
 	Dialog::close();
 }
 
@@ -625,7 +625,7 @@
 	// 1) show a dir selection dialog which lets the user pick the directory
 	//    the game data resides in.
 	// 2) try to auto detect which game is in the directory, if we cannot
-	//    determine it uniquely preent a list of candidates to the user 
+	//    determine it uniquely preent a list of candidates to the user
 	//    to pick from
 	// 3) Display the 'Edit' dialog for that item, letting the user specify
 	//    an alternate description (to distinguish multiple versions of the
@@ -640,7 +640,7 @@
 		// ...so let's determine a list of candidates, games that
 		// could be contained in the specified directory.
 		DetectedGameList candidates(PluginManager::instance().detectGames(files));
-		
+
 		int idx;
 		if (candidates.isEmpty()) {
 			// No game was found in the specified directory
@@ -655,7 +655,7 @@
 			StringList list;
 			for (idx = 0; idx < (int)candidates.size(); idx++)
 				list.push_back(candidates[idx].description);
-			
+
 			ChooserDialog dialog("Pick the game:");
 			dialog.setList(list);
 			idx = dialog.runModal();
@@ -680,7 +680,7 @@
 				ConfMan.set("description", result.description, domain);
 			}
 			ConfMan.set("path", dir.path(), domain);
-			
+
 			const bool customLanguage = (result.language != Common::UNK_LANG);
 			const bool customPlatform = (result.platform != Common::kPlatformUnknown);
 
@@ -729,7 +729,7 @@
 
 void LauncherDialog::removeGame(int item) {
 	MessageDialog alert("Do you really want to remove this game configuration?", "Yes", "No");
-	
+
 	if (alert.runModal() == GUI::kMessageOK) {
 		// Remove the currently selected game from the list
 		assert(item >= 0);
@@ -737,7 +737,7 @@
 
 		// Write config to disk
 		ConfMan.flushToDisk();
-		
+
 		// Update the ListWidget and force a redraw
 		updateListing();
 		draw();
@@ -745,7 +745,7 @@
 }
 
 void LauncherDialog::editGame(int item) {
-	// Set game specifc options. Most of these should be "optional", i.e. by 
+	// Set game specifc options. Most of these should be "optional", i.e. by
 	// default set nothing and use the global ScummVM settings. E.g. the user
 	// can set here an optional alternate music volume, or for specific games
 	// a different music driver etc.

Index: launcher.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- launcher.h	16 Apr 2005 17:55:09 -0000	1.23
+++ launcher.h	30 Jul 2005 21:11:01 -0000	1.24
@@ -51,12 +51,12 @@
 
 	void updateListing();
 	void updateButtons();
-	
+
 	void close();
 	virtual void addGame();
 	void removeGame(int item);
 	void editGame(int item);
-	
+
 	void selectGame(const String &name);
 };
 

Index: message.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- message.cpp	24 Jun 2005 15:22:41 -0000	1.29
+++ message.cpp	30 Jul 2005 21:11:01 -0000	1.30
@@ -36,7 +36,7 @@
 
 MessageDialog::MessageDialog(const Common::String &message, const char *defaultButton, const char *altButton)
 	: Dialog(30, 20, 260, 124) {
-	
+
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
 
@@ -52,7 +52,7 @@
 		buttonWidth = kButtonWidth;
 		buttonHeight = kButtonHeight;
 	}
-	
+
 	// First, determine the size the dialog needs. For this we have to break
 	// down the string into lines, and taking the maximum of their widths.
 	// Using this, and accounting for the space the button(s) need, we can set
@@ -87,7 +87,7 @@
 
 	// FIXME - allow for more than two buttons, and return in runModal() which one
 	// was selected.
-	if (defaultButton && altButton) { 
+	if (defaultButton && altButton) {
 		okButtonPos = (_w - (buttonWidth * 2)) / 2;
 		cancelButtonPos = ((_w - (buttonWidth * 2)) / 2) + buttonWidth + 10;
 	} else {
@@ -102,7 +102,7 @@
 }
 
 void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
-	// FIXME: It's a really bad thing that we use two arbitrary constants 
+	// FIXME: It's a really bad thing that we use two arbitrary constants
 	if (cmd == kOkCmd) {
 		setResult(kMessageOK);
 		close();

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- newgui.cpp	24 Jun 2005 15:22:41 -0000	1.118
+++ newgui.cpp	30 Jul 2005 21:11:01 -0000	1.119
@@ -138,7 +138,7 @@
 
 		while (_system->pollEvent(event)) {
 			Common::Point mouse(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y);
-			
+
 			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 #if !defined(__PALM_OS__)
@@ -335,7 +335,7 @@
 
 	if (!rect.isValidRect())
 		return;
-	
+
 	assert(s.bytesPerPixel == sizeof(OverlayColor));
 
 	OverlayColor *src = (OverlayColor *)s.pixels;
@@ -374,7 +374,7 @@
 		b = ab * a;
 
 		OverlayColor *ptr = getBasePtr(rect.left, rect.top);
-		
+
 		h = rect.height();
 		w = rect.width();
 		while (h--) {
@@ -390,16 +390,16 @@
 		}
 
 	} else {
-	  
+
 		int r, g, b;
 		uint8 ar, ag, ab;
 		_system->colorToRGB(color, ar, ag, ab);
 		r = ar * level;
 		g = ag * level;
 		b = ab * level;
-		
+
 		OverlayColor *ptr = getBasePtr(rect.left, rect.top);
-		
+
 		h = rect.height();
 		w = rect.width();
 		while (h--) {

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- newgui.h	3 Jun 2005 13:09:24 -0000	1.61
+++ newgui.h	30 Jul 2005 21:11:01 -0000	1.62
@@ -76,7 +76,7 @@
 	DialogStack	_dialogStack;
 
 	bool		_stateIsSaved;
-	
+
 	const Graphics::Font *_font;
 
 	// for continuous events (keyDown)
@@ -139,7 +139,7 @@
 	 * callers responsibilty to free that data.
 	 */
 	void copyToSurface(Graphics::Surface *s, int x, int y, int w, int h);
-	
+
 	/**
 	 * Draw the graphics contained in the given surface at the specified coordinates.
 	 */

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- options.cpp	5 Jul 2005 20:22:37 -0000	1.92
+++ options.cpp	30 Jul 2005 21:11:01 -0000	1.93
@@ -91,7 +91,7 @@
 
 	// Reset result value
 	setResult(0);
-	
+
 	if (_fullscreenCheckbox) {
 		_gfxPopUp->setSelected(0);
 
@@ -125,7 +125,7 @@
 #ifndef SMALL_SCREEN_DEVICE
 		// Fullscreen setting
 		_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
-	
+
 		// Aspect ratio setting
 		_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
 #endif
@@ -150,7 +150,7 @@
 	}
 
 	if (_multiMidiCheckbox) {
-		
+
 		// Multi midi setting
 		_multiMidiCheckbox->setState(ConfMan.getBool("multi_midi", _domain));
 
@@ -160,7 +160,7 @@
 		// GS extensions setting
 		_enableGSCheckbox->setState(ConfMan.getBool("enable_gs", _domain));
 	}
-	
+
 
 	if (_musicVolumeSlider) {
 		int vol;
@@ -213,7 +213,7 @@
 
 		if (_subCheckbox) {
 			if (_enableAudioSettings) {
-				ConfMan.set("subtitles", _subCheckbox->getState(), _domain); 
+				ConfMan.set("subtitles", _subCheckbox->getState(), _domain);
 				const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
 				while (md->name && md->id != (int)_midiPopUp->getSelectedTag())
 					md++;
@@ -223,7 +223,7 @@
 					ConfMan.removeKey("music_driver", _domain);
 			} else {
 				ConfMan.removeKey("music_driver", _domain);
-				ConfMan.removeKey("subtitles", _domain); 
+				ConfMan.removeKey("subtitles", _domain);
 			}
 		}
 
@@ -353,9 +353,9 @@
 #ifdef SMALL_SCREEN_DEVICE
 	_fullscreenCheckbox->setState(TRUE);
 	_fullscreenCheckbox->setEnabled(FALSE);
-	_aspectCheckbox->setEnabled(FALSE);	
+	_aspectCheckbox->setEnabled(FALSE);
 #endif
-	
+
 	_enableGraphicSettings = true;
 
 	return yoffset;
@@ -376,7 +376,7 @@
 	// The MIDI mode popup & a label
 	_midiPopUp = addPopUp(boss, x-5, yoffset, w+5, "Music driver: ", labelWidth, ws);
 	yoffset += _midiPopUp->getHeight() + 4;
-	
+
 	// Populate it
 	const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
 	while (md->name) {
@@ -389,7 +389,7 @@
 	yoffset += _subCheckbox->getHeight();
 
 	yoffset += 18;
-		
+
 	_enableAudioSettings = true;
 
 	return yoffset;
@@ -418,7 +418,7 @@
 	// Multi midi setting
 	_multiMidiCheckbox = addCheckbox(boss, x, yoffset, "Mixed Adlib/MIDI mode", 0, 0, ws);
 	yoffset += _multiMidiCheckbox->getHeight() + spacing;
-	
+
 	// Native mt32 setting
 	_mt32Checkbox = addCheckbox(boss, x, yoffset, "True Roland MT-32 (disable GM emulation)", 0, 0, ws);
 	yoffset += _mt32Checkbox->getHeight() + spacing;
@@ -426,7 +426,7 @@
 	// GS Extensions setting
 	_enableGSCheckbox = addCheckbox(boss, x, yoffset, "Enable Roland GS Mode", 0, 0, ws);
 	yoffset += _enableGSCheckbox->getHeight() + spacing;
-	
+
 	_enableMIDISettings = true;
 
 	return yoffset;
@@ -491,7 +491,7 @@
 
 	GUI::WidgetSize ws;
 	int buttonWidth, buttonHeight;
-	
+
 	if (screenW >= 400 && screenH >= 300) {
 		ws = GUI::kBigWidgetSize;
 		buttonWidth = kBigButtonWidth;
@@ -531,7 +531,7 @@
 	yoffset = addAudioControls(tab, yoffset, ws);
 	yoffset = addVolumeControls(tab, yoffset, ws);
 	// TODO: cd drive setting
-	
+
 	//
 	// 3) The MIDI tab
 	//

Index: widget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- widget.cpp	24 Jun 2005 15:22:42 -0000	1.53
+++ widget.cpp	30 Jul 2005 21:11:01 -0000	1.54
@@ -240,7 +240,7 @@
 			newValue = _valueMax;
 
 		if (newValue != _value) {
-			_value = newValue; 
+			_value = newValue;
 			draw();
 			sendCommand(_cmd, _value);	// FIXME - hack to allow for "live update" in sound dialog
 		}
@@ -285,7 +285,7 @@
 
 GraphicsWidget::GraphicsWidget(GuiObject *boss, int x, int y, int w, int h)
 	: Widget(boss, x, y, w, h), _gfx() {
-	_flags = WIDGET_ENABLED | WIDGET_CLEARBG; 
+	_flags = WIDGET_ENABLED | WIDGET_CLEARBG;
 	_type = kGraphicsWidget;
 }
 
@@ -295,10 +295,10 @@
 
 void GraphicsWidget::setGfx(const Graphics::Surface *gfx) {
 	_gfx.free();
-	
+
 	if (!gfx || !gfx->pixels)
 		return;
-	
+
 	// TODO: add conversion to OverlayColor
 	_gfx.create(gfx->w, gfx->h, gfx->bytesPerPixel);
 	memcpy(_gfx.pixels, gfx->pixels, gfx->h * gfx->pitch);

Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- widget.h	3 Jun 2005 11:15:03 -0000	1.46
+++ widget.h	30 Jul 2005 21:11:01 -0000	1.47
@@ -104,7 +104,7 @@
 
 	virtual int16	getAbsX() const	{ return _x + _boss->getChildX(); }
 	virtual int16	getAbsY() const	{ return _y + _boss->getChildY(); }
-	
+
 //	virtual void setPos(int x, int y);
 //	virtual void setSize(int w, int h);
 
@@ -245,11 +245,11 @@
 public:
 	GraphicsWidget(GuiObject *boss, int x, int y, int w, int h);
 	~GraphicsWidget();
-	
+
 	void setGfx(const Graphics::Surface *gfx);
 protected:
 	void drawWidget(bool hilite);
-	
+
 	Graphics::Surface _gfx;
 };
 



