diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-03-06 22:23:18 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 15:22:30 +0100 |
| commit | 6c2695d677215868447790297c1401628eabc47e (patch) | |
| tree | 4de3e058154a397b4efc5d56d50706eba95627ed /src/dbus/qdbusabstractinterface.cpp | |
| parent | 0ee9b6831a4385d8a7b208220ed82ec6bf538b4e (diff) | |
QtDBus: make some constructors explicit
This is a semi-automatic search, so I'm
reasonably sure that all the exported ones
have been caught.
Change-Id: I314d341ad0db4e9d4bbf353a9537c9422ad8a54b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index cb9f2e7360..941f322315 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -148,7 +148,7 @@ void QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, QVariant & QDBusMessage reply = connection.call(msg, QDBus::Block, timeout); if (reply.type() != QDBusMessage::ReplyMessage) { - lastError = reply; + lastError = QDBusError(reply); where.clear(); return; } @@ -214,7 +214,7 @@ bool QDBusAbstractInterfacePrivate::setProperty(const QMetaProperty &mp, const Q QDBusMessage reply = connection.call(msg, QDBus::Block, timeout); if (reply.type() != QDBusMessage::ReplyMessage) { - lastError = reply; + lastError = QDBusError(reply); return false; } return true; @@ -467,7 +467,7 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode, QDBusMessage reply = d->connection.call(msg, mode, d->timeout); if (thread() == QThread::currentThread()) - d->lastError = reply; // will clear if reply isn't an error + d->lastError = QDBusError(reply); // will clear if reply isn't an error // ensure that there is at least one element if (reply.arguments().isEmpty()) @@ -540,7 +540,7 @@ bool QDBusAbstractInterface::callWithCallback(const QString &method, QDBusMessagePrivate::setParametersValidated(msg, true); msg.setArguments(args); - d->lastError = 0; + d->lastError = QDBusError(); return d->connection.callWithCallback(msg, receiver, returnMethod, |