From 53cbc3c5b43be246c7fad58eda7aafa823200629 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <takao.fujiwara1@gmail.com>
Date: Mon, 15 Jan 2018 12:25:05 +0900
Subject: IBus: Delete deprecated DBus APIs

IBus 1.6 will remove the deprecated DBus APIs; GetAddress() GetEngines()
These APIs are replaced with DBus GET properties.

Change-Id: I427494dd0685d523ac07366be528127d98ad7d7c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 .../platforminputcontexts/ibus/qibusproxy.cpp      | 45 +++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'src/plugins/platforminputcontexts/ibus/qibusproxy.cpp')

diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
index 9efa6f7eb0..156e9b7c90 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
@@ -33,10 +33,53 @@ QIBusProxy::~QIBusProxy()
 {
 }
 
+#ifdef QIBUS_GET_ADDRESS
+QString QIBusProxy::getAddress()
+{
+    QDBusReply<QDBusVariant> reply = Address();
+    QVariant variant = reply.value().variant();
+    if (!variant.isValid())
+        return QString();
+    return variant.toString();
+}
+#endif
+
+#ifdef QIBUS_GET_ENGINES
+QList<QIBusEngineDesc> QIBusProxy::getEngines()
+{
+    QList<QIBusEngineDesc> engines;
+    QDBusReply<QDBusVariant> reply = Engines();
+    QVariant variant = reply.value().variant();
+    if (!variant.isValid())
+        return engines;
+    const QDBusArgument argument = variant.value<QDBusArgument>();
+    qCDebug(qtQpaInputMethodsSerialize) << "QIBusProxy::getEngines()" << argument.currentSignature();
+
+    int i = 1;
+    argument.beginMap();
+    while (!argument.atEnd()) {
+        QDBusVariant value;
+        argument >> value;
+        if (!value.variant().isValid()) {
+            qWarning() << "Warning in QIBusProxy::getEngines():" << QString::asprintf("%dth variant is wrong", i);
+            break;
+        }
+        const QDBusArgument desc_arg = value.variant().value<QDBusArgument>();
+
+        QIBusEngineDesc desc;
+        desc_arg >> desc;
+        engines.append(desc);
+        ++i;
+    }
+    argument.endMap();
+    return engines;
+}
+#endif
+
 QIBusEngineDesc QIBusProxy::getGlobalEngine()
 {
     QIBusEngineDesc desc;
-    QDBusReply<QDBusVariant> reply = GetGlobalEngine();
+    QDBusReply<QDBusVariant> reply = GlobalEngine();
     QVariant variant = reply.value().variant();
     if (!variant.isValid())
         return desc;
-- 
cgit v1.2.3