mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 12:32:26 +00:00
Rename ambiguous enum
This commit is contained in:
parent
7fae26c9a7
commit
e6b562d027
@ -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:
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user