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 877c3d9f0b35ba345f9723b8583d60dfcb9bd7bf..39ba9ee211546496e789c092c563fba847bf78ed 100644 (file)
--- 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 a8242ad656426ae74bf120463bbe19d19fa8ca5d..33a37adea954c328041e7ab5f0bc4695c5a09b0d 100644 (file)
--- 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()));