summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-03 13:31:00 +0200
committerMontel Laurent <[email protected]>2017-05-03 13:31:00 +0200
commit8a7863b26517bd6c8e936346162c963ab7db0a86 (patch)
tree79d85445e3a9a6b4a7816b669a71319ab68fd59a
parent4df06e0e4276d9d028560269bcc699bb65c7bcf4 (diff)
Port qSort
-rw-r--r--messagelist/src/core/widgetbase.cpp4
-rw-r--r--messagelist/src/utils/aggregationcombobox.cpp2
-rw-r--r--messagelist/src/utils/themecombobox.cpp2
-rw-r--r--webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp2
-rw-r--r--webengineviewer/src/checkphishingurl/riceencodingdecoder.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/messagelist/src/core/widgetbase.cpp b/messagelist/src/core/widgetbase.cpp
index 0bc20a2..1de7edc 100644
--- a/messagelist/src/core/widgetbase.cpp
+++ b/messagelist/src/core/widgetbase.cpp
@@ -404,7 +404,7 @@ void Widget::themeMenuAboutToShow(QMenu *menu)
QAction *act;
- qSort(sortedThemes.begin(), sortedThemes.end(), MessageList::Core::Theme::compareName);
+ std::sort(sortedThemes.begin(), sortedThemes.end(), MessageList::Core::Theme::compareName);
QList< Theme * >::ConstIterator endTheme(sortedThemes.constEnd());
for (QList< Theme * >::ConstIterator it = sortedThemes.constBegin(); it != endTheme; ++it) {
@@ -499,7 +499,7 @@ void Widget::aggregationMenuAboutToShow(QMenu *menu)
QAction *act;
- qSort(sortedAggregations.begin(), sortedAggregations.end(), MessageList::Core::Aggregation::compareName);
+ std::sort(sortedAggregations.begin(), sortedAggregations.end(), MessageList::Core::Aggregation::compareName);
QList<Aggregation * >::ConstIterator endagg(sortedAggregations.constEnd());
diff --git a/messagelist/src/utils/aggregationcombobox.cpp b/messagelist/src/utils/aggregationcombobox.cpp
index 0206790..b22ab8d 100644
--- a/messagelist/src/utils/aggregationcombobox.cpp
+++ b/messagelist/src/utils/aggregationcombobox.cpp
@@ -117,7 +117,7 @@ void AggregationComboBoxPrivate::slotLoadAggregations()
// Get all message list aggregations and sort them into alphabetical order.
QList< Aggregation * > aggregations = Manager::instance()->aggregations().values();
- qSort(aggregations.begin(), aggregations.end(), MessageList::Core::Aggregation::compareName);
+ std::sort(aggregations.begin(), aggregations.end(), MessageList::Core::Aggregation::compareName);
for (const Aggregation *aggregation : qAsConst(aggregations)) {
q->addItem(aggregation->name(), QVariant(aggregation->id()));
diff --git a/messagelist/src/utils/themecombobox.cpp b/messagelist/src/utils/themecombobox.cpp
index 498669c..74d6ed5 100644
--- a/messagelist/src/utils/themecombobox.cpp
+++ b/messagelist/src/utils/themecombobox.cpp
@@ -112,7 +112,7 @@ void ThemeComboBoxPrivate::slotLoadThemes()
// Get all message list themes and sort them into alphabetical order.
QList< Theme * > themes = Manager::instance()->themes().values();
- qSort(themes.begin(), themes.end(), MessageList::Core::Theme::compareName);
+ std::sort(themes.begin(), themes.end(), MessageList::Core::Theme::compareName);
for (const Theme *theme : qAsConst(themes)) {
q->addItem(theme->name(), QVariant(theme->id()));
diff --git a/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp b/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
index a91fbc8..ebba4fe 100644
--- a/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
+++ b/webengineviewer/src/checkphishingurl/createdatabasefilejob.cpp
@@ -193,7 +193,7 @@ void CreateDatabaseFileJobPrivate::removeElementFromDataBase(const QVector<Remov
}
}
- qSort(indexToRemove);
+ std::sort(indexToRemove.begin(), indexToRemove.end());
for (int i = (indexToRemove.count() - 1); i >= 0; --i) {
oldDataBaseAddition.remove(indexToRemove.at(i));
}
diff --git a/webengineviewer/src/checkphishingurl/riceencodingdecoder.cpp b/webengineviewer/src/checkphishingurl/riceencodingdecoder.cpp
index a8cc1f8..63ce8ea 100644
--- a/webengineviewer/src/checkphishingurl/riceencodingdecoder.cpp
+++ b/webengineviewer/src/checkphishingurl/riceencodingdecoder.cpp
@@ -117,7 +117,7 @@ QList<quint32> RiceEncodingDecoder::decodeRiceHashesDelta(const RiceDeltaEncodin
// Flipping the bytes, as done above, destroys the sort order. Sort the
// values back.
- qSort(list);
+ std::sort(list.begin(), list.end());
// This flipping is done so that when the vector is interpreted as a string,
// the bytes are in the correct order.