ws changes only

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

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 2a7c88624359e74192314c47f226dcad6b37fd3f..5e8cd824bebe4164aba96be15b437dad298c9b1a 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -19,8 +19,9 @@
 #include "dimension.h"
 #include "ParagraphList_fwd.h"
 
+
 class Buffer;
-class EnumLColor;
+class LColor_color;
 class FuncRequest;
 class LatexRunParams;
 class LyXCursor;
@@ -130,7 +131,9 @@ public:
                ///
                NEWLINE_CODE,
                ///
-               BRANCH_CODE
+               BRANCH_CODE,
+               ///
+               BOX_CODE
        };
 
        ///
@@ -149,9 +152,6 @@ public:
                HIGHLY_EDITABLE
        };
 
-       ///
-       typedef dispatch_result RESULT;
-
        ///
        InsetOld();
        ///
@@ -163,7 +163,7 @@ public:
        ///
        int width() const;
        /// what appears in the minibuffer when opening
-       virtual string const editMessage() const;
+       virtual std::string const editMessage() const;
        ///
        virtual EDITABLE editable() const;
        ///
@@ -196,17 +196,17 @@ public:
        virtual bool directWrite() const;
 
        ///
-       void setInsetName(string const & s) { name_ = s; }
+       void setInsetName(std::string const & s) { name_ = s; }
        ///
-       string const & getInsetName() const { return name_; }
+       std::string const & getInsetName() const { return name_; }
        ///
        void setOwner(UpdatableInset * inset) { owner_ = inset; }
        ///
        UpdatableInset * owner() const { return owner_; }
        ///
-       void setBackgroundColor(EnumLColor);
+       void setBackgroundColor(LColor_color);
        ///
-       EnumLColor backgroundColor() const;
+       LColor_color backgroundColor() const;
        ///
        int x() const { return top_x; }
        ///
@@ -297,15 +297,6 @@ public:
         *  defaults to empty.
         */
        virtual void addPreview(lyx::graphics::PreviewLoader &) const {}
-
-       /** Find the PreviewLoader, add a LaTeX snippet to it and
-        *  start the loading process.
-        *
-        *  Most insets have no interest in this capability, so the method
-        *  defaults to empty.
-        */
-       virtual void generatePreview() const {}
-
 protected:
        ///
        mutable int top_x;
@@ -324,7 +315,7 @@ private:
        ///
        UpdatableInset * owner_;
        ///
-       string name_;
+       std::string name_;
        /** We store the LColor::color value as an int to get LColor.h out
         *  of the header file.
         */