diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-27 03:40:00 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 00:12:00 +0200 |
| commit | c9d040c1f5b0ee0ddd37e924576ec3bbd990f2ed (patch) | |
| tree | 9b31abbd8e80f9d1c9b436a4a1bdcbafa52e9b4c /src/plugins/imageformats/jpeg | |
| parent | 21019539fb0d2cc2db3d16c069fd38dec670c177 (diff) | |
Don't inherit from QFactoryInterface for image plugins
QFactoryInterface is obsolete now that we have the new plugins loading
mechanism, where we can get the keys out of the plugin without
having to load it. Remove it from QImageIOHandlerFactoryInterface
as a first step of getting completely rid of it.
Change-Id: I856b149dd20131e1cdcdcb271c1a355c9e0da6ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/imageformats/jpeg')
| -rw-r--r-- | src/plugins/imageformats/jpeg/main.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/imageformats/jpeg/main.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/imageformats/jpeg/main.cpp b/src/plugins/imageformats/jpeg/main.cpp index ecda04864b..aeea040261 100644 --- a/src/plugins/imageformats/jpeg/main.cpp +++ b/src/plugins/imageformats/jpeg/main.cpp @@ -50,11 +50,6 @@ QT_BEGIN_NAMESPACE -QStringList QJpegPlugin::keys() const -{ - return QStringList() << QLatin1String("jpeg") << QLatin1String("jpg"); -} - QImageIOPlugin::Capabilities QJpegPlugin::capabilities(QIODevice *device, const QByteArray &format) const { if (format == "jpeg" || format == "jpg") diff --git a/src/plugins/imageformats/jpeg/main.h b/src/plugins/imageformats/jpeg/main.h index 8606eabdd9..99379a72d4 100644 --- a/src/plugins/imageformats/jpeg/main.h +++ b/src/plugins/imageformats/jpeg/main.h @@ -55,7 +55,6 @@ class QJpegPlugin : public QImageIOPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "jpeg.json") public: - QStringList keys() const; Capabilities capabilities(QIODevice *device, const QByteArray &format) const; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; }; |