Do not show master's errors if compiling child

[lyx.git] / src / frontends / qt4 / GuiCharacter.h

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 599807f0ae8a6b1a386a09593256e3cb453a88dc..8328211eb1fff473837d0dfffac6aff9af3144e4 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -39,6 +39,8 @@ enum FontState {
        ///
        STRIKEOUT_TOGGLE,
        ///
+       XOUT_TOGGLE,
+       ///
        UULINE_TOGGLE,
        ///
        UWAVE_TOGGLE,
@@ -52,7 +54,6 @@ typedef std::pair<QString, FontSeries> SeriesPair;
 typedef std::pair<QString, FontShape>  ShapePair;
 typedef std::pair<QString, FontSize>   SizePair;
 typedef std::pair<QString, FontState>  BarPair;
-typedef std::pair<QString, ColorCode>  ColorPair;
 typedef std::pair<QString, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
@@ -75,7 +76,7 @@ private:
        void dispatchParams();
        bool isBufferDependent() const { return true; }
        FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
-       void saveSession() const;
+       void saveSession(QSettings & settings) const;
        void restoreSession();
        //@}
 
@@ -87,7 +88,7 @@ private:
        QList<ShapePair>  shape;
        QList<SizePair>   size;
        QList<BarPair>    bar;
-       QList<ColorPair>  color;
+       QList<ColorCode> color;
        QList<LanguagePair> language;
 
        ///
@@ -95,9 +96,6 @@ private:
        Font font_;
        ///
        bool toggleall_;
-       /// If true the language should be reset.
-       /// If false the language of font_ is used.
-       bool reset_lang_;
 };
 
 } // namespace frontend