X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdebug.h;h=f963f383ca5ab495f5064fc0ac58a7d45c3bf5a4;hb=024275f0690b41634e26dabe8758e3dc6cd31ee2;hp=6b8a7f594027107aeee89096524e250ccaa8de31;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/debug.h b/src/debug.h
index 6b8a7f5940..f963f383ca 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,11 @@
 // -*- C++ -*-
 /**
  * \file debug.h
+ * 
+ * FIXME: It would be nice if, in lyx::use_gui mode, instead of
+ * outputting to the console, we would pipe all messages onto a file
+ * and visualise the contents dynamically in a Qt window if needed.
+ *
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,15 +18,18 @@
 #ifndef LYXDEBUG_H
 #define LYXDEBUG_H
 
-#include <iosfwd>
+#include "support/debugstream.h"
+#include "support/docstring.h"
+
 
-#include "LString.h"
+namespace lyx {
 
 /** Ideally this should have been a namespace, but since we try to be
-    compilable on older C++ compilators too, we use a struct instead.
-    This is all the different debug levels that we have.
-*/
-struct Debug {
+ *  compilable on older C++ compilators too, we use a struct instead.
+ *  This is all the different debug levels that we have.
+ */
+class lyx_debug_trait {
+public:
 	///
 	enum type {
 		///
@@ -71,15 +79,25 @@ struct Debug {
 		///
 		GRAPHICS   = (1 << 21),
 		/// change tracking
-		CHANGES    = (1 << 22)
+		CHANGES    = (1 << 22),
+		///
+		EXTERNAL   = (1 << 23),
+		///
+		PAINTING   = (1 << 24),
+		///
+		DEBUG      = (1 << 31),
+		///
+		ANY = 0xffffffff
 	};
-	///
-	static type const ANY;
+
+	static bool match(type a, type b) {
+		return (a & b);
+	}
 
 	/** A function to convert symbolic string names on debug levels
 	    to their numerical value.
 	*/
-	static Debug::type value(string const & val);
+	static type value(std::string const & val);
 
 	/** Display the tags and descriptions of the current debug level
 	    of ds
@@ -94,18 +112,20 @@ struct Debug {
 
 
 inline
-void operator|=(Debug::type & d1, Debug::type d2)
+void operator|=(lyx_debug_trait::type & d1, lyx_debug_trait::type d2)
 {
-	d1 = static_cast<Debug::type>(d1 | d2);
+	d1 = static_cast<lyx_debug_trait::type>(d1 | d2);
 }
 
 
-#include "support/DebugStream.h"
+// std::ostream & operator<<(std::ostream & o, Debug::type t);
 
+typedef basic_debugstream<lyx_debug_trait> LyXErr;
+typedef LyXErr::debug Debug;
 
+extern LyXErr lyxerr;
 
-std::ostream & operator<<(std::ostream & o, Debug::type t);
 
-extern DebugStream lyxerr;
+} // namespace lyx
 
 #endif