Move bind file format tag to LyXAction.cpp, and rename it.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index e8114e7e6a666e7ed335b879e56c26ed28fa342d..d94b861cb39aa186aa7c2224d36a4ab696ea48c4 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -191,22 +191,20 @@ public:
        LyXRC();
        ///
        void setDefaults();
-       ///
-       bool read(support::FileName const & filename);
+       /// \param check_format: whether to try to convert the file format,
+       /// if it is not current. this should only be true, really, for the
+       /// user's own preferences file.
+       bool read(support::FileName const & filename, bool check_format);
        ///
        bool read(std::istream &);
-       ///
+private:
        enum ReturnValues {
                ReadOK,
-               FileError,
                ReadError,
                FormatMismatch
        };
-private:
-       ///
-       ReturnValues readWithoutConv(support::FileName const &);
        ///
-       ReturnValues read(Lexer &);
+       ReturnValues read(Lexer &, bool check_format);
 public:
        ///
        typedef std::set<std::string> CommandSet;