diff options
| author | Max Horn | 2003-11-10 23:40:48 +0000 |
|---|---|---|
| committer | Max Horn | 2003-11-10 23:40:48 +0000 |
| commit | 22c22d1e81b25c103100b6c8347b154f16dafc5e (patch) | |
| tree | 233ff187add3c769346b5e7c89ee954eb967b477 /common | |
| parent | 5c2a3da7f2f8f45e20b732defbaed7aa47af00c8 (diff) | |
| download | scummvm-rg350-22c22d1e81b25c103100b6c8347b154f16dafc5e.tar.gz scummvm-rg350-22c22d1e81b25c103100b6c8347b154f16dafc5e.tar.bz2 scummvm-rg350-22c22d1e81b25c103100b6c8347b154f16dafc5e.zip | |
added namespace GUI
svn-id: r11255
Diffstat (limited to 'common')
| -rw-r--r-- | common/debugger.cpp | 6 | ||||
| -rw-r--r-- | common/debugger.h | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/common/debugger.cpp b/common/debugger.cpp index f47fee07f8..0d6c5027dc 100644 --- a/common/debugger.cpp +++ b/common/debugger.cpp @@ -41,7 +41,7 @@ Debugger<T>::Debugger() { _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 @@ void Debugger<T>::DCmd_Register(const char *cmdname, DebugProc pointer) { // 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 @@ bool Debugger<T>::debuggerInputCallback(ConsoleDialog *console, const char *inpu 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); diff --git a/common/debugger.h b/common/debugger.h index 7946e5940d..1da3ad7319 100644 --- a/common/debugger.h +++ b/common/debugger.h @@ -21,7 +21,9 @@ #ifndef COMMON_DEBUGGER_H #define COMMON_DEBUGGER_H -class ConsoleDialog; +namespace GUI { + class ConsoleDialog; +}; namespace Common { @@ -71,7 +73,7 @@ private: bool _isAttached; char *_errStr; bool _firstTime; - ConsoleDialog *_debuggerDialog; + GUI::ConsoleDialog *_debuggerDialog; protected: void detach(); @@ -87,8 +89,8 @@ protected: 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 }; |