[Scummvm-cvs-logs] SF.net SVN: scummvm:[48820] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 48820
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48820&view=rev
Author:   fingolfin
Date:     2010-04-27 21:39:43 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/common/debug.cpp
    scummvm/trunk/common/debug.h

Modified: scummvm/trunk/common/debug.cpp
===================================================================
--- scummvm/trunk/common/debug.cpp	2010-04-27 20:47:06 UTC (rev 48819)
+++ scummvm/trunk/common/debug.cpp	2010-04-27 21:39:43 UTC (rev 48820)
@@ -123,21 +123,8 @@
 		return (gDebugChannelsEnabled & channel) != 0;
 }
 
-bool isDebugChannelEnabled(const String &name) {
-	// Debug level 11 turns on all special debug level messages
-	if (gDebugLevel == 11)
-		return true;
 
-	// Search for the debug level with the given name and check if it is enabled
-	DebugChannelMap::iterator i = gDebugChannels.find(name);
-	if (i != gDebugChannels.end())
-		return i->_value.enabled;
-	else
-		return false;
-}
 
-
-
 static OutputFormatter s_debugOutputFormatter = 0;
 
 void setDebugOutputFormatter(OutputFormatter f) {

Modified: scummvm/trunk/common/debug.h
===================================================================
--- scummvm/trunk/common/debug.h	2010-04-27 20:47:06 UTC (rev 48819)
+++ scummvm/trunk/common/debug.h	2010-04-27 21:39:43 UTC (rev 48820)
@@ -98,7 +98,7 @@
 /**
  * Lists all engine specific debug channels.
  *
- * @return returns a arry with all debug channels
+ * @return returns an array with all debug channels
  */
 DebugChannelList listDebugChannels();
 
@@ -108,12 +108,7 @@
  */
 bool isDebugChannelEnabled(uint32 channel);
 
-/**
- * Test whether the given debug channel is enabled.
- */
-bool isDebugChannelEnabled(const String &name);
 
-
 /**
  * Set the output formatter used by debug() and related functions.
  */
@@ -145,7 +140,7 @@
 
 /**
  * Print a debug message to the text console (stdout), but only if
- * the specified level does not exceed the value of gDebugLevel.
+ * the gDebugLevel equals at least the specified level.
  * As a rule of thumb, the more important the message, the lower the level.
  * Automatically appends a newline.
  */
@@ -153,7 +148,7 @@
 
 /**
  * Print a debug message to the text console (stdout), but only if
- * the specified level does not exceed the value of gDebugLevel.
+ * the gDebugLevel equals at least the specified level.
  * As a rule of thumb, the more important the message, the lower the level.
  * Does not append a newline.
  */
@@ -161,7 +156,7 @@
 
 /**
  * Print a debug message to the text console (stdout), but only if
- * the specified level does not exceed the value of gDebugLevel AND
+ * the gDebugLevel equals at least the specified level AND
  * if the specified special debug level is active.
  * As a rule of thumb, the more important the message, the lower the level.
  * Automatically appends a newline.
@@ -172,7 +167,7 @@
 
 /**
  * Print a debug message to the text console (stdout), but only if
- * the specified level does not exceed the value of gDebugLevel AND
+ * the gDebugLevel equals at least the specified level AND
  * if the specified special debug level is active.
  * As a rule of thumb, the more important the message, the lower the level.
  * Does not append a newline automatically.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.