* qt/: Update to Subversion r548032.

	This includes a big reorganisation of the files inside the
	subdir.

We really need a version control system that supports moving of
files. I'm not bothering with history anyways anymore, since the
bindings will be moved out to git. The history should be restored from
Subversion when that happens.

1 files changed, 109 insertions, 0 deletions

diff --git a/qt/src/qdbustype_p.h b/qt/src/qdbustype_p.h
new file mode 100644
index 00000000..b719960e
--- /dev/null
+++ b/qt/src/qdbustype_p.h
@@ -0,0 +1,109 @@
+/* -*- C++ -*-
+ *
+ * Copyright (C) 2005 Thiago 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.
+ *
+ */
+
+#ifndef QDBUSTYPE_H
+#define QDBUSTYPE_H
+
+#include <QtCore/qvariant.h>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qlist.h>
+#include "qdbusmacros.h"
+#include <dbus/dbus.h>
+
+// forward declaration
+class QDBusTypeList;
+
+class QDBusTypePrivate;
+class QDBUS_EXPORT QDBusType
+{
+public:
+    QDBusType();
+    explicit QDBusType(int type);
+    explicit QDBusType(QVariant::Type type);
+    explicit QDBusType(const char* signature);
+    explicit QDBusType(DBusSignatureIter*);
+    explicit QDBusType(const QString& str);
+    explicit QDBusType(const QByteArray& str);
+    QDBusType(const QDBusType& other);
+
+    ~QDBusType();
+
+    QDBusType& operator=(const QDBusType& other);
+
+    int qvariantType() const;
+
+    int dbusType() const;
+    QByteArray dbusSignature() const;
+    bool isValid() const;
+    bool isBasic() const;
+    bool isContainer() const;
+
+    QDBusTypeList subTypes() const;
+
+    bool isArray() const;
+    QDBusType arrayElement() const;
+
+    bool isMap() const;
+    QDBusType mapKey() const;
+    QDBusType mapValue() const;
+
+    bool operator==(const QDBusType& other) const;
+    inline bool operator!=(const QDBusType &other) const
+    { return !(*this == other); }
+
+    static int qvariantType(int type);
+    static int qvariantType(const char* signature);
+    static int dbusType(QVariant::Type);
+    static const char* dbusSignature(QVariant::Type);
+
+    enum VariantListMode {
+        ListIsArray,
+        ListIsStruct
+    };
+    static QDBusType guessFromVariant(const QVariant &variant, VariantListMode = ListIsArray);
+
+private:
+    QSharedDataPointer<QDBusTypePrivate> d;
+};
+
+class QDBUS_EXPORT QDBusTypeList: public QList<QDBusType>
+{
+public:
+    inline QDBusTypeList() { }
+    inline QDBusTypeList(const QDBusTypeList& other)
+        : QList<QDBusType>(other)
+        { }
+    inline QDBusTypeList(const QList<QDBusType>& other)
+        : QList<QDBusType>(other)
+        { }
+    QDBusTypeList(const char* signature);
+    QDBusTypeList(DBusSignatureIter*);
+
+    bool canBeMap() const;
+
+    QByteArray dbusSignature() const;
+};
+
+#endif // QDBUSTYPE_H