[Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.20,1.21 EditTextWidget.h,1.10,1.11 ListWidget.cpp,1.29,1.30 ListWidget.h,1.17,1.18 PopUpWidget.cpp,1.26,1.27 PopUpWidget.h,1.8,1.9 ScrollBarWidget.cpp,1.14,1.15 ScrollBarWidget.h,1.5,1.6 TabWidget.cpp,1.7,1.8 TabWidget.h,1.4,1.5 about.cpp,1.9,1.10 about.h,1.2,1.3 browser.cpp,1.15,1.16 browser.h,1.9,1.10 chooser.cpp,1.9,1.10 chooser.h,1.7,1.8 console.cpp,1.36,1.37 console.h,1.20,1.21 dialog.cpp,1.40,1.41 dialog.h,1.25,1.26 launcher.cpp,1.77,1.78 launcher.h,1.14,1.15 message.cpp,1.16,1.17 message.h,1.10,1.11 newgui.cpp,1.68,1.69 newgui.h,1.33,1.34 object.h,1.3,1.4 options.cpp,1.42,1.43 options.h,1.12,1.13 widget.cpp,1.30,1.31 widget.h,1.32,1.33

Max Horn fingolfin at users.sourceforge.net
Mon Nov 10 15:41:05 CET 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv17199/gui

Modified Files:
	EditTextWidget.cpp EditTextWidget.h ListWidget.cpp 
	ListWidget.h PopUpWidget.cpp PopUpWidget.h ScrollBarWidget.cpp 
	ScrollBarWidget.h TabWidget.cpp TabWidget.h about.cpp about.h 
	browser.cpp browser.h chooser.cpp chooser.h console.cpp 
	console.h dialog.cpp dialog.h launcher.cpp launcher.h 
	message.cpp message.h newgui.cpp newgui.h object.h options.cpp 
	options.h widget.cpp widget.h 
Log Message:
added namespace GUI

Index: EditTextWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- EditTextWidget.cpp	8 Nov 2003 23:22:15 -0000	1.20
+++ EditTextWidget.cpp	10 Nov 2003 23:40:48 -0000	1.21
@@ -19,9 +19,12 @@
  */
 
 #include "stdafx.h"
-#include "EditTextWidget.h"
-#include "dialog.h"
-#include "newgui.h"
+#include "gui/EditTextWidget.h"
+#include "gui/dialog.h"
+#include "gui/newgui.h"
+
+
+namespace GUI {
 
 EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text)
 	: StaticTextWidget(boss, x, y - 1, w, h + 2, text, kTextAlignLeft), _backupString(text) {
@@ -214,3 +217,5 @@
 
 	return false;
 }
+
+} // End of namespace GUI

Index: EditTextWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- EditTextWidget.h	2 Nov 2003 14:50:44 -0000	1.10
+++ EditTextWidget.h	10 Nov 2003 23:40:48 -0000	1.11
@@ -21,10 +21,12 @@
 #ifndef EDITTEXTWIDGET_H
 #define EDITTEXTWIDGET_H
 
-#include "widget.h"
+#include "gui/widget.h"
 #include "common/str.h"
 #include "common/list.h"
 
+namespace GUI {
+
 /* EditTextWidget */
 class EditTextWidget : public StaticTextWidget {
 	typedef Common::StringList StringList;
@@ -52,5 +54,7 @@
 	int getCaretPos();
 	bool adjustOffset();
 };
+
+} // End of namespace GUI
 
 #endif

Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ListWidget.cpp	8 Nov 2003 23:22:15 -0000	1.29
+++ ListWidget.cpp	10 Nov 2003 23:40:48 -0000	1.30
@@ -19,11 +19,13 @@
  */
 
 #include "stdafx.h"
-#include "ListWidget.h"
-#include "ScrollBarWidget.h"
-#include "dialog.h"
-#include "newgui.h"
+#include "gui/ListWidget.h"
+#include "gui/ScrollBarWidget.h"
+#include "gui/dialog.h"
+#include "gui/newgui.h"
+
 
+namespace GUI {
 
 ListWidget::ListWidget(GuiObject *boss, int x, int y, int w, int h)
 	: Widget(boss, x, y, w - kScrollBarWidth, h), CommandSender(boss) {
@@ -349,3 +351,5 @@
 		draw();
 	}
 }
+
+} // End of namespace GUI

