diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2010-01-22 14:03:42 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-22 14:04:20 (GMT) |
| commit | f4ad659dde0c4b0b61dcc2bc5a69441f13c013b7 (patch) | |
| tree | 307f3fb66ce6c18018503dea6f003b4265723f90 /src/dbus/qdbusmarshaller.cpp | |
| parent | 670f90b3068d530f14000eb816dd9ff38f9fb005 (diff) | |
| download | Qt-f4ad659dde0c4b0b61dcc2bc5a69441f13c013b7.zip Qt-f4ad659dde0c4b0b61dcc2bc5a69441f13c013b7.tar.gz Qt-f4ad659dde0c4b0b61dcc2bc5a69441f13c013b7.tar.bz2 | |
minor optimization
avoid needless atomic operations
Merge-request: 442
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/dbus/qdbusmarshaller.cpp')
| -rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index f156e04..8ec328e 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qdbusargument_p.h" +#include "qdbusmetatype_p.h" #include "qdbusutil_p.h" QT_BEGIN_NAMESPACE @@ -167,7 +168,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) QByteArray tmpSignature; const char *signature = 0; - if (int(id) == qMetaTypeId<QDBusArgument>()) { + if (int(id) == QDBusMetaTypeId::argument) { // take the signature from the QDBusArgument object we're marshalling tmpSignature = qvariant_cast<QDBusArgument>(value).currentSignature().toLatin1(); @@ -353,7 +354,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) } // intercept QDBusArgument parameters here - if (id == qMetaTypeId<QDBusArgument>()) { + if (id == QDBusMetaTypeId::argument) { QDBusArgument dbusargument = qvariant_cast<QDBusArgument>(arg); QDBusArgumentPrivate *d = QDBusArgumentPrivate::d(dbusargument); if (!d->message) |