[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.84,1.85 dialogs.h,1.29,1.30 scumm.h,1.320,1.321

[Max Horn]

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

Modified Files:
	dialogs.cpp dialogs.h scumm.h 
Log Message:
added namespace GUI

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- dialogs.cpp	8 Nov 2003 21:59:32 -0000	1.84
+++ dialogs.cpp	10 Nov 2003 23:40:48 -0000	1.85
@@ -136,12 +136,6 @@
 #pragma mark -
 
 
-void ScummDialog::addResText(int x, int y, int w, int h, int resID) {
-	// Get the string
-	new StaticTextWidget(this, x, y, w, h, queryResString(resID), kTextAlignCenter);
-}
-
-
 const Common::String ScummDialog::queryResString(int stringno) {
 	byte *result;
 

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- dialogs.h	3 Nov 2003 23:26:13 -0000	1.29
+++ dialogs.h	10 Nov 2003 23:40:48 -0000	1.30
@@ -30,7 +30,11 @@
 #include "scumm/help.h"
 #endif
 
-class ListWidget;
+namespace GUI {
+	class ListWidget;
+}
+using namespace GUI;	// FIXME: Bad style to use a using directive in a header
+
 
 namespace Scumm {
 
@@ -45,8 +49,6 @@
 	typedef Common::String String;
 
 	ScummEngine *_scumm;
-
-	void addResText(int x, int y, int w, int h, int resID);
 
 	// Query a string from the resources
 	const String queryResString(int stringno);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- scumm.h	3 Nov 2003 23:26:13 -0000	1.320
+++ scumm.h	10 Nov 2003 23:40:48 -0000	1.321
@@ -32,7 +32,10 @@
 #include "scumm/gfx.h"
 #include "scumm/script.h"
 
-class Dialog;
+namespace GUI {
+	class Dialog;
+}
+using GUI::Dialog;
 class GameDetector;
 
 namespace Scumm {