[Scummvm-cvs-logs] CVS: scummvm/common debugger.cpp,1.2,1.3 debugger.h,1.2,1.3

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


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

Modified Files:
	debugger.cpp debugger.h 
Log Message:
added namespace GUI

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/debugger.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debugger.cpp	2 Nov 2003 02:18:13 -0000	1.2
+++ debugger.cpp	10 Nov 2003 23:40:48 -0000	1.3
@@ -41,7 +41,7 @@
 	_isAttached = false;
 	_errStr = NULL;
 	_firstTime = true;
-	_debuggerDialog = new ConsoleDialog(1.0, 0.67F);
+	_debuggerDialog = new GUI::ConsoleDialog(1.0, 0.67F);
 	_debuggerDialog->setInputCallback(debuggerInputCallback, this);
 	_debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this);
 }
@@ -339,7 +339,7 @@
 // Console handler
 #if USE_CONSOLE
 template <class T>
-bool Debugger<T>::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon) {
+bool Debugger<T>::debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon) {
 	Debugger *debugger = (Debugger *)refCon;
 
 	return debugger->RunCommand(input);
@@ -347,7 +347,7 @@
 
 
 template <class T>
-bool Debugger<T>::debuggerCompletionCallback(ConsoleDialog *console, const char *input, char*& completion, void *refCon) {
+bool Debugger<T>::debuggerCompletionCallback(GUI::ConsoleDialog *console, const char *input, char*& completion, void *refCon) {
 	Debugger *debugger = (Debugger *)refCon;
 
 	return debugger->TabComplete(input, completion);

Index: debugger.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/debugger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debugger.h	2 Nov 2003 02:18:13 -0000	1.2
+++ debugger.h	10 Nov 2003 23:40:48 -0000	1.3
@@ -21,7 +21,9 @@
 #ifndef COMMON_DEBUGGER_H
 #define COMMON_DEBUGGER_H
 
-class ConsoleDialog;
+namespace GUI {
+	class ConsoleDialog;
+};
 
 namespace Common {
 
@@ -71,7 +73,7 @@
 	bool _isAttached;
 	char *_errStr;
 	bool _firstTime;
-	ConsoleDialog *_debuggerDialog;
+	GUI::ConsoleDialog *_debuggerDialog;
 
 protected:
 	void detach();
@@ -87,8 +89,8 @@
 	void DCmd_Register(const char *cmdname, DebugProc pointer);
 
 #if USE_CONSOLE
-	static bool debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
-	static bool debuggerCompletionCallback(ConsoleDialog *console, const char *input, char*& completion, void *refCon);
+	static bool debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon);
+	static bool debuggerCompletionCallback(GUI::ConsoleDialog *console, const char *input, char*& completion, void *refCon);
 #endif
 };
 





More information about the Scummvm-git-logs mailing list