diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:04:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
commit | aa3f358d433ec7fbe0237141c22297f3d8d4120d (patch) | |
tree | 924e0f4387f601cf1183d0dbfa5433f641dc7a96 /src/gui/image/qimagewriter.cpp | |
parent | 50a8a5e7959ca315e812413661a76576b7c3bbb8 (diff) |
Remove deprecated QtAlgorithms calls from QtGui
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I324ddf6129fe8884ecea97ef47abb7c071dfb34c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/image/qimagewriter.cpp')
-rw-r--r-- | src/gui/image/qimagewriter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |