Small fixes

[lyx.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 3e828d858960edc290201d527bbccc108066bc6b..5f4701894c969c7ca73c720b87553a4da7b7fc84 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,8 +1,23 @@
 // -*- C++ -*-
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
 
 #ifndef LYXDEBUG_H
 #define LYXDEBUG_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include <iosfwd>
+
 #include "LString.h"
 #include "support/lstrings.h"
 
@@ -22,7 +37,7 @@ struct Debug {
                ///
                KEY        = (1 << 2),   // 4
                ///
-               TOOLBAR    = (1 << 3),   // 8
+               GUI        = (1 << 3),   // 8
                ///
                PARSER     = (1 << 4),   // 16
                ///
@@ -44,15 +59,27 @@ struct Debug {
                ///
                ROFF       = (1 << 13),  // 8192
                ///
-               ACTION     = (1 << 14)   // 16384
+               ACTION     = (1 << 14),   // 16384
+               ///
+               LYXLEX     = (1 << 15),
+               ///
+               DEPEND     = (1 << 16),
+               ///
+               INSETS     = (1 << 17),
+               ///
+               FILES      = (1 << 18)
        };
        ///
-       static const type ANY = type(INFO | INIT | KEY | TOOLBAR |
-                                    PARSER | LYXRC | KBMAP | LATEX |
-                                    MATHED | FONT | TCLASS | LYXVC |
-                                    LYXSERVER | ROFF | ACTION);
+//     static const type ANY = type(INFO | INIT | KEY | GUI |
+//                                  PARSER | LYXRC | KBMAP | LATEX |
+//                                  MATHED | FONT | TCLASS | LYXVC |
+//                                  LYXSERVER | ROFF | ACTION | LYXLEX |
+//                                  DEPEND | INSETS);
+       ///
+       static type const ANY;
+
        ///
-       friend inline void operator|=(Debug::type & d1, Debug::type d2);
+//     friend inline void operator|=(Debug::type & d1, Debug::type d2);
        
        /** A function to convert symbolic string names on debug levels
            to their numerical value.
@@ -62,16 +89,17 @@ struct Debug {
        /** Display the tags and descriptions of the current debug level 
            of ds 
        */
-       static void showLevel(ostream & o, type level);
+       static void showLevel(std::ostream & o, type level);
 
        /** show all the possible tags that can be used for debugging */
-       static void showTags(ostream & o);
+       static void showTags(std::ostream & o);
 
 };
 
 
-///
-inline void operator|= (Debug::type & d1, Debug::type d2)
+
+inline
+void operator|=(Debug::type & d1, Debug::type d2)
 {
        d1 = static_cast<Debug::type>(d1 | d2);
 }
@@ -80,8 +108,8 @@ inline void operator|= (Debug::type & d1, Debug::type d2)
 #include "support/DebugStream.h"
 
 
-///
-ostream & operator<<(ostream & o, Debug::type t);
+
+std::ostream & operator<<(std::ostream & o, Debug::type t);
 
 extern DebugStream lyxerr;