diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp index afc646281f..c76aeaf2b5 100644 --- a/src/frontends/qt4/GuiBox.cpp +++ b/src/frontends/qt4/GuiBox.cpp @@ -105,13 +105,10 @@ static QList 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); diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index a824df7931..c673d2d9c3 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -193,13 +193,10 @@ void fillComboColor(QComboBox * combo, QList 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"));