diff -r 000000000000 -r 1918ee327afb src/dbus/qdbusintegrator_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dbus/qdbusintegrator_p.h	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the public API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
+#ifndef QDBUSINTEGRATOR_P_H
+#define QDBUSINTEGRATOR_P_H
+
+#include <qdbus_symbols_p.h>
+
+#include "qcoreevent.h"
+#include "qeventloop.h"
+#include "qhash.h"
+#include "qobject.h"
+#include "private/qobject_p.h"
+#include "qlist.h"
+#include "qpointer.h"
+#include "qsemaphore.h"
+
+#include "qdbusconnection.h"
+#include "qdbusmessage.h"
+#include "qdbusconnection_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDBusConnectionPrivate;
+
+// Really private structs used by qdbusintegrator.cpp
+// Things that aren't used by any other file
+
+struct QDBusSlotCache
+{
+    struct Data
+    {
+        int flags;
+        int slotIdx;
+        QList<int> metaTypes;
+    };
+    typedef QMultiHash<QString, Data> Hash;
+    Hash hash;
+};
+
+class QDBusCallDeliveryEvent: public QMetaCallEvent
+{
+public:
+    QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender,
+                           const QDBusMessage &msg, const QList<int> &types, int f = 0)
+        : QMetaCallEvent(id, sender, -1), connection(c), message(msg), metaTypes(types), flags(f)
+        { }
+
+    int placeMetaCall(QObject *object)
+    {
+        QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id());
+        return -1;
+    }
+
+private:
+    QDBusConnection connection; // just for refcounting
+    QDBusMessage message;
+    QList<int> metaTypes;
+    int flags;
+};
+
+class QDBusActivateObjectEvent: public QMetaCallEvent
+{
+public:
+    QDBusActivateObjectEvent(const QDBusConnection &c, QObject *sender,
+                             const QDBusConnectionPrivate::ObjectTreeNode &n,
+                             int p, const QDBusMessage &m, QSemaphore *s = 0)
+        : QMetaCallEvent(-1, sender, -1, 0, 0, 0, s), connection(c), node(n),
+          pathStartPos(p), message(m), handled(false)
+        { }
+    ~QDBusActivateObjectEvent();
+
+    int placeMetaCall(QObject *);
+
+private:
+    QDBusConnection connection; // just for refcounting
+    QDBusConnectionPrivate::ObjectTreeNode node;
+    int pathStartPos;
+    QDBusMessage message;
+    bool handled;
+};
+
+class QDBusConnectionCallbackEvent : public QEvent
+{
+public:
+    QDBusConnectionCallbackEvent()
+        : QEvent(User), subtype(Subtype(0))
+    { }
+
+    DBusWatch *watch;
+    union {
+        int timerId;
+        int fd;
+    };
+    int extra;
+
+    enum Subtype {
+        AddTimeout = 0,
+        KillTimer,
+        AddWatch,
+        //RemoveWatch,
+        ToggleWatch
+    } subtype;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QDBusSlotCache)
+
+#endif