From c9d040c1f5b0ee0ddd37e924576ec3bbd990f2ed Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 27 May 2012 03:40:00 +0200 Subject: 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 --- src/gui/image/qimageiohandler.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/gui/image/qimageiohandler.h') diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 0252ec02cc..16784504b6 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -114,18 +114,11 @@ private: Q_DISABLE_COPY(QImageIOHandler) }; -struct Q_GUI_EXPORT QImageIOHandlerFactoryInterface : public QFactoryInterface -{ - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const = 0; -}; - #define QImageIOHandlerFactoryInterface_iid "org.qt-project.Qt.QImageIOHandlerFactoryInterface" -Q_DECLARE_INTERFACE(QImageIOHandlerFactoryInterface, QImageIOHandlerFactoryInterface_iid) -class Q_GUI_EXPORT QImageIOPlugin : public QObject, public QImageIOHandlerFactoryInterface +class Q_GUI_EXPORT QImageIOPlugin : public QObject { Q_OBJECT - Q_INTERFACES(QImageIOHandlerFactoryInterface:QFactoryInterface) public: explicit QImageIOPlugin(QObject *parent = 0); virtual ~QImageIOPlugin(); @@ -138,7 +131,6 @@ public: Q_DECLARE_FLAGS(Capabilities, Capability) virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const = 0; - virtual QStringList keys() const = 0; virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const = 0; }; -- cgit v1.2.3