Small cleanup from Angus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@900 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 43bd61b642c4c9048611ac50803617dbb3db83d0..76487df190512e3929810ea4fe737fe99411e45c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-19  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * src/commandtags.h: do not include "debug.h" which does not
+       belong there. #include it in some other places because of this
+       change. 
+
 2000-07-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/insets/insetcaption.C: add a couple "using" directives.

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index ee902e53d0a55b9aeccbf0db4735cfb163319cd3..33674b6f1bea941ad7576f4c53be335d85303786 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -3,6 +3,7 @@
 #include "ToolbarDefaults.h"
 #include "LyXAction.h"
 #include "toolbar.h"
+#include "debug.h"
 
 using std::endl;
 

diff --git a/src/commandtags.h b/src/commandtags.h
index 0be43d8e752f17507117f9354e074e6588054985..595ebd6ad1fefa0e32391709973b652c00f836d8 100644 (file)
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -10,7 +10,7 @@
 #ifndef COMMANDTAGS_H
 #define COMMANDTAGS_H
 
-#include "debug.h"
+#include <iosfwd>
 
 /** These are all the lyxfunctions (as enums).
  */

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 9916a5fa5c34e76090b2f9f3bfdb32ea17d35a30..31ca6ec42ff41f6ae1d228c1e5f88760d30d1702 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -23,6 +23,7 @@
 
 #include "buffer.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "LaTeXFeatures.h"
 #include "Painter.h"
 #include "font.h"

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index a30456235d717bd233a8708d1ceec6a79c2a202a..1c633ff0a7257f58777d80caa84f1ee17cae42f0 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -7,6 +7,7 @@
 #include "gettext.h"
 #include "insettoc.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
 #include "BufferView.h"

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index 240dc34609de5586daa0b62c05c2db28fd04a889..bb188b9075aed4fdabc99a40ac536cbdd362e39c 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -10,6 +10,7 @@
 #include "inseturl.h"
 #include "LString.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "lyx_gui_misc.h" // CancelCloseBoxCB

diff --git a/src/mathed/math_panel.C b/src/mathed/math_panel.C
index 6c10630a86b5cbaa0287ecfb66e533c19ac096ed..76da97e48ded6e35edc530c0f479640b60d8a8de 100644 (file)
--- a/src/mathed/math_panel.C
+++ b/src/mathed/math_panel.C
@@ -14,6 +14,12 @@
 
 #include <config.h>
 
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include <strstream>
+#endif
+
 #include FORMS_H_LOCATION
 
 #include "lyx_gui_misc.h"