X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=0b1e02ea06762ad3a5eff02deea994b8383c3f7c;hb=94f0968e9212f24997cfee0d17c6f060210edbc6;hp=c9674eba37ad29ecd55d063536dcdec0a6ad288b;hpb=22ffc93467db93262e564ceb740061ba2d744a2a;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index c9674eba37..0b1e02ea06 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -57,10 +57,6 @@ namespace frontend { class Application; } -namespace graphics { -class Previews; -} - /// initial startup class LyX { public: @@ -108,7 +104,9 @@ private: */ bool queryUserLyXDir(bool explicit_userdir); /// read lyxrc/preferences - bool readRcFile(std::string const & name); + /// \param check_format: whether to try to convert the format of + /// the file, if there is a mismatch. + bool readRcFile(std::string const & name, bool check_format = false); /// read the given languages file bool readLanguagesFile(std::string const & name); /// read the encodings. @@ -149,7 +147,6 @@ private: friend void setMover(std::string const & fmt, std::string const & command); friend Movers & theSystemMovers(); friend frontend::Application * theApp(); - friend graphics::Previews & thePreviews(); friend Session & theSession(); friend CmdDef & theTopLevelCmdDef(); friend SpellChecker * theSpellChecker();