From: André Pönitz Date: Thu, 25 Oct 2007 18:27:08 +0000 (+0000) Subject: remove broken promises X-Git-Tag: 1.6.10~7661 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3fa21d5b4393b962d074effe5980d4c894de03e6;p=features.git remove broken promises git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21204 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/LyXRC.h b/src/LyXRC.h index 877c3d9f0b..39ba9ee211 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -32,9 +32,7 @@ namespace support { class FileName; } class Lexer; /// This contains the runtime configuration of LyX -class LyXRC //: public noncopyable -// after 1.1.6 I will use a LyXRCStruct here and then this can be made -// noncopyable again. For now I want to minimise changes. ARRae 20001010 +class LyXRC { public: enum LyXRCTags { @@ -384,7 +382,7 @@ class LyXRC_PreviewStatus { LyXRC::PreviewStatus val_; public: LyXRC_PreviewStatus(LyXRC::PreviewStatus val) : val_(val) {} - operator LyXRC::PreviewStatus() const{ return val_; } + operator LyXRC::PreviewStatus() const { return val_; } }; diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index a8242ad656..33a37adea9 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -461,7 +461,7 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form, QWidget * parent) void PrefScreenFonts::apply(LyXRC & rc) const { - LyXRC const oldrc(rc); + LyXRC const oldrc = rc; boost::tie(rc.roman_font_name, rc.roman_font_foundry) = parseFontName(fromqstr(screenRomanCO->currentText()));