This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 08cab983d405366a584cae9e78b5850f2192ef9e..27eae62e563cf5dd25b2b0096fb05477be4c4202 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -23,20 +23,31 @@
 
 namespace lyx {
 
+class Lexer;
+
+///
+enum InsetDecoration {
+       Deco_Classic,
+       Deco_Minimalistic,
+       Deco_Conglomerate,
+       Deco_Default
+};
+
 ///
 class InsetLayout {
 public:
        ///
        InsetLayout();
        ///
-       std::string name() const { return name_; };
+       bool read(Lexer & lexrc);
+       ///
+       docstring name() const { return name_; };
        ///
        std::string lyxtype() const { return lyxtype_; };
        ///
        docstring labelstring() const { return labelstring_; };
        ///
-       //FIXME This could be an enum
-       std::string decoration() const { return decoration_; };
+       InsetDecoration decoration() const { return decoration_; };
        ///
        std::string latextype() const { return latextype_; };
        ///
@@ -67,13 +78,13 @@ public:
        bool isForceLtr() const { return forceltr_; };
 private:
        ///
-       std::string name_;
+       docstring name_;
        ///
        std::string lyxtype_;
        ///
        docstring labelstring_;
        ///
-       std::string decoration_;
+       InsetDecoration decoration_;
        ///
        std::string latextype_;
        ///
@@ -102,9 +113,6 @@ private:
        bool keepempty_;
        ///
        bool forceltr_;
-       
-       //FIXME This will be removed.
-       friend class TextClass;
 };
 
 } // namespace lyx