Merge the changes to the bindings from the KDE Subversion server.

This is a major change: library is source- and binary-incompatible to
what it used to be.

All testcases are green, functionality is preserved.

It is not feature-complete. Development will continue in the branch in the
Subversion server for a while.

1 files changed, 67 insertions, 0 deletions

diff --git a/qt/qdbusinterface_p.h b/qt/qdbusinterface_p.h
new file mode 100644
index 00000000..52fa8008
--- /dev/null
+++ b/qt/qdbusinterface_p.h
@@ -0,0 +1,67 @@
+/* 
+ *
+ * Copyright (C) 2006 Thiago José Macieira <thiago@kde.org>
+ * Copyright (C) 2006 Trolltech AS. All rights reserved.
+ *    Author: Thiago Macieira <thiago.macieira@trolltech.com>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+//  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 QDBUSINTERFACEPRIVATE_H
+#define QDBUSINTERFACEPRIVATE_H
+
+#include "qdbusobject.h"
+#include "qdbusinterface.h"
+#include "qdbusconnection.h"
+#include "qdbuserror.h"
+
+#define ANNOTATION_NO_WAIT      "com.trolltech.DBus.NoWaitForReply"
+
+class QDBusInterfacePrivate
+{
+public:
+    QAtomic ref;
+    QDBusConnection conn;
+    QString service;
+    QString path;
+    QDBusError lastError;
+    
+    //QConstSharedDataPointer<QDBusIntrospection::Interface> data;
+    const QDBusIntrospection::Interface* data;
+
+    inline bool needsIntrospection() const
+    { return data->introspection.isNull(); }
+
+    inline void introspect()
+    { if (needsIntrospection()) QDBusObject(conn, service, path).introspect(); }
+};
+
+
+#endif