summaryrefslogtreecommitdiffstats
path: root/qt/src/qdbusmessage.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-06-05 18:13:07 +0000
committerThiago Macieira <thiago@kde.org>2006-06-05 18:13:07 +0000
commit517b8c2446029901e9062e858b723906cf20d7ef (patch)
tree61a02acb1f4769993c985d7a0aa91fab9c2694c7 /qt/src/qdbusmessage.cpp
parent54b762aa4c692596f70892f7fb3d7e495bd8268a (diff)
* qt/dbus: Add directory. I had forgotten to add this
yesterday after the move... * qt/examples/Makefile.am: * qt/examples/dbus.cpp: Moved to qt/tools/dbus.cpp. * qt/tools/Makefile.am: * qt/tools/dbus.cpp: Moved from qt/examples/dbus.cpp. Added feature to get and set properties. Added validation of service, object path and interface names. * qt/tools/dbusidl2cpp.cpp: Two new features: 1) Allow specifying both the header and the source file names, by separating them with a colon. 2) Don't write an interface output if the -p switch wasn't given, but the -a was. * qt/src/*: Fix usage of Iterators and ConstIterators. Fix shadowing of variables by other variables (-Wshadow). Fix keyword-cleanliness in headers. Fix ASCII-cast (QLatin1String, QLatin1Char). Fix validation of member names. Add extra checking of introspection data during XML parsing. Various bug fixes.
Diffstat (limited to 'qt/src/qdbusmessage.cpp')
-rw-r--r--qt/src/qdbusmessage.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/qt/src/qdbusmessage.cpp b/qt/src/qdbusmessage.cpp
index d0a0f1e5..ec24100e 100644
--- a/qt/src/qdbusmessage.cpp
+++ b/qt/src/qdbusmessage.cpp
@@ -55,12 +55,10 @@ QDBusMessagePrivate::~QDBusMessagePrivate()
This object can represent any of four different types of messages possible on the bus
(see MessageType)
- \list
- \o Method calls
- \o Method return values
- \o Signal emissions
- \o Error codes
- \endlist
+ - Method calls
+ - Method return values
+ - Signal emissions
+ - Error codes
Objects of this type are created with the four static functions signal, methodCall,
methodReply and error.
@@ -432,7 +430,7 @@ QString QDBusMessage::signature() const
/*!
Sets the signature for the output arguments of this method call to be the value of \a
- signature. This function has no meaning in other types of messages or when dealing with received
+ sig. This function has no meaning in other types of messages or when dealing with received
method calls.
A message's signature indicate the type of the parameters to
@@ -442,10 +440,10 @@ QString QDBusMessage::signature() const
when a variant of type QVariant::Invalid is converted to the type).
*/
-void QDBusMessage::setSignature(const QString &signature)
+void QDBusMessage::setSignature(const QString &sig)
{
qAtomicDetach(d_ptr);
- d_ptr->signature = signature;
+ d_ptr->signature = sig;
}
/*!
@@ -569,7 +567,7 @@ QDBusMessage::MessageType QDBusMessage::type() const
value.
*/
-#ifndef QT_NO_DEBUG
+#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug dbg, QDBusMessage::MessageType t)
{
switch (t)