Rename ambiguous enum

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index 54d90ccaacf6e14b05ea2d2c8055aada22eb1c5d..d2a735957a20415b47dc9c1a6440a8fec057270e 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -329,7 +329,7 @@ static int findPos2nd(QList<P> const & vec, B const & val)
 
 
 namespace{
-FontState getBar(FontInfo const & fi)
+FontDeco getBar(FontInfo const & fi)
 {
        if (fi.underbar() == FONT_ON)
                return UNDERBAR;
@@ -350,7 +350,7 @@ FontState getBar(FontInfo const & fi)
 }
 
 
-FontState getStrike(FontInfo const & fi)
+FontDeco getStrike(FontInfo const & fi)
 {
        if (fi.strikeout() == FONT_ON)
                return STRIKEOUT;
@@ -493,7 +493,7 @@ void GuiCharacter::updateContents()
 }
 
 
-void GuiCharacter::setBar(FontInfo & fi, FontState val)
+void GuiCharacter::setBar(FontInfo & fi, FontDeco val)
 {
        switch (val) {
        case IGNORE:
@@ -531,7 +531,7 @@ void GuiCharacter::setBar(FontInfo & fi, FontState val)
 }
 
 
-void GuiCharacter::setStrike(FontInfo & fi, FontState val)
+void GuiCharacter::setStrike(FontInfo & fi, FontDeco val)
 {
        switch (val) {
        case IGNORE:

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index cece7ba4ad2d35cebb5eda0a7023726229558ce0..439dba8767b7805643006eb74c7f063d3ceb5c6b 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -27,7 +27,7 @@
 namespace lyx {
 namespace frontend {
 
-enum FontState {
+enum FontDeco {
        ///
        IGNORE,
        ///
@@ -51,7 +51,7 @@ typedef std::pair<QString, FontFamily> FamilyPair;
 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, FontDeco>  BarPair;
 typedef std::pair<QString, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
@@ -86,9 +86,9 @@ private:
        ///
        void paramsToDialog(Font const & font);
        ///
-       void setBar(FontInfo & fi, FontState val);
+       void setBar(FontInfo & fi, FontDeco val);
        ///
-       void setStrike(FontInfo & fi, FontState val);
+       void setStrike(FontInfo & fi, FontDeco val);
 
        QList<FamilyPair> family;
        QList<SeriesPair> series;