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/ico | |
| 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/ico')
| -rw-r--r-- | src/plugins/imageformats/ico/main.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/imageformats/ico/main.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/imageformats/ico/main.cpp b/src/plugins/imageformats/ico/main.cpp index 9c9525f48f..24138bfce3 100644 --- a/src/plugins/imageformats/ico/main.cpp +++ b/src/plugins/imageformats/ico/main.cpp @@ -45,11 +45,6 @@ QT_BEGIN_NAMESPACE -QStringList QICOPlugin::keys() const -{ - return QStringList() << QLatin1String("ico"); -} - QImageIOPlugin::Capabilities QICOPlugin::capabilities(QIODevice *device, const QByteArray &format) const { if (format == "ico") diff --git a/src/plugins/imageformats/ico/main.h b/src/plugins/imageformats/ico/main.h index 6c7634002a..99e9338e31 100644 --- a/src/plugins/imageformats/ico/main.h +++ b/src/plugins/imageformats/ico/main.h @@ -56,7 +56,6 @@ class QICOPlugin : public QImageIOPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ico.json") public: - QStringList keys() const; Capabilities capabilities(QIODevice *device, const QByteArray &format) const; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; }; |