Index: ListWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ListWidget.h	3 Nov 2003 20:13:04 -0000	1.17
+++ ListWidget.h	10 Nov 2003 23:40:48 -0000	1.18
@@ -21,10 +21,12 @@
 #ifndef LISTWIDGET_H
 #define LISTWIDGET_H
 
-#include "widget.h"
+#include "gui/widget.h"
 #include "common/str.h"
 #include "common/list.h"
 
+namespace GUI {
+
 class ScrollBarWidget;
 
 enum NumberingMode {
@@ -91,5 +93,7 @@
 	void lostFocusWidget();
 	void scrollToCurrent();
 };
+
+} // End of namespace GUI
 
 #endif

Index: PopUpWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- PopUpWidget.cpp	8 Nov 2003 23:22:15 -0000	1.26
+++ PopUpWidget.cpp	10 Nov 2003 23:40:48 -0000	1.27
@@ -19,11 +19,13 @@
  */
 
 #include "stdafx.h"
-#include "PopUpWidget.h"
-#include "dialog.h"
-#include "newgui.h"
+#include "gui/PopUpWidget.h"
+#include "gui/dialog.h"
+#include "gui/newgui.h"
 #include "base/engine.h"
 
+namespace GUI {
+
 #define UP_DOWN_BOX_HEIGHT	10
 
 // Little up/down arrow
@@ -337,3 +339,5 @@
 		gui->drawString(_entries[_selectedItem].name, x+2, _y+3, w-6, !isEnabled() ? gui->_color : gui->_textcolor, align);
 	}
 }
+
+} // End of namespace GUI

Index: PopUpWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PopUpWidget.h	8 Nov 2003 23:22:15 -0000	1.8
+++ PopUpWidget.h	10 Nov 2003 23:40:48 -0000	1.9
@@ -21,10 +21,12 @@
 #ifndef POPUPWIDGET_H
 #define POPUPWIDGET_H
 
-#include "widget.h"
+#include "gui/widget.h"
 #include "common/str.h"
 #include "common/list.h"
 
+namespace GUI {
+
 enum {
 	kPopUpItemSelectedCmd	= 'POPs'
 };
@@ -68,5 +70,7 @@
 protected:
 	void drawWidget(bool hilite);
 };
+
+} // End of namespace GUI
 
 #endif

Index: ScrollBarWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ScrollBarWidget.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ScrollBarWidget.cpp	8 Nov 2003 23:22:15 -0000	1.14
+++ ScrollBarWidget.cpp	10 Nov 2003 23:40:48 -0000	1.15
@@ -20,10 +20,12 @@
 
 #include "stdafx.h"
 #include "ScrollBarWidget.h"
