diff options
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qimagereader.cpp | 6 | ||||
-rw-r--r-- | src/gui/image/qimagewriter.cpp | 6 | ||||
-rw-r--r-- | src/gui/image/qpicture.cpp | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 830428c8f0..5c5b1fa0be 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -150,6 +150,8 @@ #include <private/qgifhandler_p.h> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #ifndef QT_NO_IMAGEFORMATPLUGIN @@ -1494,7 +1496,7 @@ QList<QByteArray> QImageReader::supportedImageFormats() for (QSet<QByteArray>::ConstIterator it = formats.constBegin(); it != formats.constEnd(); ++it) sortedFormats << *it; - qSort(sortedFormats); + std::sort(sortedFormats.begin(), sortedFormats.end()); return sortedFormats; } @@ -1521,7 +1523,7 @@ QList<QByteArray> QImageReader::supportedMimeTypes() for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) sortedMimeTypes << *it; - qSort(sortedMimeTypes); + std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end()); return sortedMimeTypes; } diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index a27dc9d16f..c502a01df5 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -123,6 +123,8 @@ #include <private/qgifhandler_p.h> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #ifndef QT_NO_IMAGEFORMATPLUGIN @@ -755,7 +757,7 @@ QList<QByteArray> QImageWriter::supportedImageFormats() for (QSet<QByteArray>::ConstIterator it = formats.constBegin(); it != formats.constEnd(); ++it) sortedFormats << *it; - qSort(sortedFormats); + std::sort(sortedFormats.begin(), sortedFormats.end()); return sortedFormats; } @@ -797,7 +799,7 @@ QList<QByteArray> QImageWriter::supportedMimeTypes() for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) sortedMimeTypes << *it; - qSort(sortedMimeTypes); + std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end()); return sortedMimeTypes; } diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 1071ed754b..e7fbb2a6a9 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -59,6 +59,8 @@ #include "qregion.h" #include "qdebug.h" +#include <algorithm> + QT_BEGIN_NAMESPACE void qt_format_text(const QFont &fnt, const QRectF &_r, @@ -1798,7 +1800,7 @@ QList<QByteArray> QPictureIO::inputFormats() result.append(p->format); } } - qSort(result); + std::sort(result.begin(), result.end()); return result; } |