diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-27 04:02:09 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 00:12:05 +0200 |
commit | dcf3c95175a93cf883e14a6d434b4306df50cf37 (patch) | |
tree | 71d3bccc8e52bd4111671116a6f7a87808968f62 /src/gui/image/qiconengineplugin.h | |
parent | 2903db8b4ce77f5ff36da7c3c8fb43337881598f (diff) |
Remove QFactoryInterface dependency from icon plugins
Change-Id: I65bed1646f3c5e89329a6bbe3dcdbdb5660b7004
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qiconengineplugin.h')
-rw-r--r-- | src/gui/image/qiconengineplugin.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h index 9333400609..8ca0445dac 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/image/qiconengineplugin.h @@ -52,24 +52,15 @@ QT_BEGIN_NAMESPACE class QIconEngine; -struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface -{ - virtual QIconEngine *create(const QString &filename = QString()) = 0; -}; - -#define QIconEngineFactoryInterface_iid \ - "org.qt-project.Qt.QIconEngineFactoryInterface" -Q_DECLARE_INTERFACE(QIconEngineFactoryInterface, QIconEngineFactoryInterface_iid) +#define QIconEngineFactoryInterface_iid "org.qt-project.Qt.QIconEngineFactoryInterface" -class Q_GUI_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface +class Q_GUI_EXPORT QIconEnginePlugin : public QObject { Q_OBJECT - Q_INTERFACES(QIconEngineFactoryInterface:QFactoryInterface) public: QIconEnginePlugin(QObject *parent = 0); ~QIconEnginePlugin(); - virtual QStringList keys() const = 0; virtual QIconEngine *create(const QString &filename = QString()) = 0; }; |