From 651329adb5e64b18a005e900e1b9c5e95d70258c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 23 Jan 2015 13:09:03 +0400 Subject: 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/dbus/qdbusmessage.cpp | 4 ++++ src/dbus/qdbusmessage.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/dbus') 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() << 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; -- cgit v1.2.3