diff -r 000000000000 -r 1918ee327afb src/dbus/qdbusreply.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dbus/qdbusreply.h	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDBus module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDBUSREPLY_H
+#define QDBUSREPLY_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
+
+#include <QtDBus/qdbusmacros.h>
+#include <QtDBus/qdbusmessage.h>
+#include <QtDBus/qdbuserror.h>
+#include <QtDBus/qdbusextratypes.h>
+#include <QtDBus/qdbuspendingreply.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(DBus)
+
+QDBUS_EXPORT void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data);
+
+template<typename T>
+class QDBusReply
+{
+    typedef T Type;
+public:
+    inline QDBusReply(const QDBusMessage &reply)
+    {
+        *this = reply;
+    }
+    inline QDBusReply& operator=(const QDBusMessage &reply)
+    {
+        QVariant data(qMetaTypeId(&m_data), reinterpret_cast<void*>(0));
+        qDBusReplyFill(reply, m_error, data);
+        m_data = qvariant_cast<Type>(data);
+        return *this;
+    }
+
+    inline QDBusReply(const QDBusPendingCall &pcall)
+    {
+        *this = pcall;
+    }
+    inline QDBusReply &operator=(const QDBusPendingCall &pcall)
+    {
+        QDBusPendingCall other(pcall);
+        other.waitForFinished();
+        return *this = other.reply();
+    }
+    inline QDBusReply(const QDBusPendingReply<T> &reply)
+    {
+        *this = static_cast<QDBusPendingCall>(reply);
+    }
+
+    inline QDBusReply(const QDBusError &dbusError = QDBusError())
+        : m_error(dbusError), m_data(Type())
+    {
+    }
+    inline QDBusReply& operator=(const QDBusError& dbusError)
+    {
+        m_error = dbusError;
+        m_data = Type();
+        return *this;
+    }
+
+    inline QDBusReply& operator=(const QDBusReply& other)
+    {
+        m_error = other.m_error;
+        m_data = other.m_data;
+        return *this;
+    }
+
+    inline bool isValid() const { return !m_error.isValid(); }
+
+    inline const QDBusError& error() { return m_error; }
+
+    inline Type value() const
+    {
+        return m_data;
+    }
+
+    inline operator Type () const
+    {
+        return m_data;
+    }
+
+private:
+    QDBusError m_error;
+    Type m_data;
+};
+
+# ifndef Q_QDOC
+// specialize for QVariant:
+template<> inline QDBusReply<QVariant>&
+QDBusReply<QVariant>::operator=(const QDBusMessage &reply)
+{
+    void *null = 0;
+    QVariant data(qMetaTypeId<QDBusVariant>(), null);
+    qDBusReplyFill(reply, m_error, data);
+    m_data = qvariant_cast<QDBusVariant>(data).variant();
+    return *this;
+}
+
+// specialize for void:
+template<>
+class QDBusReply<void>
+{
+public:
+    inline QDBusReply(const QDBusMessage &reply)
+        : m_error(reply)
+    {
+    }
+    inline QDBusReply& operator=(const QDBusMessage &reply)
+    {
+        m_error = reply;
+        return *this;
+    }
+    inline QDBusReply(const QDBusError &dbusError = QDBusError())
+        : m_error(dbusError)
+    {
+    }
+    inline QDBusReply(const QDBusPendingCall &pcall)
+    {
+        *this = pcall;
+    }
+    inline QDBusReply &operator=(const QDBusPendingCall &pcall)
+    {
+        QDBusPendingCall other(pcall);
+        other.waitForFinished();
+        return *this = other.reply();
+    }
+    inline QDBusReply& operator=(const QDBusError& dbusError)
+    {
+        m_error = dbusError;
+        return *this;
+    }
+
+    inline QDBusReply& operator=(const QDBusReply& other)
+    {
+        m_error = other.m_error;
+        return *this;
+    }
+
+    inline bool isValid() const { return !m_error.isValid(); }
+
+    inline const QDBusError& error() { return m_error; }
+
+private:
+    QDBusError m_error;
+};
+# endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif