Remove the QFactoryInterface dependency from accessible plugins

QFactoryInterface is not needed anymore and will get removed soon.

Change-Id: Ib2806200b1a7f4a45d62e2b556380946ef68f585
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

6 files changed, 11 insertions, 52 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index ec02086d74..7fc01c7555 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -582,7 +582,7 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
                 return iface;
         }
 #ifndef QT_NO_LIBRARY
-        if (QAccessibleInterface * iface = qLoadPlugin1<QAccessibleInterface, QAccessibleFactoryInterface>(loader(), cn, object))
+        if (QAccessibleInterface * iface = qLoadPlugin1<QAccessibleInterface, QAccessiblePlugin>(loader(), cn, object))
             return iface;
 #endif
         mo = mo->superClass();
diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp
index d6d0796701..e0780f0680 100644
--- a/src/gui/accessible/qaccessiblebridge.cpp
+++ b/src/gui/accessible/qaccessiblebridge.cpp
@@ -108,17 +108,15 @@ QT_BEGIN_NAMESPACE
     \inmodule QtWidgets
 
     Writing an accessibility bridge plugin is achieved by subclassing
-    this base class, reimplementing the pure virtual functions keys()
-    and create(), and exporting the class with the
-    Q_EXPORT_PLUGIN2() macro.
+    this base class, reimplementing the pure virtual function create(),
+    and exporting the class with the Q_PLUGIN_METADATA() macro.
 
     \sa QAccessibleBridge, QAccessiblePlugin, {How to Create Qt Plugins}
 */
 
 /*!
     Constructs an accessibility bridge plugin with the given \a
-    parent. This is invoked automatically by the Q_EXPORT_PLUGIN2()
-    macro.
+    parent. This is invoked automatically by the plugin loader.
 */
 QAccessibleBridgePlugin::QAccessibleBridgePlugin(QObject *parent)
     : QObject(parent)
@@ -138,17 +136,6 @@ QAccessibleBridgePlugin::~QAccessibleBridgePlugin()
 }
 
 /*!
-    \fn QStringList QAccessibleBridgePlugin::keys() const
-
-    Returns the list of keys this plugins supports.
-
-    These keys must be the names of the bridges that this
-    plugin provides.
-
-    \sa create()
-*/
-
-/*!
     \fn QAccessibleBridge *QAccessibleBridgePlugin::create(const QString &key)
 
     Creates and returns the QAccessibleBridge object corresponding to
diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h
index 80830bd01c..5910c6b126 100644
--- a/src/gui/accessible/qaccessiblebridge.h
+++ b/src/gui/accessible/qaccessiblebridge.h
@@ -63,23 +63,15 @@ public:
     virtual void notifyAccessibilityUpdate(QAccessibleEvent *event) = 0;
 };
 
-struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface
-{
-    virtual QAccessibleBridge *create(const QString& name) = 0;
-};
-
 #define QAccessibleBridgeFactoryInterface_iid "org.qt-project.Qt.QAccessibleBridgeFactoryInterface"
-Q_DECLARE_INTERFACE(QAccessibleBridgeFactoryInterface, QAccessibleBridgeFactoryInterface_iid)
 
-class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface
+class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject
 {
     Q_OBJECT
-    Q_INTERFACES(QAccessibleBridgeFactoryInterface:QFactoryInterface)
 public:
     explicit QAccessibleBridgePlugin(QObject *parent = 0);
     ~QAccessibleBridgePlugin();
 
-    virtual QStringList keys() const = 0;
     virtual QAccessibleBridge *create(const QString &key) = 0;
 };
 
diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp
index c2fe9c7a7a..6b6f9348fd 100644
--- a/src/gui/accessible/qaccessibleplugin.cpp
+++ b/src/gui/accessible/qaccessibleplugin.cpp
@@ -58,16 +58,15 @@ QT_BEGIN_NAMESPACE
     \ingroup accessibility
 
     Writing an accessibility plugin is achieved by subclassing this
-    base class, reimplementing the pure virtual functions keys() and
-    create(), and exporting the class with the Q_EXPORT_PLUGIN2()
-    macro.
+    base class, reimplementing the pure virtual function create(),
+    and exporting the class with the Q_PLUGIN_METADATA() macro.
 
     \sa QAccessibleBridgePlugin, {How to Create Qt Plugins}
 */
 
 /*!
     Constructs an accessibility plugin with the given \a parent. This
-    is invoked automatically by the Q_EXPORT_PLUGIN2() macro.
+    is invoked automatically by the plugin loader.
 */
 QAccessiblePlugin::QAccessiblePlugin(QObject *parent)
     : QObject(parent)
@@ -85,17 +84,6 @@ QAccessiblePlugin::~QAccessiblePlugin()
 }
 
 /*!
-    \fn QStringList QAccessiblePlugin::keys() const
-
-    Returns the list of keys this plugin supports.
-
-    These keys must be the class names that this plugin provides
-    an accessibility implementation for.
-
-    \sa create()
-*/
-
-/*!
     \fn QAccessibleInterface *QAccessiblePlugin::create(const QString &key, QObject *object)
 
     Creates and returns a QAccessibleInterface implementation for the
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h
index 275e9ea753..8bec59ae16 100644
--- a/src/gui/accessible/qaccessibleplugin.h
+++ b/src/gui/accessible/qaccessibleplugin.h
@@ -55,25 +55,17 @@ QT_BEGIN_NAMESPACE
 class QStringList;
 class QAccessibleInterface;
 
-struct Q_GUI_EXPORT QAccessibleFactoryInterface : public QFactoryInterface
-{
-    virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0;
-};
-
 #define QAccessibleFactoryInterface_iid "org.qt-project.Qt.QAccessibleFactoryInterface"
-Q_DECLARE_INTERFACE(QAccessibleFactoryInterface, QAccessibleFactoryInterface_iid)
 
 class QAccessiblePluginPrivate;
 
-class Q_GUI_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface
+class Q_GUI_EXPORT QAccessiblePlugin : public QObject
 {
     Q_OBJECT
-    Q_INTERFACES(QAccessibleFactoryInterface:QFactoryInterface)
 public:
     explicit QAccessiblePlugin(QObject *parent = 0);
     ~QAccessiblePlugin();
 
-    virtual QStringList keys() const = 0;
     virtual QAccessibleInterface *create(const QString &key, QObject *object) = 0;
 };
 
diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp
index 36fba10ac4..dba5475995 100644
--- a/src/gui/accessible/qplatformaccessibility_qpa.cpp
+++ b/src/gui/accessible/qplatformaccessibility_qpa.cpp
@@ -118,13 +118,13 @@ void QPlatformAccessibility::initialize()
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
 
     const PluginKeyMap keyMap = bridgeloader()->keyMap();
-    QAccessibleBridgeFactoryInterface *factory = 0;
+    QAccessibleBridgePlugin *factory = 0;
     int i = -1;
     const PluginKeyMapConstIterator cend = keyMap.constEnd();
     for (PluginKeyMapConstIterator it = keyMap.constBegin(); it != cend; ++it) {
         if (it.key() != i) {
             i = it.key();
-            factory = qobject_cast<QAccessibleBridgeFactoryInterface*>(bridgeloader()->instance(i));
+            factory = qobject_cast<QAccessibleBridgePlugin*>(bridgeloader()->instance(i));
         }
         if (factory)
             if (QAccessibleBridge *bridge = factory->create(it.value()))