From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 gui/debugger.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gui/debugger.cpp')

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 2282bc3a1c..ab3fcef6b2 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // NB: This is really only necessary if USE_READLINE is defined
-- 
cgit v1.2.3


From 4b7f6dfa3c8ca3ee614810007728e49ba2fd9e6e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 17:32:31 +0200
Subject: BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER

This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.
---
 gui/debugger.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gui/debugger.cpp')

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index ab3fcef6b2..2f49cb2bbe 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -29,7 +29,7 @@
 #include "engines/engine.h"
 
 #include "gui/debugger.h"
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	#include "gui/console.h"
 #elif defined(USE_READLINE)
 	#include <readline/readline.h>
@@ -44,7 +44,7 @@ Debugger::Debugger() {
 	_isActive = false;
 	_errStr = NULL;
 	_firstTime = true;
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	_debuggerDialog = new GUI::ConsoleDialog(1.0f, 0.67f);
 	_debuggerDialog->setInputCallback(debuggerInputCallback, this);
 	_debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this);
@@ -66,7 +66,7 @@ Debugger::Debugger() {
 }
 
 Debugger::~Debugger() {
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	delete _debuggerDialog;
 #endif
 }
@@ -78,7 +78,7 @@ int Debugger::DebugPrintf(const char *format, ...) {
 
 	va_start(argptr, format);
 	int count;
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	count = _debuggerDialog->vprintFormat(1, format, argptr);
 #else
 	count = ::vprintf(format, argptr);
@@ -125,7 +125,7 @@ void Debugger::onFrame() {
 	}
 }
 
-#if defined(USE_TEXT_CONSOLE) && defined(USE_READLINE)
+#if defined(USE_TEXT_CONSOLE_FOR_DEBUGGER) && defined(USE_READLINE)
 namespace {
 Debugger *g_readline_debugger;
 
@@ -140,7 +140,7 @@ void Debugger::enter() {
 	// TODO: Having three I/O methods #ifdef-ed in this file is not the
 	// cleanest approach to this...
 
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	if (_firstTime) {
 		DebugPrintf("Debugger started, type 'exit' to return to the game.\n");
 		DebugPrintf("Type 'help' to see a little list of commands and variables.\n");
@@ -363,7 +363,7 @@ bool Debugger::tabComplete(const char *input, Common::String &completion) const
 	return true;
 }
 
-#if defined(USE_TEXT_CONSOLE) && defined(USE_READLINE)
+#if defined(USE_TEXT_CONSOLE_FOR_DEBUGGER) && defined(USE_READLINE)
 char *Debugger::readlineComplete(const char *input, int state) {
 	static CommandsMap::const_iterator iter;
 
@@ -417,7 +417,7 @@ bool Debugger::Cmd_Exit(int argc, const char **argv) {
 // Print a list of all registered commands (and variables, if any),
 // nicely word-wrapped.
 bool Debugger::Cmd_Help(int argc, const char **argv) {
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 	const int charsPerLine = _debuggerDialog->getCharsPerLine();
 #elif defined(USE_READLINE)
 	int charsPerLine, rows;
@@ -520,7 +520,7 @@ bool Debugger::Cmd_DebugFlagDisable(int argc, const char **argv) {
 }
 
 // Console handler
-#ifndef USE_TEXT_CONSOLE
+#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER
 bool Debugger::debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon) {
 	Debugger *debugger = (Debugger *)refCon;
 
-- 
cgit v1.2.3