Remove #include "LColor.h" from inset.h.

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

src/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* bufferparams.C, paragraph_pimpl.C: add #include "LColor.h".
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* lyxfont.[Ch]: (setFamily, setSeries, setShape, setSize, setEmph, setUnderbar,

src/bufferparams.C

@@ -26,6 +26,7 @@
 #include "language.h"
 #include "LaTeXFeatures.h"
 #include "latexrunparams.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "lyxtextclasslist.h"

src/frontends/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* screen.C: add #include "LColor.h".
+
 2003-09-15  Angus Leeming  <leeming@lyx.org>
 
 	* Painter.C: add #include "LColor.h".

src/frontends/controllers/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* ControlCharacter.C: add #include "LColor.h".
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* character.C: add #include "LColor.h".

src/frontends/controllers/ControlCharacter.C

@@ -18,6 +18,7 @@
 #include "bufferview_funcs.h"
 #include "funcrequest.h"
 #include "language.h"
+#include "LColor.h"
 
 using bv_funcs::font2string;
 

src/frontends/screen.C

@@ -23,6 +23,7 @@
 #include "bufferparams.h"
 #include "debug.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxfont.h"
 #include "lyxrc.h"
 #include "lyxrow.h"

src/frontends/xforms/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* FormDocument.C: add #include "LColor.h".
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* FormCharacter.C, FormPreferences.C, lyx_gui.C, xfont_loader.C:

src/frontends/xforms/FormDocument.C

@@ -34,6 +34,7 @@
 #include "Bullet.h"
 #include "bufferparams.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxrc.h"
 #include "lyxtextclasslist.h"
 #include "tex-strings.h"

src/graphics/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* PreviewLoader.C: add #include "LColor.h".
+
 2003-09-15  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* GraphicsConverter.C

src/graphics/PreviewLoader.C

@@ -18,6 +18,7 @@
 #include "debug.h"
 #include "format.h"
 #include "latexrunparams.h"
+#include "LColor.h"
 #include "lyxrc.h"
 
 #include "frontends/lyx_gui.h" // hexname

src/insets/ChangeLog

@@ -1,3 +1,16 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* inset.h: store background_color_ as an int, not as an LColor::color to
+	get LColor.h out of the header file.
+
+	* inset.C:
+	* insetlatexaccent.C:
+	* insetnewline.C:
+	* insetspace.C:
+	* insetspecialchar.C:
+	* renderers.C:
+	add #include "LColor.h".
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* renderers.C:	LyXFont::setColor no longer return a LyXFont &, so cannot string

src/insets/inset.C

@@ -18,6 +18,7 @@
 
 #include "BufferView.h"
 #include "gettext.h"
+#include "LColor.h"
 
 
 // Initialization of the counter for the inset id's,
@@ -98,7 +99,7 @@ EnumLColor InsetOld::backgroundColor() const
 		else
 			return LColor::background;
 	} else
-		return background_color_;
+		return LColor::color(background_color_);
 }
 
 

src/insets/inset.h

@@ -17,7 +17,6 @@
 
 #include "insetbase.h"
 #include "dimension.h"
-#include "LColor.h"
 #include "ParagraphList_fwd.h"
 
 class Buffer;
@@ -326,8 +325,10 @@ private:
 	UpdatableInset * owner_;
 	///
 	string name_;
-	///
-	LColor::color background_color_;
+	/** We store the LColor::color value as an int to get LColor.h out
+	 *  of the header file.
+	 */
+	int background_color_;
 };
 
 

src/insets/insetlatexaccent.C

@@ -14,6 +14,7 @@
 
 #include "debug.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "metricsinfo.h"

src/insets/insetnewline.C

@@ -14,6 +14,7 @@
 
 #include "BufferView.h"
 #include "debug.h"
+#include "LColor.h"
 #include "lyxtext.h"
 #include "metricsinfo.h"
 #include "paragraph.h"

src/insets/insetspace.C

@@ -17,6 +17,7 @@
 
 #include "debug.h"
 #include "latexrunparams.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 

src/insets/insetspecialchar.C

@@ -16,6 +16,7 @@
 
 #include "debug.h"
 #include "LaTeXFeatures.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 

src/insets/renderers.C

@@ -16,6 +16,7 @@
 
 #include "BufferView.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "metricsinfo.h"
 
 #include "frontends/font_metrics.h"

src/mathed/ChangeLog

@@ -1,3 +1,11 @@
+2003-09-16  Angus Leeming  <leeming@lyx.org>
+
+	* formula.C:
+	* formulamacro.C:
+	add #include "LColor.h".
+
+	* math_cursor.C: add #include <boost/assert.hpp>.
+
 2003-09-16  Angus Leeming  <leeming@lyx.org>
 
 	* math_braceinset.C, math_data.C, math_fboxinset.C, math_frameboxinset.C,

src/mathed/formula.C

@@ -20,14 +20,15 @@
 
 #include "debug.h"
 #include "latexrunparams.h"
-#include "support/std_sstream.h"
-
+#include "LColor.h"
 
 #include "frontends/Painter.h"
 
 #include "graphics/PreviewedInset.h"
 #include "graphics/PreviewImage.h"
 
+#include "support/std_sstream.h"
+
 
 using std::ostream;
 using std::ostringstream;

src/mathed/formulamacro.C

@@ -16,12 +16,16 @@
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
 #include "math_mathmlstream.h"
+
 #include "gettext.h"
 #include "latexrunparams.h"
+#include "LColor.h"
+#include "lyxlex.h"
+
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
+
 #include "support/lstrings.h"
-#include "lyxlex.h"
 #include "support/std_sstream.h"
 
 using lyx::support::bformat;

src/mathed/math_cursor.C

@@ -31,6 +31,7 @@
 #include "math_support.h"
 #include "math_unknowninset.h"
 
+#include <boost/assert.hpp>
 
 //#define FILEDEBUG 1
 

src/paragraph_pimpl.C

@@ -21,6 +21,7 @@
 #include "language.h"
 #include "LaTeXFeatures.h"
 #include "latexrunparams.h"
+#include "LColor.h"
 #include "lyxlength.h"
 #include "lyxrc.h"
 #include "texrow.h"