-#include "dialog.h"
-#include "newgui.h"
+#include "gui/dialog.h"
+#include "gui/newgui.h"
 
 
+namespace GUI {
+
 /*
  * TODO:
  * - Auto-repeat: if user clicks & holds on one of the arrows, then after a
@@ -245,3 +247,5 @@
 		gui->hLine(_x + 2, y + 2, _x + _w-3, color);
 	}
 }
+
+} // End of namespace GUI

Index: ScrollBarWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ScrollBarWidget.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ScrollBarWidget.h	8 Nov 2003 23:22:15 -0000	1.5
+++ ScrollBarWidget.h	10 Nov 2003 23:40:48 -0000	1.6
@@ -21,7 +21,9 @@
 #ifndef SCROLLBARWIDGET_H
 #define SCROLLBARWIDGET_H
 
-#include "widget.h"
+#include "gui/widget.h"
+
+namespace GUI {
 
 enum {
 	kScrollBarWidth		= 9
@@ -77,5 +79,6 @@
 	void checkBounds(int old_pos);
 };
 
+} // End of namespace GUI
 
 #endif

Index: TabWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/TabWidget.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- TabWidget.cpp	8 Nov 2003 23:22:15 -0000	1.7
+++ TabWidget.cpp	10 Nov 2003 23:40:48 -0000	1.8
@@ -24,6 +24,8 @@
 #include "gui/dialog.h"
 #include "gui/newgui.h"
 
+namespace GUI {
+
 enum {
 	kTabHeight = 15,
 
@@ -148,3 +150,5 @@
 		return Widget::findWidgetInChain(_firstWidget, x, y - kTabHeight);
 	}
 }
+
+} // End of namespace GUI

Index: TabWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/TabWidget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TabWidget.h	8 Nov 2003 23:22:15 -0000	1.4
+++ TabWidget.h	10 Nov 2003 23:40:48 -0000	1.5
@@ -25,6 +25,8 @@
 #include "common/str.h"
 #include "common/list.h"
 
+namespace GUI {
+
 class TabWidget : public Widget {
 	typedef Common::String String;
 	struct Tab {
@@ -65,5 +67,7 @@
 
 	virtual Widget *findWidget(int x, int y);
 };
+
+} // End of namespace GUI
 
 #endif

Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- about.cpp	8 Nov 2003 23:22:15 -0000	1.9
+++ about.cpp	10 Nov 2003 23:40:48 -0000	1.10
@@ -24,6 +24,8 @@
 #include "gui/newgui.h"
 #include "gui/widget.h"
 
+namespace GUI {
+
 AboutDialog::AboutDialog()
 	: Dialog(10, 20, 300, 144) {
 	addButton((_w - kButtonWidth) / 2, 120, "OK", kCloseCmd, '\r');	// Close dialog - FIXME
@@ -48,3 +50,4 @@
 	new StaticTextWidget(this, 10, 105, _w - 20, kLineHeight, "Broken Sword Games (C) Revolution", kTextAlignCenter);
 }
 
+} // End of namespace GUI

Index: about.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- about.h	2 Nov 2003 02:18:13 -0000	1.2
+++ about.h	10 Nov 2003 23:40:48 -0000	1.3
@@ -23,9 +23,13 @@
 
 #include "dialog.h"
 
+namespace GUI {
+
 class AboutDialog : public Dialog {
 public:
 	AboutDialog();
 };
+
+} // End of namespace GUI
 
 #endif

Index: browser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/browser.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- browser.cpp	8 Nov 2003 23:22:15 -0000	1.15
+++ browser.cpp	10 Nov 2003 23:40:48 -0000	1.16
@@ -25,6 +25,8 @@
 
 #include "backends/fs/fs.h"
 
+namespace GUI {
+
 /* We want to use this as a general directory selector at some point... possible uses
  * - to select the data dir for a game
  * - to select the place where save games are stored
@@ -155,3 +157,4 @@
 	draw();
 }
 
+} // End of namespace GUI

Index: browser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/browser.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- browser.h	2 Nov 2003 02:18:14 -0000	1.9
+++ browser.h	10 Nov 2003 23:40:48 -0000	1.10
@@ -25,12 +25,14 @@
 #include "common/str.h"
 #include "common/list.h"
 
-class ListWidget;
-class StaticTextWidget;
-
 class FilesystemNode;
 class FSList;
 
+namespace GUI {
+
+class ListWidget;
+class StaticTextWidget;
+
 class BrowserDialog : public Dialog {
 	typedef Common::String String;
 	typedef Common::StringList StringList;
@@ -53,5 +55,7 @@
 
 	void updateListing();
 };
+
+} // End of namespace GUI
 
 #endif

Index: chooser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/chooser.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- chooser.cpp	8 Nov 2003 23:22:15 -0000	1.9
+++ chooser.cpp	10 Nov 2003 23:40:48 -0000	1.10
@@ -19,9 +19,11 @@
  */
 
 #include "stdafx.h"
-#include "chooser.h"
-#include "newgui.h"
-#include "ListWidget.h"
+#include "gui/chooser.h"
+#include "gui/newgui.h"
+#include "gui/ListWidget.h"
+
+namespace GUI {
 
 enum {
 	kChooseCmd = 'Chos'
@@ -61,3 +63,5 @@
 		Dialog::handleCommand(sender, cmd, data);
 	}
 }
+
+} // End of namespace GUI

Index: chooser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/chooser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- chooser.h	3 Nov 2003 23:14:21 -0000	1.7
+++ chooser.h	10 Nov 2003 23:40:48 -0000	1.8
@@ -25,6 +25,8 @@
 #include "common/list.h"
 #include "gui/dialog.h"
 
+namespace GUI {
+
 class ButtonWidget;
 class ListWidget;
 
@@ -44,5 +46,7 @@
 
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 };
+
+} // End of namespace GUI
 
 #endif

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- console.cpp	8 Nov 2003 23:22:15 -0000	1.36
+++ console.cpp	10 Nov 2003 23:40:48 -0000	1.37
@@ -20,11 +20,13 @@
 
 #include "stdafx.h"
 #include "gui/console.h"
