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 f25590b2bed832aa59251ed56233485492b33251..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 {
@@ -51,7 +48,7 @@ public:
            in a cleaner way. */
        enum Code {
                ///
-               NO_CODE,
+               NO_CODE, // 0
                ///
                TOC_CODE,  // do these insets really need a code? (ale)
                ///
@@ -59,9 +56,9 @@ public:
                ///
                MARK_CODE,
                ///
-               REF_CODE, // 5
+               REF_CODE,
                ///
-               URL_CODE,
+               URL_CODE, // 5
                ///
                HTMLURL_CODE,
                ///
@@ -69,9 +66,9 @@ public:
                ///
                ENDING_CODE,
                ///
-               LABEL_CODE, // 10
+               LABEL_CODE,
                ///
-               NOTE_CODE,
+               NOTE_CODE, // 10
                ///
                ACCENT_CODE,
                ///
@@ -79,9 +76,9 @@ public:
                ///
                INDEX_CODE,
                ///
-               INCLUDE_CODE, // 15
+               INCLUDE_CODE,
                ///
-               GRAPHICS_CODE,
+               GRAPHICS_CODE, // 15
                ///
                BIBITEM_CODE,
                ///
@@ -89,9 +86,9 @@ public:
                ///
                TEXT_CODE,
                ///
-               ERT_CODE, // 20
+               ERT_CODE,
                ///
-               FOOT_CODE,
+               FOOT_CODE, // 20
                ///
                MARGIN_CODE,
                ///
@@ -101,9 +98,9 @@ public:
                ///
                MINIPAGE_CODE,
                ///
-               SPACE_CODE,
+               SPACE_CODE, // 25
                ///
-               SPECIALCHAR_CODE, // 25
+               SPECIALCHAR_CODE,
                ///
                TABULAR_CODE,
                ///
@@ -125,13 +122,15 @@ public:
                ///
                INDEX_PRINT_CODE,
                ///
-               OPTARG_CODE,
+               OPTARG_CODE, // 35
                ///
                ENVIRONMENT_CODE,
                ///
                HFILL_CODE,
                ///
-               NEWLINE_CODE
+               NEWLINE_CODE,
+               ///
+               BRANCH_CODE
        };
 
        ///
@@ -176,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; }
@@ -196,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; }
        ///
@@ -213,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; }
        ///
@@ -232,8 +219,6 @@ public:
                                     bool recursive = false) const;
        ///
        virtual void deleteLyXText(BufferView *, bool = true) const {}
-       ///
-       virtual void resizeLyXText(BufferView *, bool /*force*/= false) const {}
        /// returns the actuall scroll-value
        virtual int scroll(bool recursive=true) const {
                if (!recursive || !owner_)
@@ -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_;
 };