diff --git a/src/core/ksslcertificatemanager.cpp b/src/core/ksslcertificatemanager.cpp --- a/src/core/ksslcertificatemanager.cpp +++ b/src/core/ksslcertificatemanager.cpp @@ -328,8 +328,8 @@ Q_ASSERT(knownCerts.isEmpty()); QList in = certsIn; QList old = allCertificates(); - qSort(in.begin(), in.end(), certLessThan); - qSort(old.begin(), old.end(), certLessThan); + std::sort(in.begin(), in.end(), certLessThan); + std::sort(old.begin(), old.end(), certLessThan); for (int ii = 0, oi = 0; ii < in.size() || oi < old.size(); ++ii, ++oi) { // look at all elements in both lists, even if we reach the end of one early. diff --git a/src/filewidgets/kurlnavigatorbutton.cpp b/src/filewidgets/kurlnavigatorbutton.cpp --- a/src/filewidgets/kurlnavigatorbutton.cpp +++ b/src/filewidgets/kurlnavigatorbutton.cpp @@ -499,7 +499,7 @@ } NaturalLessThan nlt; - qSort(m_subDirs.begin(), m_subDirs.end(), nlt); + std::sort(m_subDirs.begin(), m_subDirs.end(), nlt); setDisplayHintEnabled(PopupActiveHint, true); update(); // ensure the button is drawn highlighted @@ -544,7 +544,7 @@ } NaturalLessThan nlt; - qSort(m_subDirs.begin(), m_subDirs.end(), nlt); + std::sort(m_subDirs.begin(), m_subDirs.end(), nlt); // Get index of the directory that is shown currently in the button const QString currentDir = m_url.fileName(); diff --git a/src/ioslaves/http/http_cache_cleaner.cpp b/src/ioslaves/http/http_cache_cleaner.cpp --- a/src/ioslaves/http/http_cache_cleaner.cpp +++ b/src/ioslaves/http/http_cache_cleaner.cpp @@ -670,7 +670,7 @@ if (m_fileNameList.isEmpty()) { // final step of phase one - qSort(m_fiList.begin(), m_fiList.end(), CacheFileInfoPtrLessThan); + std::sort(m_fiList.begin(), m_fiList.end(), CacheFileInfoPtrLessThan); } return false; } diff --git a/src/kpac/script.cpp b/src/kpac/script.cpp --- a/src/kpac/script.cpp +++ b/src/kpac/script.cpp @@ -668,12 +668,12 @@ QString sortedAddress(QLatin1String("")); if (!ipV6List.isEmpty()) { - qSort(ipV6List.begin(), ipV6List.end(), addressLessThanComparison); + std::sort(ipV6List.begin(), ipV6List.end(), addressLessThanComparison); sortedAddress += addressListToString(ipV6List, actualEntryMap); } if (!ipV4List.isEmpty()) { - qSort(ipV4List.begin(), ipV4List.end(), addressLessThanComparison); + std::sort(ipV4List.begin(), ipV4List.end(), addressLessThanComparison); if (!sortedAddress.isEmpty()) { sortedAddress += QLatin1Char(';'); } diff --git a/src/kpasswdserver/kpasswdserver.cpp b/src/kpasswdserver/kpasswdserver.cpp --- a/src/kpasswdserver/kpasswdserver.cpp +++ b/src/kpasswdserver/kpasswdserver.cpp @@ -745,7 +745,7 @@ // Insert into list, keep the list sorted "longest path" first. authList->append(authItem); - qSort(authList->begin(), authList->end(), AuthInfoContainer::Sorter()); + std::sort(authList->begin(), authList->end(), AuthInfoContainer::Sorter()); } void diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp --- a/src/widgets/kdirmodel.cpp +++ b/src/widgets/kdirmodel.cpp @@ -1009,7 +1009,7 @@ } QList ret(urls); - qSort(ret.begin(), ret.end(), lessThan); + std::sort(ret.begin(), ret.end(), lessThan); QList::iterator it = ret.begin(); QUrl url = *it; diff --git a/src/widgets/kfileitemactions.cpp b/src/widgets/kfileitemactions.cpp --- a/src/widgets/kfileitemactions.cpp +++ b/src/widgets/kfileitemactions.cpp @@ -573,7 +573,7 @@ } } - qSort(rankings.begin(), rankings.end(), KFileItemActionsPrivate::lessRank); + std::sort(rankings.begin(), rankings.end(), KFileItemActionsPrivate::lessRank); KService::List result; Q_FOREACH (const KFileItemActionsPrivate::ServiceRank &tempRank, rankings) {