-#include "ScrollBarWidget.h"
+#include "gui/ScrollBarWidget.h"
 
 #include "base/engine.h"
 
 
+namespace GUI {
+
 #define PROMPT	") "
 
 /* TODO:
@@ -528,3 +530,5 @@
 		updateScrollBar();
 	}
 }
+
+} // End of namespace GUI

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- console.h	8 Nov 2003 23:22:15 -0000	1.20
+++ console.h	10 Nov 2003 23:40:48 -0000	1.21
@@ -26,6 +26,8 @@
 
 #include <stdarg.h>
 
+namespace GUI {
+
 enum {
 	kBufferSize	= 32768,
 	kLineBufferSize = 256,
@@ -122,5 +124,7 @@
 	void addToHistory(const char *str);
 	void historyScroll(int direction);
 };
+
+} // End of namespace GUI
 
 #endif

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dialog.cpp	8 Nov 2003 23:22:15 -0000	1.40
+++ dialog.cpp	10 Nov 2003 23:40:48 -0000	1.41
@@ -25,6 +25,8 @@
 #include "dialog.h"
 #include "widget.h"
 
+namespace GUI {
+
 /*
  * TODO list
  * - add some sense of the window being "active" (i.e. in front) or not. If it 
@@ -269,3 +271,5 @@
 ButtonWidget *Dialog::addButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey) {
 	return new ButtonWidget(this, x, y, kButtonWidth, 16, label, cmd, hotkey);
 }
+
+} // End of namespace GUI

Index: dialog.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dialog.h	5 Nov 2003 11:24:36 -0000	1.25
+++ dialog.h	10 Nov 2003 23:40:48 -0000	1.26
@@ -26,6 +26,8 @@
 
 #include "gui/object.h"
 
+namespace GUI {
+
 class NewGui;
 class ButtonWidget;
 
@@ -80,5 +82,7 @@
 	void setResult(int result) { _result = result; }
 	int getResult() const { return _result; }
 };
+
+} // End of namespace GUI
 
 #endif

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- launcher.cpp	8 Nov 2003 23:22:15 -0000	1.77
+++ launcher.cpp	10 Nov 2003 23:40:48 -0000	1.78
@@ -46,6 +46,8 @@
 
 using Common::ConfigManager;
 
+namespace GUI {
+
 enum {
 	kStartCmd = 'STRT',
 	kAboutCmd = 'ABOU',
@@ -511,7 +513,7 @@
 }
 
 void LauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
-	int item =  _list->getSelected();
+	int item = _list->getSelected();
 
 	switch (cmd) {
 	case kAddGameCmd:
@@ -569,3 +571,5 @@
 		_removeButton->draw();
 	}
 }
+
+} // End of namespace GUI

Index: launcher.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- launcher.h	5 Nov 2003 12:25:42 -0000	1.14
+++ launcher.h	10 Nov 2003 23:40:48 -0000	1.15
@@ -25,8 +25,11 @@
 #include "common/str.h"
 #include "common/list.h"
 
-class BrowserDialog;
 class GameDetector;
+
+namespace GUI {
+
+class BrowserDialog;
 class ListWidget;
 
 class LauncherDialog : public Dialog {
@@ -54,5 +57,7 @@
 	void removeGame(int item);
 	void editGame(int item);
 };
+
+} // End of namespace GUI
 
 #endif

Index: message.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- message.cpp	8 Nov 2003 23:22:15 -0000	1.16
+++ message.cpp	10 Nov 2003 23:40:48 -0000	1.17
@@ -25,6 +25,8 @@
 #include "gui/newgui.h"
 #include "gui/widget.h"
 
+namespace GUI {
+
 enum {
 	kOkCmd = 'OK  ',
 	kCancelCmd = 'CNCL'
@@ -162,3 +164,5 @@
 	if (g_system->get_msecs() > _timer)
 		close();
 }
+
+} // End of namespace GUI

Index: message.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- message.h	2 Nov 2003 02:18:14 -0000	1.10
+++ message.h	10 Nov 2003 23:40:48 -0000	1.11
@@ -28,6 +28,8 @@
 	class StringList;
 }
 
+namespace GUI {
+
 /**
  * Simple message dialog ("alert box"): presents a text message in a dialog with up to two buttons.
  */
@@ -56,5 +58,6 @@
 	uint32 _timer;
 };
 
