From 52b802cc6687af18c96915788f979dcfea60ff41 Mon Sep 17 00:00:00 2001
From: Trung Ngo <ndtrung4419@gmail.com>
Date: Sun, 16 Mar 2014 02:00:02 +0700
Subject: IBus: Implement QDBusArgument serialization operators

Task-number: QTBUG-37540
Change-Id: Idbe952dbd9851dde2c4aee0662d845996bf0c36a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 .../platforminputcontexts/ibus/qibustypes.h        | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'src/plugins/platforminputcontexts/ibus/qibustypes.h')

diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h
index 8e6f853a52..0275c5eed2 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.h
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h
@@ -43,19 +43,16 @@
 
 #include <qvector.h>
 #include <qevent.h>
+#include <QDBusArgument>
 
 QT_BEGIN_NAMESPACE
 
-class QDBusArgument;
-
 class QIBusSerializable
 {
 public:
     QIBusSerializable();
     virtual ~QIBusSerializable();
 
-    virtual void fromDBusArgument(const QDBusArgument &arg);
-
     QString name;
     QHash<QString, QDBusArgument>  attachments;
 };
@@ -81,7 +78,6 @@ public:
     QIBusAttribute();
     ~QIBusAttribute();
 
-    void fromDBusArgument(const QDBusArgument &arg);
     QTextFormat format() const;
 
     Type type;
@@ -96,8 +92,6 @@ public:
     QIBusAttributeList();
     ~QIBusAttributeList();
 
-    void fromDBusArgument(const QDBusArgument &arg);
-
     QList<QInputMethodEvent::Attribute> imAttributes() const;
 
     QVector<QIBusAttribute> attributes;
@@ -109,12 +103,27 @@ public:
     QIBusText();
     ~QIBusText();
 
-    void fromDBusArgument(const QDBusArgument &arg);
-
     QString text;
     QIBusAttributeList attributes;
 };
 
+QDBusArgument &operator<<(QDBusArgument &argument, const QIBusSerializable &object);
+const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusSerializable &object);
+
+QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute);
+const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusAttribute &attribute);
+
+QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttributeList &attributeList);
+const QDBusArgument &operator>>(const QDBusArgument &arg, QIBusAttributeList &attrList);
+
+QDBusArgument &operator<<(QDBusArgument &argument, const QIBusText &text);
+const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusText &text);
+
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QIBusSerializable)
+Q_DECLARE_METATYPE(QIBusAttribute)
+Q_DECLARE_METATYPE(QIBusAttributeList)
+Q_DECLARE_METATYPE(QIBusText)
+
 #endif
-- 
cgit v1.2.3