From 1402660575609a5e936f7b3f656df49c60b812c4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 27 May 2012 04:09:13 +0200 Subject: Remove QFactoryInterface from picture plugins Change-Id: I7b02cbfb850d6a9fc90c1eb1e12a9950baf61e77 Reviewed-by: Thiago Macieira --- src/gui/image/qpictureformatplugin.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/gui/image/qpictureformatplugin.h') diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h index 7bcd32b4fd..40042c0d9c 100644 --- a/src/gui/image/qpictureformatplugin.h +++ b/src/gui/image/qpictureformatplugin.h @@ -57,27 +57,15 @@ class QImage; class QString; class QStringList; -struct Q_GUI_EXPORT QPictureFormatInterface : public QFactoryInterface -{ - virtual bool loadPicture(const QString &format, const QString &filename, QPicture *) = 0; - virtual bool savePicture(const QString &format, const QString &filename, const QPicture &) = 0; - - virtual bool installIOHandler(const QString &) = 0; -}; - #define QPictureFormatInterface_iid "org.qt-project.Qt.QPictureFormatInterface" -Q_DECLARE_INTERFACE(QPictureFormatInterface, QPictureFormatInterface_iid) - -class Q_GUI_EXPORT QPictureFormatPlugin : public QObject, public QPictureFormatInterface +class Q_GUI_EXPORT QPictureFormatPlugin : public QObject { Q_OBJECT - Q_INTERFACES(QPictureFormatInterface:QFactoryInterface) public: explicit QPictureFormatPlugin(QObject *parent = 0); ~QPictureFormatPlugin(); - virtual QStringList keys() const = 0; virtual bool loadPicture(const QString &format, const QString &filename, QPicture *pic); virtual bool savePicture(const QString &format, const QString &filename, const QPicture &pic); virtual bool installIOHandler(const QString &format) = 0; -- cgit v1.2.3