+} // End of namespace GUI
 
 #endif

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- newgui.cpp	8 Nov 2003 23:22:15 -0000	1.68
+++ newgui.cpp	10 Nov 2003 23:40:48 -0000	1.69
@@ -27,6 +27,8 @@
 #	include "palm.h"
 #endif
 
+namespace GUI {
+
 /*
  * TODO list
  * - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.)
@@ -573,6 +575,8 @@
 		_cursorAnimateCounter = (_cursorAnimateCounter + 1) % 4;
 	}
 }
+
+} // End of namespace GUI
 
 #ifdef __PALM_OS__
 #include "scumm_globals.h"

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- newgui.h	8 Nov 2003 23:22:16 -0000	1.33
+++ newgui.h	10 Nov 2003 23:40:48 -0000	1.34
@@ -26,6 +26,8 @@
 #include "common/str.h"
 #include "common/system.h"	// For events
 
+namespace GUI {
+
 class Dialog;
 
 #define hLine(x, y, x2, color) line(x, y, x2, y, color);
@@ -146,5 +148,7 @@
 
 	void addDirtyRect(int x, int y, int w, int h);
 };
+
+} // End of namespace GUI
 
 #endif

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/object.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object.h	2 Nov 2003 22:31:19 -0000	1.3
+++ object.h	10 Nov 2003 23:40:48 -0000	1.4
@@ -21,6 +21,8 @@
 #ifndef GUI_OBJECT_H
 #define GUI_OBJECT_H
 
+namespace GUI {
+
 class CommandReceiver;
 class CommandSender;
 
@@ -75,5 +77,6 @@
 	virtual void	releaseFocus() = 0;
 };
 
+} // End of namespace GUI
 
 #endif

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- options.cpp	8 Nov 2003 23:22:16 -0000	1.42
+++ options.cpp	10 Nov 2003 23:40:48 -0000	1.43
@@ -36,6 +36,8 @@
 #include <unistd.h>
 #endif
 
+namespace GUI {
+
 // TODO - allow changing options for:
 // - the save path (use _browser!)
 // - music & graphics driver (but see also the comments on EditGameDialog
@@ -411,3 +413,5 @@
 		OptionsDialog::handleCommand(sender, cmd, data);
 	}
 }
+
+} // End of namespace GUI

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- options.h	8 Nov 2003 23:22:16 -0000	1.12
+++ options.h	10 Nov 2003 23:40:48 -0000	1.13
@@ -25,9 +25,12 @@
 #include "common/str.h"
 #include "common/list.h"
 
+class GameDetector;
+
+namespace GUI {
+
 class BrowserDialog;
 class CheckboxWidget;
-class GameDetector;
 class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
@@ -104,5 +107,7 @@
 	BrowserDialog *_browser;
 	StaticTextWidget *_savePath;
 };
+
+} // End of namespace GUI
 
 #endif

Index: widget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- widget.cpp	8 Nov 2003 23:22:16 -0000	1.30
+++ widget.cpp	10 Nov 2003 23:40:48 -0000	1.31
@@ -25,6 +25,8 @@
 #include "gui/newgui.h"
 
 
+namespace GUI {
+
 Widget::Widget(GuiObject *boss, int x, int y, int w, int h)
 	: GuiObject(x, y, w, h), _type(0), _boss(boss),
 	  _id(0), _flags(0), _hasFocus(false) {
@@ -260,3 +262,5 @@
 int SliderWidget::posToValue(int pos) {
 	return (pos) * (_valueMax - _valueMin) / (_w - _labelWidth - 4) + _valueMin;
 }
+
+} // End of namespace GUI

Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- widget.h	8 Nov 2003 23:22:16 -0000	1.32
+++ widget.h	10 Nov 2003 23:40:48 -0000	1.33
@@ -25,6 +25,8 @@
 #include "common/str.h"
 #include "gui/object.h"
 
+namespace GUI {
+
 class Dialog;
 
 enum {
@@ -206,5 +208,6 @@
 	int posToValue(int pos);
 };
 
+} // End of namespace GUI
 
 #endif





More information about the Scummvm-git-logs mailing list