X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.h;h=e2d87b96e962d156d9887b396328304d7410d95f;hb=eea79637c78bb9916031924eca7b305cfb8e83df;hp=18473d0fef6259a871f8afbd12fb8b169dacaa32;hpb=1f07a7f929d34b0d64d839d5d7963ed60e04b5a3;p=features.git diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h index 18473d0fef..e2d87b96e9 100644 --- a/src/frontends/qt4/GuiCharacter.h +++ b/src/frontends/qt4/GuiCharacter.h @@ -24,8 +24,6 @@ namespace lyx { -class Color_color; - namespace frontend { enum FontState { @@ -46,7 +44,7 @@ typedef std::pair SeriesPair; typedef std::pair ShapePair; typedef std::pair SizePair; typedef std::pair BarPair; -typedef std::pair ColorPair; +typedef std::pair ColorPair; class GuiCharacter : public GuiDialog, public Ui::CharacterUi { @@ -95,7 +93,7 @@ private: /// void setBar(FontState); /// - void setColor(Color_color); + void setColor(ColorCode); /// void setLanguage(std::string const &); @@ -110,7 +108,7 @@ private: /// FontState getBar() const; /// - Color_color getColor() const; + ColorCode getColor() const; /// std::string getLanguage() const;