Revert previous commit, which committed too much.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index fe68ceae78a8286c9d886b3f53799071cbe257a7..24ee2aa1f21243b1808b3e9fd5d2202ac9474127 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -153,19 +153,23 @@ public:
        /// return values for read()
        enum ReturnValues {
                OK,
+               OK_OLDFORMAT,
                ERROR,
                FORMAT_MISMATCH
        };
 
        /// Performs the read of the layout file.
        /// \return true on success.
+       // FIXME Should return ReturnValues....
        bool read(support::FileName const & filename, ReadType rt = BASECLASS);
        ///
-       bool read(std::string const & str, ReadType rt = BASECLASS);
+       ReturnValues read(std::string const & str, ReadType rt = MODULE);
        ///
        ReturnValues read(Lexer & lex, ReadType rt = BASECLASS);
        /// validates the layout information passed in str
-       static bool validate(std::string const & str);
+       static ReturnValues validate(std::string const & str);
+       ///
+       static std::string convert(std::string const & str);
 
        ///////////////////////////////////////////////////////////////////
        // loading
@@ -480,6 +484,9 @@ private:
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);
 
+/// current format of layout files
+extern int const LAYOUT_FORMAT;
+
 
 } // namespace lyx