diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformintegrationfactory_qpa.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegrationplugin.h | 11 | ||||
-rw-r--r-- | src/gui/kernel/qplatformthemefactory_qpa.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatformthemeplugin.h | 12 |
4 files changed, 6 insertions, 25 deletions
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp index 3b05742f09..886f50bdc6 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp @@ -66,10 +66,10 @@ QPlatformIntegration *QPlatformIntegrationFactory::create(const QString& key, co // Try loading the plugin from platformPluginPath first: if (!platformPluginPath.isEmpty()) { QCoreApplication::addLibraryPath(platformPluginPath); - if (QPlatformIntegration *ret = qLoadPlugin1<QPlatformIntegration, QPlatformIntegrationFactoryInterface >(directLoader(), platform, paramList)) + if (QPlatformIntegration *ret = qLoadPlugin1<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList)) return ret; } - if (QPlatformIntegration *ret = qLoadPlugin1<QPlatformIntegration, QPlatformIntegrationFactoryInterface >(loader(), platform, paramList)) + if (QPlatformIntegration *ret = qLoadPlugin1<QPlatformIntegration, QPlatformIntegrationPlugin>(loader(), platform, paramList)) return ret; #endif return 0; diff --git a/src/gui/kernel/qplatformintegrationplugin.h b/src/gui/kernel/qplatformintegrationplugin.h index 8b36a7dee2..8990668c60 100644 --- a/src/gui/kernel/qplatformintegrationplugin.h +++ b/src/gui/kernel/qplatformintegrationplugin.h @@ -61,24 +61,15 @@ QT_BEGIN_NAMESPACE class QPlatformIntegration; -struct QPlatformIntegrationFactoryInterface : public QFactoryInterface -{ - virtual QPlatformIntegration *create(const QString &key, const QStringList ¶mList) = 0; -}; - #define QPlatformIntegrationFactoryInterface_iid "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" -Q_DECLARE_INTERFACE(QPlatformIntegrationFactoryInterface, QPlatformIntegrationFactoryInterface_iid) - -class Q_GUI_EXPORT QPlatformIntegrationPlugin : public QObject, public QPlatformIntegrationFactoryInterface +class Q_GUI_EXPORT QPlatformIntegrationPlugin : public QObject { Q_OBJECT - Q_INTERFACES(QPlatformIntegrationFactoryInterface:QFactoryInterface) public: explicit QPlatformIntegrationPlugin(QObject *parent = 0); ~QPlatformIntegrationPlugin(); - virtual QStringList keys() const = 0; virtual QPlatformIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory_qpa.cpp index c809a7fba3..cc203991db 100644 --- a/src/gui/kernel/qplatformthemefactory_qpa.cpp +++ b/src/gui/kernel/qplatformthemefactory_qpa.cpp @@ -66,10 +66,10 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString // Try loading the plugin from platformPluginPath first: if (!platformPluginPath.isEmpty()) { QCoreApplication::addLibraryPath(platformPluginPath); - if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemeFactoryInterface>(directLoader(), platform, paramList)) + if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemePlugin>(directLoader(), platform, paramList)) return ret; } - if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemeFactoryInterface>(loader(), platform, paramList)) + if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList)) return ret; #endif return 0; diff --git a/src/gui/kernel/qplatformthemeplugin.h b/src/gui/kernel/qplatformthemeplugin.h index 970eb36f07..cc7bd768c9 100644 --- a/src/gui/kernel/qplatformthemeplugin.h +++ b/src/gui/kernel/qplatformthemeplugin.h @@ -58,27 +58,17 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE - class QPlatformTheme; -struct QPlatformThemeFactoryInterface : public QFactoryInterface -{ - virtual QPlatformTheme *create(const QString &key, const QStringList ¶mList) = 0; -}; - #define QPlatformThemeFactoryInterface_iid "org.qt-project.Qt.QPlatformThemeFactoryInterface" -Q_DECLARE_INTERFACE(QPlatformThemeFactoryInterface, QPlatformThemeFactoryInterface_iid) - -class Q_GUI_EXPORT QPlatformThemePlugin : public QObject, public QPlatformThemeFactoryInterface +class Q_GUI_EXPORT QPlatformThemePlugin : public QObject { Q_OBJECT - Q_INTERFACES(QPlatformThemeFactoryInterface:QFactoryInterface) public: explicit QPlatformThemePlugin(QObject *parent = 0); ~QPlatformThemePlugin(); - virtual QStringList keys() const = 0; virtual QPlatformTheme *create(const QString &key, const QStringList ¶mList) = 0; }; |