From d5a85940f785459d7b982d5fdf59a9fd18825092 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 12 Mar 2012 12:41:24 +0100 Subject: QDBusError: add assignment operator from QDBusMessage There's an implicit constructor for this conversion, so there should be an assignment operator, too, as an optimisation. Change-Id: I1d1646cbafdea5a4f80b11b011a8940b65a9fb9f Reviewed-by: Thiago Macieira --- src/dbus/qdbuserror.cpp | 18 ++++++++++++++++++ src/dbus/qdbuserror.h | 1 + 2 files changed, 19 insertions(+) (limited to 'src') diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index 9db279e005..81afe6c483 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -302,6 +302,24 @@ QDBusError &QDBusError::operator=(const QDBusError &other) return *this; } +/*! + \internal + Assignment operator from a QDBusMessage +*/ +QDBusError &QDBusError::operator=(const QDBusMessage &qdmsg) +{ + if (qdmsg.type() == QDBusMessage::ErrorMessage) { + code = ::get(qdmsg.errorName().toUtf8().constData()); + nm = qdmsg.errorName(); + msg = qdmsg.errorMessage(); + } else { + code =NoError; + nm.clear(); + msg.clear(); + } + return *this; +} + /*! Returns this error's ErrorType. diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index ed0bfaad9b..3057f88715 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -98,6 +98,7 @@ public: QDBusError(ErrorType error, const QString &message); QDBusError(const QDBusError &other); QDBusError &operator=(const QDBusError &other); + QDBusError &operator=(const QDBusMessage &msg); ErrorType type() const; QString name() const; -- cgit v1.2.3