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

[lyx.git] / src / insets / inset.h

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 9f60c8ab0c4fd533e9f1a0a88812ebdfb9c43f92..a9feca8ad4b637d1265a979e63600e3c611c546c 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -9,31 +9,28 @@
  * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETOLD_H
 #define INSETOLD_H
 
-#include "LColor.h"
 #include "insetbase.h"
 #include "dimension.h"
-#include "support/types.h"
+#include "ParagraphList_fwd.h"
 
-#include <vector>
-
-class LyXFont;
 class Buffer;
-class Painter;
+class EnumLColor;
+class FuncRequest;
 class LatexRunParams;
-class LyXText;
+class LyXCursor;
+class LyXFont;
 class LyXLex;
+class LyXText;
+class Painter;
 class Paragraph;
-class LyXCursor;
-class FuncRequest;
-class WordLangTuple;
-class ParagraphList;
 class UpdatableInset;
+class WordLangTuple;
 
 namespace lyx {
 namespace graphics {
@@ -178,19 +175,19 @@ public:
        /// wrapper around the above
        bool insetAllowed(InsetOld * in) const;
        ///
-       virtual void write(Buffer const *, std::ostream &) const = 0;
+       virtual void write(Buffer const &, std::ostream &) const = 0;
        ///
-       virtual void read(Buffer const *, LyXLex & lex) = 0;
+       virtual void read(Buffer const &, LyXLex & lex) = 0;
        /// returns the number of rows (\n's) of generated tex code.
-       virtual int latex(Buffer const *, std::ostream &,
+       virtual int latex(Buffer const &, std::ostream &,
                          LatexRunParams const &) const = 0;
        ///
-       virtual int ascii(Buffer const *,
+       virtual int ascii(Buffer const &,
                          std::ostream &, int linelen = 0) const = 0;
        ///
-       virtual int linuxdoc(Buffer const *, std::ostream &) const = 0;
+       virtual int linuxdoc(Buffer const &, std::ostream &) const = 0;
        ///
-       virtual int docbook(Buffer const *, std::ostream &, bool) const = 0;
+       virtual int docbook(Buffer const &, std::ostream &, bool) const = 0;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual InsetOld::Code lyxCode() const { return NO_CODE; }
@@ -198,14 +195,6 @@ public:
        /// returns true to override begin and end inset in file
        virtual bool directWrite() const;
 
-       /// Returns true if the inset should be centered alone
-       virtual bool display() const { return false; }
-       /// Changes the display state of the inset
-       virtual void display(bool) {}
-       ///
-       /// returns true if this inset needs a row on it's own
-       ///
-       virtual bool needFullRow() const { return false; }
        ///
        void setInsetName(string const & s) { name_ = s; }
        ///
@@ -215,13 +204,9 @@ public:
        ///
        UpdatableInset * owner() const { return owner_; }
        ///
-       void parOwner(Paragraph * par) { par_owner_ = par; }
+       void setBackgroundColor(EnumLColor);
        ///
-       Paragraph * parOwner() const { return par_owner_; }
-       ///
-       void setBackgroundColor(LColor::color);
-       ///
-       LColor::color backgroundColor() const;
+       EnumLColor backgroundColor() const;
        ///
        int x() const { return top_x; }
        ///
@@ -338,12 +323,12 @@ protected:
 private:
        ///
        UpdatableInset * owner_;
-       /// the paragraph in which this inset has been inserted
-       Paragraph * par_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_;
 };