summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-03 21:32:12 +0200
committerMontel Laurent <[email protected]>2017-05-03 21:32:12 +0200
commite88e13d71cddcbbf9afaab98b2228dbc1c28f455 (patch)
tree50603290f438ef54f1370069178b56f2953b948e
parent9240de6e352107fbd9243a22736fea32a71f1768 (diff)
Port qSort
-rw-r--r--resources/mixedmaildir/autotests/storecompacttest.cpp2
-rw-r--r--resources/tomboynotes/o2/o1.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/resources/mixedmaildir/autotests/storecompacttest.cpp b/resources/mixedmaildir/autotests/storecompacttest.cpp
index 2fd35e4..344fab5 100644
--- a/resources/mixedmaildir/autotests/storecompacttest.cpp
+++ b/resources/mixedmaildir/autotests/storecompacttest.cpp
@@ -365,7 +365,7 @@ void StoreCompactTest::testCompact()
// The order of items depends on the order of iteration of a QHash in MixedMaildirStore.
// This makes sure that the items are always sorted by collection and offset
- qSort(items.begin(), items.end(),
+ std::sort(items.begin(), items.end(),
[](const Akonadi::Item & left, const Akonadi::Item & right) {
return left.parentCollection().remoteId().compare(right.parentCollection().remoteId()) < 0 ||
(left.parentCollection().remoteId() == right.parentCollection().remoteId() && changedOffset(left) < changedOffset(right));
diff --git a/resources/tomboynotes/o2/o1.cpp b/resources/tomboynotes/o2/o1.cpp
index 49b7027..9884cff 100644
--- a/resources/tomboynotes/o2/o1.cpp
+++ b/resources/tomboynotes/o2/o1.cpp
@@ -158,7 +158,7 @@ QByteArray O1::getRequestBase(const QList<O0RequestParameter> &oauthParams, cons
// Append a sorted+encoded list of all request parameters to the base string
QList<O0RequestParameter> headers(oauthParams);
headers.append(otherParams);
- qSort(headers);
+ std::sort(headers.begin(), headers.end());
base.append(encodeHeaders(headers));
return base;
@@ -180,7 +180,7 @@ QByteArray O1::buildAuthorizationHeader(const QList<O0RequestParameter> &oauthPa
bool first = true;
QByteArray ret("OAuth ");
QList<O0RequestParameter> headers(oauthParams);
- qSort(headers);
+ std::sort(headers.begin(), headers.end());
for (const O0RequestParameter &h : qAsConst(headers)) {
if (first) {
first = false;