Accessibility Linux: Make dbus registration async

Change-Id: I74043be04f4ee17089353304fdc007a7f22cdea0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

1 files changed, 24 insertions, 4 deletions

diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
index 4fb75bf41f..2875dd89d8 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h
+++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
@@ -45,21 +45,41 @@
 
 #include <QtCore/QString>
 #include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusVariant>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-class DBusConnection
+class QDBusServiceWatcher;
+
+class DBusConnection : public QObject
 {
+    Q_OBJECT
+
 public:
-    DBusConnection();
+    DBusConnection(QObject *parent = 0);
     QDBusConnection connection() const;
+    bool isEnabled() const { return m_enabled; }
+
+Q_SIGNALS:
+    // Emitted when the global accessibility status changes to enabled
+    void enabledChanged(bool enabled);
+
+private Q_SLOTS:
+    void serviceRegistered();
+    void serviceUnregistered();
+    void enabledStateCallback(const QDBusVariant &enabled);
+//    void enabledStateChanged(const QDBusVariant &);
+    void connectA11yBus(const QString &address);
+
+    void dbusError(const QDBusError &error);
 
 private:
     QString getAccessibilityBusAddress() const;
-    QDBusConnection connectDBus();
 
-    QDBusConnection dbusConnection;
+    QDBusServiceWatcher *dbusWatcher;
+    QDBusConnection m_a11yConnection;
+    bool m_enabled;
 };
 
 QT_END_NAMESPACE