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

Revert "Complilation fix."

Browse Source 
This reverts commit abf8208679.

I'll properly re-commit in a minute.
This commit is contained in:
Juergen Spitzmueller 2015-05-19 12:52:19 +02:00
parent af42a9d683
commit 01e7a10029
4 changed files with 471 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
po/de.gmo
View File

Binary file not shown.

907
po/de.po
View File

File diff suppressed because it is too large Load Diff

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

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

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

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