replace QDBusMarshaller::close() with its body

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index 85e4204..9d85ca3 100644 (file)
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -125,7 +125,6 @@ public:
     QDBusMarshaller *beginCommon(int code, const char *signature);
     QDBusMarshaller *endCommon();
     void open(QDBusMarshaller &sub, int code, const char *signature);
-    void close();
     void error(const QString &message);
 
     bool appendVariantInternal(const QVariant &arg);

diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index b993c22..a909735 100644 (file)
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -49,7 +49,12 @@ static void qIterAppend(DBusMessageIter *it, QByteArray *ba, int type, const voi
 
 QDBusMarshaller::~QDBusMarshaller()
 {
-    close();
+    if (ba) {
+        if (closeCode)
+            *ba += closeCode;
+    } else if (parent) {
+        dbus_message_iter_close_container(&parent->iterator, &iterator);
+    }
 }
 
 inline QString QDBusMarshaller::currentSignature()
@@ -196,10 +201,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg)
 
     QDBusMarshaller sub(capabilities);
     open(sub, DBUS_TYPE_VARIANT, signature);
-    bool isOk = sub.appendVariantInternal(value);
-    // don't call sub.close(): it auto-closes
-
-    return isOk;
+    return sub.appendVariantInternal(value);
 }
 
 inline void QDBusMarshaller::append(const QStringList &arg)
@@ -215,7 +217,6 @@ inline void QDBusMarshaller::append(const QStringList &arg)
     QStringList::ConstIterator end = arg.constEnd();
     for ( ; it != end; ++it)
         sub.append(*it);
-    // don't call sub.close(): it auto-closes
 }
 
 inline QDBusMarshaller *QDBusMarshaller::beginStructure()
@@ -334,16 +335,6 @@ QDBusMarshaller *QDBusMarshaller::endCommon()
     return retval;
 }
 
-void QDBusMarshaller::close()
-{
-    if (ba) {
-        if (closeCode)
-            *ba += closeCode;
-    } else if (parent) {
-        dbus_message_iter_close_container(&parent->iterator, &iterator);
-    }
-}
-
 void QDBusMarshaller::error(const QString &msg)
 {
     ok = false;