anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Complilation fix.

Browse Source 
This time without unwandted po stuff.
This commit is contained in:
Juergen Spitzmueller 2015-05-19 12:56:31 +02:00
parent 01e7a10029
commit 14557b28d9
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/qt4/GuiBox.cpp
View File

@ -105,13 +105,10 @@ static QList<ColorCode> colors()
namespace {
struct ColorSorter
bool ColorSorter(ColorCode lhs, ColorCode rhs)
{
bool operator()(ColorCode lhs, ColorCode rhs) const {
return
support::compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
}
};
return support::compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
}
} // namespace anon
@ -169,7 +166,7 @@ GuiBox::GuiBox(QWidget * parent) : InsetParamsWidget(parent)
// the background can be uncolored while the frame cannot
color_codes_ = colors();
sort(color_codes_.begin(), color_codes_.end(), ColorSorter());
qSort(color_codes_.begin(), color_codes_.end(), ColorSorter);
fillComboColor(backgroundColorCO, true);
fillComboColor(frameColorCO, false);

11
src/frontends/qt4/GuiCharacter.cpp
View File

@ -193,13 +193,10 @@ void fillComboColor(QComboBox * combo, QList<T> const & list)
}
struct ColorSorter
bool ColorSorter(ColorCode lhs, ColorCode rhs)
{
bool operator()(ColorCode lhs, ColorCode rhs) const {
return
support::compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
}
};
return support::compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
}
} // namespace anon
@ -230,7 +227,7 @@ GuiCharacter::GuiCharacter(GuiView & lv)
size = sizeData();
bar = barData();
color = colorData();
sort(color.begin(), color.end(), ColorSorter());
qSort(color.begin(), color.end(), ColorSorter);
language = languageData();
language.prepend(LanguagePair(qt_("Reset"), "reset"));