diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-01-23 13:09:03 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-13 16:29:25 +0000 |
| commit | 651329adb5e64b18a005e900e1b9c5e95d70258c (patch) | |
| tree | 94e8eace0a8e39390191eb37ddb4e5a89e434507 /src/dbus | |
| parent | 9b67d89c24666d405dd00e63bb56c924738aa002 (diff) | |
Pass params of shareable type by const-ref rather than by value
Instead of leaving a note for Qt6 and then forget to do
the actual change once again, change APIs now inside
QT_VERSION >= QT_VERSION_CHECK(6,0,0) blocks.
Change-Id: Ifa769904e304358a9c2accfd6c9f86eeb342f9dc
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusmessage.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 76afffaefd..491e1273e7 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -457,7 +457,11 @@ QDBusMessage QDBusMessage::createReply(const QVariantList &arguments) const Constructs a new DBus message representing an error reply message, with the given \a name and \a msg. */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +QDBusMessage QDBusMessage::createErrorReply(const QString &name, const QString &msg) const +#else QDBusMessage QDBusMessage::createErrorReply(const QString name, const QString &msg) const +#endif { QDBusMessage reply = QDBusMessage::createError(name, msg); if (d_ptr->msg) diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 6a3f4f4c8a..77f34ec5e2 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -79,7 +79,11 @@ public: inline QDBusMessage createReply(const QVariant &argument) const { return createReply(QList<QVariant>() << argument); } +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QDBusMessage createErrorReply(const QString &name, const QString &msg) const; +#else QDBusMessage createErrorReply(const QString name, const QString &msg) const; +#endif inline QDBusMessage createErrorReply(const QDBusError &err) const { return createErrorReply(err.name(), err.message()); } QDBusMessage createErrorReply(QDBusError::ErrorType type, const QString &msg) const; |