diff options
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.cpp | 4 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitemanimation.cpp | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qlayoutengine.cpp | 6 | ||||
-rw-r--r-- | src/widgets/styles/qstyle.cpp | 3 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsxpstyle.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qabstractbutton.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 6 |
7 files changed, 20 insertions, 11 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 519c158f81..81fa40f0e7 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -1669,7 +1669,7 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons return; QStringList toRemove; QStringList newFiles = files; - qSort(newFiles.begin(), newFiles.end()); + std::sort(newFiles.begin(), newFiles.end()); QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin(); while (i != parentNode->children.constEnd()) { QStringList::iterator iterator; @@ -1874,7 +1874,7 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path, const QL } // bundle up all of the changed signals into as few as possible. - qSort(rowsToUpdate.begin(), rowsToUpdate.end()); + std::sort(rowsToUpdate.begin(), rowsToUpdate.end()); QString min; QString max; for (int i = 0; i < rowsToUpdate.count(); ++i) { diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp index 45e8b436b1..55d7ee6d1b 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp +++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp @@ -93,6 +93,8 @@ #include <QtCore/qpair.h> #include <QtGui/qmatrix.h> +#include <algorithm> + QT_BEGIN_NAMESPACE class QGraphicsItemAnimationPrivate @@ -179,7 +181,7 @@ void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QL result->value = value; else { *binList << pair; - qSort(binList->begin(), binList->end()); + std::sort(binList->begin(), binList->end()); } } diff --git a/src/widgets/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp index 9ef2a7096f..fe27edd35d 100644 --- a/src/widgets/kernel/qlayoutengine.cpp +++ b/src/widgets/kernel/qlayoutengine.cpp @@ -46,10 +46,10 @@ #include "qwidget.h" #include <qlist.h> -#include <qalgorithms.h> - #include <qdebug.h> +#include <algorithm> + QT_BEGIN_NAMESPACE //#define QLAYOUT_EXTRA_DEBUG @@ -134,7 +134,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, for (i = start; i < start + count; i++) list << chain.at(i).minimumSize; - qSort(list); + std::sort(list.begin(), list.end()); int space_left = space - sumSpacing; diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 99bbf2f363..77f869f036 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -53,6 +53,7 @@ #endif #include <limits.h> +#include <algorithm> QT_BEGIN_NAMESPACE @@ -2337,7 +2338,7 @@ QDebug operator<<(QDebug debug, QStyle::State state) if (state & QStyle::State_Top) states << QLatin1String("Top"); if (state & QStyle::State_UpArrow) states << QLatin1String("UpArrow"); - qSort(states); + std::sort(states.begin(), states.end()); debug << states.join(QLatin1String(" | ")); debug << ')'; #else diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 3b3c27f6cb..f7a5f97dfd 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -72,6 +72,8 @@ #include <qvarlengtharray.h> #include <qdebug.h> +#include <algorithm> + QT_BEGIN_NAMESPACE // Runtime resolved theme engine function calls @@ -4306,7 +4308,7 @@ void QWindowsXPStylePrivate::showProperties(XPThemeData &themeData) } } } - qSort(all_props); + std::sort(all_props.begin(), all_props.end()); {// List all properties printf("part properties count = %d:\n", all_props.count()); diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index be712f0747..cdadde5cc1 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -52,6 +52,8 @@ #include "qaccessible.h" #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #define AUTO_REPEAT_DELAY 300 @@ -231,7 +233,7 @@ void QButtonGroup::addButton(QAbstractButton *button, int id) if (ids.isEmpty()) d->mapping[button] = -2; else { - qSort(ids); + std::sort(ids.begin(), ids.end()); d->mapping[button] = ids.first()-1; } } else { diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 13c9bf8deb..fd94dadac6 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -178,6 +178,8 @@ #include <qmath.h> #include <private/qlayoutengine_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE using namespace QMdi; @@ -465,9 +467,9 @@ void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QList<QRe } QList<int> xlist = xset.values(); - qSort(xlist.begin(), xlist.end()); + std::sort(xlist.begin(), xlist.end()); QList<int> ylist = yset.values(); - qSort(ylist.begin(), ylist.end()); + std::sort(ylist.begin(), ylist.end()); foreach (int y, ylist) foreach (int x, xlist) |