Remove hardcoded values

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index a6ffed902ae0c1aec9f10c2e8433e07e18a70608..22d426c86dc75669b60f9133edd67ed4f59f7640 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -171,7 +171,8 @@ public:
        ReturnValues read(Lexer & lex, ReadType rt = BASECLASS);
        /// validates the layout information passed in str
        static ReturnValues validate(std::string const & str);
-       ///
+       /// \return the conversion of \param str to the latest layout format
+       /// compatible with the lyx format.
        static std::string convert(std::string const & str);
 
        ///////////////////////////////////////////////////////////////////
@@ -402,7 +403,7 @@ public:
        /// happen).  -- Idea JMarc, comment MV
        InsetLayout const & insetLayout(docstring const & name) const;
        /// a plain inset layout for use as a default
-       static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+       static InsetLayout const & plainInsetLayout();
        /// add a new layout \c name if it does not exist in layoutlist_
        /// \return whether we had to add one.
        bool addLayoutIfNeeded(docstring const & name) const;
@@ -498,8 +499,6 @@ private:
        friend DocumentClassPtr
                getDocumentClass(LayoutFile const &, LayoutModuleList const &,
                                 bool const clone);
-       ///
-       static InsetLayout plain_insetlayout_;
 };
 
 
@@ -516,6 +515,9 @@ std::ostream & operator<<(std::ostream & os, PageSides p);
 
 /// current format of layout files
 extern int const LAYOUT_FORMAT;
+/// layout format for the current lyx file format (usually equal to
+/// LAYOUT_FORMAT)
+extern int const LYXFILE_LAYOUT_FORMAT;
 
 
 } // namespace lyx