diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-03-28 18:56:08 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-03-28 18:56:08 +0000 |
| commit | d42c8663e8fd441838a238bfb845a7c80c37b253 (patch) | |
| tree | ac29c8e23bc1e48690cac1fc8416a1b34628e832 /qt/qdbusmessage.h | |
| parent | 36e1d8bfc79614617f364306bb168f46e0d4761c (diff) | |
* qt/*:
* dbus/qdbus.h: Sync with KDE Subversion revision
523647. Hopefully, this will be the last of the
source-incompatible changes. Documentation has been improved;
support for QList<basic-types> has been added; QDBusObject is
gone; QDBus(Abstract)Interface is now a QObject with
auto-generated meta-object; QDBusIntrospection is marked
private, since QMetaObject can be used now; lots of bugfixes.
Diffstat (limited to 'qt/qdbusmessage.h')
| -rw-r--r-- | qt/qdbusmessage.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qt/qdbusmessage.h b/qt/qdbusmessage.h index 6af5785c..f8feeae4 100644 --- a/qt/qdbusmessage.h +++ b/qt/qdbusmessage.h @@ -26,19 +26,21 @@ #define QDBUSMESSAGE_H #include "qdbusmacros.h" +#include "qdbuserror.h" #include <QtCore/qlist.h> #include <QtCore/qvariant.h> #include <limits.h> class QDBusMessagePrivate; -class QDBusError; class QDBusConnection; +class QDBusConnectionPrivate; struct DBusMessage; class QDBUS_EXPORT QDBusMessage: public QList<QVariant> { - friend class QDBusConnection; + //friend class QDBusConnection; + friend class QDBusConnectionPrivate; public: enum { DefaultTimeout = -1, NoTimeout = INT_MAX}; enum MessageType { InvalidMessage, MethodCallMessage, ReplyMessage, @@ -78,16 +80,15 @@ public: QDBusConnection connection() const; -//protected: - DBusMessage *toDBusMessage() const; - static QDBusMessage fromDBusMessage(DBusMessage *dmsg, const QDBusConnection &connection); - static QDBusMessage fromError(const QDBusError& error); int serialNumber() const; int replySerialNumber() const; bool wasRepliedTo() const; private: - QDBusMessagePrivate *d; + DBusMessage *toDBusMessage() const; + static QDBusMessage fromDBusMessage(DBusMessage *dmsg, const QDBusConnection &connection); + static QDBusMessage fromError(const QDBusError& error); + QDBusMessagePrivate *d_ptr; }; #ifndef QT_NO_DEBUG |