1 files changed, 15 insertions, 22 deletions

diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index a10198a006..d3edf40acc 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -125,7 +125,6 @@
 #include <qimageiohandler.h>
 #include <qlist.h>
 #include <qrect.h>
-#include <qset.h>
 #include <qsize.h>
 #include <qcolor.h>
 #include <qvariant.h>
@@ -568,7 +567,7 @@ bool QImageReaderPrivate::initHandler()
     // check some preconditions
     if (!device || (!deleteDevice && !device->isOpen() && !device->open(QIODevice::ReadOnly))) {
         imageReaderError = QImageReader::DeviceError;
-        errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Invalid device"));
+        errorString = QImageReader::tr("Invalid device");
         return false;
     }
 
@@ -595,7 +594,7 @@ bool QImageReaderPrivate::initHandler()
 
         if (!device->isOpen()) {
             imageReaderError = QImageReader::FileNotFoundError;
-            errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "File not found"));
+            errorString = QImageReader::tr("File not found");
             file->setFileName(fileName); // restore the old file name
             return false;
         }
@@ -604,7 +603,7 @@ bool QImageReaderPrivate::initHandler()
     // assign a handler
     if (!handler && (handler = createReadHandlerHelper(device, format, autoDetectImageFormat, ignoresFormatAndExtension)) == 0) {
         imageReaderError = QImageReader::UnsupportedFormatError;
-        errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unsupported image format"));
+        errorString = QImageReader::tr("Unsupported image format");
         return false;
     }
     return true;
@@ -1191,7 +1190,7 @@ bool QImageReader::read(QImage *image)
     // read the image
     if (!d->handler->read(image)) {
         d->imageReaderError = InvalidDataError;
-        d->errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unable to read image data"));
+        d->errorString = QImageReader::tr("Unable to read image data");
         return false;
     }
 
@@ -1384,7 +1383,7 @@ QImageReader::ImageReaderError QImageReader::error() const
 QString QImageReader::errorString() const
 {
     if (d->errorString.isEmpty())
-        return QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unknown error"));
+        return QImageReader::tr("Unknown error");
     return d->errorString;
 }
 
@@ -1445,11 +1444,11 @@ QByteArray QImageReader::imageFormat(QIODevice *device)
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 void supportedImageHandlerFormats(QFactoryLoader *loader,
                                   QImageIOPlugin::Capability cap,
-                                  QSet<QByteArray> *result);
+                                  QList<QByteArray> *result);
 
 void supportedImageHandlerMimeTypes(QFactoryLoader *loader,
                                   QImageIOPlugin::Capability cap,
-                                  QSet<QByteArray> *result);
+                                  QList<QByteArray> *result);
 #endif
 
 /*!
@@ -1482,7 +1481,7 @@ void supportedImageHandlerMimeTypes(QFactoryLoader *loader,
 
 QList<QByteArray> QImageReader::supportedImageFormats()
 {
-    QSet<QByteArray> formats;
+    QList<QByteArray> formats;
     for (int i = 0; i < _qt_NumFormats; ++i)
         formats << _qt_BuiltInFormats[i].extension;
 
@@ -1490,12 +1489,9 @@ QList<QByteArray> QImageReader::supportedImageFormats()
     supportedImageHandlerFormats(loader(), QImageIOPlugin::CanRead, &formats);
 #endif // QT_NO_IMAGEFORMATPLUGIN
 
-    QList<QByteArray> sortedFormats;
-    for (QSet<QByteArray>::ConstIterator it = formats.constBegin(); it != formats.constEnd(); ++it)
-        sortedFormats << *it;
-
-    std::sort(sortedFormats.begin(), sortedFormats.end());
-    return sortedFormats;
+    std::sort(formats.begin(), formats.end());
+    formats.erase(std::unique(formats.begin(), formats.end()), formats.end());
+    return formats;
 }
 
 /*!
@@ -1509,7 +1505,7 @@ QList<QByteArray> QImageReader::supportedImageFormats()
 
 QList<QByteArray> QImageReader::supportedMimeTypes()
 {
-    QSet<QByteArray> mimeTypes;
+    QList<QByteArray> mimeTypes;
     for (int i = 0; i < _qt_NumFormats; ++i)
         mimeTypes << _qt_BuiltInFormats[i].mimeType;
 
@@ -1517,12 +1513,9 @@ QList<QByteArray> QImageReader::supportedMimeTypes()
     supportedImageHandlerMimeTypes(loader(), QImageIOPlugin::CanRead, &mimeTypes);
 #endif // QT_NO_IMAGEFORMATPLUGIN
 
-    QList<QByteArray> sortedMimeTypes;
-    for (QSet<QByteArray>::ConstIterator it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it)
-        sortedMimeTypes << *it;
-
-    std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end());
-    return sortedMimeTypes;
+    std::sort(mimeTypes.begin(), mimeTypes.end());
+    mimeTypes.erase(std::unique(mimeTypes.begin(), mimeTypes.end()), mimeTypes.end());
+    return mimeTypes;
 }
 
 QT_END_NAMESPACE