diff options
Diffstat (limited to 'src/dbus')
34 files changed, 344 insertions, 219 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 920a04315d..2cfd7e086c 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -9,11 +9,11 @@ qtConfig(dbus-linked) { } win32 { - LIBS_PRIVATE += \ - -lws2_32 \ - -ladvapi32 \ - -lnetapi32 \ - -luser32 + QMAKE_USE_PRIVATE += \ + advapi32 \ + netapi32 \ + user32 \ + ws2_32 } DEFINES += QT_NO_FOREACH diff --git a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp index be72220153..b64ea5cf21 100644 --- a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp +++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp @@ -186,7 +186,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, MyDictionary &myd argument.beginMap(); mydict.clear(); - while ( !argMap.atEnd() ) { + while ( !argument.atEnd() ) { int key; MyValue value; argument.beginMapEntry(); diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index f22696639d..1e2cbf6da6 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -41,6 +41,7 @@ #include <QtCore/qglobal.h> #if QT_CONFIG(library) #include <QtCore/qlibrary.h> +#include <QtCore/private/qlocking_p.h> #endif #include <QtCore/qmutex.h> @@ -80,7 +81,7 @@ bool qdbus_loadLibDBus() static bool triedToLoadLibrary = false; static QBasicMutex mutex; - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); QLibrary *&lib = qdbus_libdbus; if (triedToLoadLibrary) @@ -99,15 +100,15 @@ bool qdbus_loadLibDBus() }; lib->unload(); - for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) { - for (uint j = 0; j < sizeof(baseNames) / sizeof(baseNames[0]); ++j) { + for (const int majorversion : majorversions) { + for (const QString &baseName : baseNames) { #ifdef Q_OS_WIN QString suffix; - if (majorversions[i] != -1) - suffix = QString::number(- majorversions[i]); // negative so it prepends the dash - lib->setFileName(baseNames[j] + suffix); + if (majorversion != -1) + suffix = QString::number(- majorversion); // negative so it prepends the dash + lib->setFileName(baseName + suffix); #else - lib->setFileNameAndVersion(baseNames[j], majorversions[i]); + lib->setFileNameAndVersion(baseName, majorversion); #endif if (lib->load() && lib->resolve("dbus_connection_open_private")) return true; diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 148bd54147..87de784fc0 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -66,11 +66,11 @@ namespace { // of to QDBusAbstractInterface::customEvent. // See solution in Patch Set 1 of this change in the Qt Gerrit servers. // (https://codereview.qt-project.org/#/c/126384/1) -class DisconnectRelayEvent : public QMetaCallEvent +class DisconnectRelayEvent : public QAbstractMetaCallEvent { public: DisconnectRelayEvent(QObject *sender, const QMetaMethod &m) - : QMetaCallEvent(0, 0, nullptr, sender, m.methodIndex()) + : QAbstractMetaCallEvent(sender, m.methodIndex()) {} void placeMetaCall(QObject *object) override @@ -164,7 +164,7 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu "used to read property %s.%s", mp.typeName(), qPrintable(interface), mp.name()); lastError = QDBusError(QDBusError::Failed, - QString::fromLatin1("Unregistered type %1 cannot be handled") + QLatin1String("Unregistered type %1 cannot be handled") .arg(QLatin1String(mp.typeName()))); return false; } @@ -185,7 +185,7 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu if (reply.signature() != QLatin1String("v")) { QString errmsg = QLatin1String("Invalid signature `%1' in return from call to " DBUS_INTERFACE_PROPERTIES); - lastError = QDBusError(QDBusError::InvalidSignature, qMove(errmsg).arg(reply.signature())); + lastError = QDBusError(QDBusError::InvalidSignature, std::move(errmsg).arg(reply.signature())); return false; } @@ -220,15 +220,15 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu } // there was an error... - QString errmsg = QLatin1String("Unexpected `%1' (%2) when retrieving property `%3.%4' " - "(expected type `%5' (%6))"); + const auto errmsg = QLatin1String("Unexpected `%1' (%2) when retrieving property `%3.%4' " + "(expected type `%5' (%6))"); lastError = QDBusError(QDBusError::InvalidSignature, - errmsg.arg(QString::fromLatin1(foundType), - QString::fromLatin1(foundSignature), + errmsg.arg(QLatin1String(foundType), + QLatin1String(foundSignature), interface, - QString::fromUtf8(mp.name()), - QString::fromLatin1(mp.typeName()), - QString::fromLatin1(expectedSignature))); + QLatin1String(mp.name()), + QLatin1String(mp.typeName()), + QLatin1String(expectedSignature))); return false; } @@ -691,18 +691,20 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian } /*! - Calls the method \a method on this interface and passes the parameters to this function to the - method. + \fn QDBusAbstractInterface::call(const QString &message) + \internal +*/ + +/*! + \fn QDBusAbstractInterface::call(const QString &message, Args&&...args) + + Calls the method \a method on this interface and passes \a args to the method. + All \a args must be convertible to QVariant. The parameters to \c call are passed on to the remote function via D-Bus as input arguments. Output arguments are returned in the QDBusMessage reply. If the reply is an error reply, lastError() will also be set to the contents of the error message. - This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2, - \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8 - parameters or if you have a variable number of parameters to be passed, use - callWithArgumentList(). - It can be used the following way: \snippet code/src_qdbus_qdbusabstractinterface.cpp 0 @@ -710,6 +712,19 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian This example illustrates function calling with 0, 1 and 2 parameters and illustrates different parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array). + + \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments. + + \sa callWithArgumentList() +*/ + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + + This function exists for binary compatibility with Qt versions < 5.14. + Programs recompiled against Qt 5.14 will use the variadic template function + instead. */ QDBusMessage QDBusAbstractInterface::call(const QString &method, const QVariant &arg1, const QVariant &arg2, @@ -722,27 +737,44 @@ QDBusMessage QDBusAbstractInterface::call(const QString &method, const QVariant { return call(QDBus::AutoDetect, method, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); } +#endif + +/*! + \fn QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &message) + \internal +*/ /*! + \fn QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &message, Args&&...args) + \overload - Calls the method \a method on this interface and passes the - parameters to this function to the method. If \a mode is \c - NoWaitForReply, then this function will return immediately after + Calls the method \a method on this interface and passes \a args to the method. + All \a args must be convertible to QVariant. + + If \a mode is \c NoWaitForReply, then this function will return immediately after placing the call, without waiting for a reply from the remote method. Otherwise, \a mode indicates whether this function should activate the Qt Event Loop while waiting for the reply to arrive. - This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2, - \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8 - parameters or if you have a variable number of parameters to be passed, use - callWithArgumentList(). - If this function reenters the Qt event loop in order to wait for the reply, it will exclude user input. During the wait, it may deliver signals and other method calls to your application. Therefore, it must be prepared to handle a reentrancy whenever a call is placed with call(). + + \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments. + + \sa callWithArgumentList() +*/ + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + + This function exists for binary compatibility with Qt versions < 5.14. + Programs recompiled against Qt 5.14 will use the variadic template function + instead. */ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &method, const QVariant &arg1, @@ -787,22 +819,23 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m return callWithArgumentList(mode, method, argList); } +#endif // Qt 5 +/*! + \fn QDBusAbstractInterface::asyncCall(const QString &message) + \internal +*/ /*! - \since 4.5 - Calls the method \a method on this interface and passes the parameters to this function to the - method. + \fn QDBusAbstractInterface::asyncCall(const QString &message, Args&&...args) + + Calls the method \a method on this interface and passes \a args to the method. + All \a args must be convertible to QVariant. The parameters to \c call are passed on to the remote function via D-Bus as input arguments. The returned QDBusPendingCall object can be used to find out information about the reply. - This function can be used with up to 8 parameters, passed in arguments \a arg1, \a arg2, - \a arg3, \a arg4, \a arg5, \a arg6, \a arg7 and \a arg8. If you need more than 8 - parameters or if you have a variable number of parameters to be passed, use - asyncCallWithArgumentList(). - It can be used the following way: \snippet code/src_qdbus_qdbusabstractinterface.cpp 1 @@ -810,6 +843,19 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m This example illustrates function calling with 0, 1 and 2 parameters and illustrates different parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array). + + \note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments. + + \sa asyncCallWithArgumentList() +*/ + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal + + This function exists for binary compatibility with Qt versions < 5.14. + Programs recompiled against Qt 5.14 will use the variadic template function + instead. */ QDBusPendingCall QDBusAbstractInterface::asyncCall(const QString &method, const QVariant &arg1, const QVariant &arg2, @@ -853,6 +899,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCall(const QString &method, const return asyncCallWithArgumentList(method, argList); } +#endif // Qt 5 /*! \internal @@ -865,6 +912,24 @@ QDBusMessage QDBusAbstractInterface::internalConstCall(QDBus::CallMode mode, return const_cast<QDBusAbstractInterface*>(this)->callWithArgumentList(mode, method, args); } +QDBusMessage QDBusAbstractInterface::doCall(QDBus::CallMode mode, const QString &method, const QVariant *args, size_t numArgs) +{ + QList<QVariant> list; + list.reserve(int(numArgs)); + for (size_t i = 0; i < numArgs; ++i) + list.append(args[i]); + return callWithArgumentList(mode, method, list); +} + +QDBusPendingCall QDBusAbstractInterface::doAsyncCall(const QString &method, const QVariant *args, size_t numArgs) +{ + QList<QVariant> list; + list.reserve(int(numArgs)); + for (size_t i = 0; i < numArgs; ++i) + list.append(args[i]); + return asyncCallWithArgumentList(method, list); +} + QT_END_NAMESPACE #endif // QT_NO_DBUS diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index d6b0870787..4f4c7430a5 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -49,6 +49,7 @@ #include <QtDBus/qdbusmessage.h> #include <QtDBus/qdbusextratypes.h> #include <QtDBus/qdbusconnection.h> +#include <QtDBus/qdbuspendingcall.h> #ifdef interface #undef interface @@ -98,26 +99,52 @@ public: void setTimeout(int timeout); int timeout() const; + QDBusMessage call(const QString &method) + { + return doCall(QDBus::AutoDetect, method, nullptr, 0); + } + + template <typename...Args> + QDBusMessage call(const QString &method, Args &&...args) + { + const QVariant variants[] = { QVariant(std::forward<Args>(args))... }; + return doCall(QDBus::AutoDetect, method, variants, sizeof...(args)); + } + + QDBusMessage call(QDBus::CallMode mode, const QString &method) + { + return doCall(mode, method, nullptr, 0); + } + + template <typename...Args> + QDBusMessage call(QDBus::CallMode mode, const QString &method, Args &&...args) + { + const QVariant variants[] = { QVariant(std::forward<Args>(args))... }; + return doCall(mode, method, variants, sizeof...(args)); + } + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QDBusMessage call(const QString &method, - const QVariant &arg1 = QVariant(), - const QVariant &arg2 = QVariant(), - const QVariant &arg3 = QVariant(), - const QVariant &arg4 = QVariant(), - const QVariant &arg5 = QVariant(), - const QVariant &arg6 = QVariant(), - const QVariant &arg7 = QVariant(), - const QVariant &arg8 = QVariant()); + const QVariant &arg1, + const QVariant &arg2, + const QVariant &arg3, + const QVariant &arg4, + const QVariant &arg5, + const QVariant &arg6, + const QVariant &arg7, + const QVariant &arg8); QDBusMessage call(QDBus::CallMode mode, const QString &method, - const QVariant &arg1 = QVariant(), - const QVariant &arg2 = QVariant(), - const QVariant &arg3 = QVariant(), - const QVariant &arg4 = QVariant(), - const QVariant &arg5 = QVariant(), - const QVariant &arg6 = QVariant(), - const QVariant &arg7 = QVariant(), - const QVariant &arg8 = QVariant()); + const QVariant &arg1, + const QVariant &arg2, + const QVariant &arg3, + const QVariant &arg4, + const QVariant &arg5, + const QVariant &arg6, + const QVariant &arg7, + const QVariant &arg8); +#endif // Qt 5 QDBusMessage callWithArgumentList(QDBus::CallMode mode, const QString &method, @@ -130,15 +157,30 @@ public: const QList<QVariant> &args, QObject *receiver, const char *member); + QDBusPendingCall asyncCall(const QString &method) + { + return doAsyncCall(method, nullptr, 0); + } + + template <typename...Args> + QDBusPendingCall asyncCall(const QString &method, Args&&...args) + { + const QVariant variants[] = { QVariant(std::forward<Args>(args))... }; + return doAsyncCall(method, variants, sizeof...(args)); + } + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QDBusPendingCall asyncCall(const QString &method, - const QVariant &arg1 = QVariant(), - const QVariant &arg2 = QVariant(), - const QVariant &arg3 = QVariant(), - const QVariant &arg4 = QVariant(), - const QVariant &arg5 = QVariant(), - const QVariant &arg6 = QVariant(), - const QVariant &arg7 = QVariant(), - const QVariant &arg8 = QVariant()); + const QVariant &arg1, + const QVariant &arg2, + const QVariant &arg3, + const QVariant &arg4, + const QVariant &arg5, + const QVariant &arg6, + const QVariant &arg7, + const QVariant &arg8); +#endif // Qt 5 + QDBusPendingCall asyncCallWithArgumentList(const QString &method, const QList<QVariant> &args); @@ -156,6 +198,10 @@ protected: const QList<QVariant> &args = QList<QVariant>()) const; private: + QDBusMessage doCall(QDBus::CallMode mode, const QString &method, const QVariant *args, size_t numArgs); + QDBusPendingCall doAsyncCall(const QString &method, const QVariant *args, size_t numArgs); + +private: Q_DECLARE_PRIVATE(QDBusAbstractInterface) Q_PRIVATE_SLOT(d_func(), void _q_serviceOwnerChanged(QString,QString,QString)) }; diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 2d1373006d..764bc24165 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -111,7 +111,7 @@ bool QDBusArgumentPrivate::checkWrite(QDBusArgumentPrivate *&d) if (!d->marshaller()->ok) return false; - if (d->message && d->ref.load() != 1) { + if (d->message && d->ref.loadRelaxed() != 1) { QDBusMarshaller *dd = new QDBusMarshaller(d->capabilities); dd->message = q_dbus_message_copy(d->message); q_dbus_message_iter_init_append(dd->message, &dd->iterator); @@ -152,7 +152,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) if (!checkRead(d)) return false; // don't bother - if (d->ref.load() == 1) + if (d->ref.loadRelaxed() == 1) return true; // no need to detach QDBusDemarshaller *dd = new QDBusDemarshaller(d->capabilities); diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 94a89a4e08..b7cd4c8989 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -76,14 +76,12 @@ public: QDBusArgument(); QDBusArgument(const QDBusArgument &other); -#ifdef Q_COMPILER_RVALUE_REFS - QDBusArgument(QDBusArgument &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; } - QDBusArgument &operator=(QDBusArgument &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusArgument(QDBusArgument &&other) noexcept : d(other.d) { other.d = nullptr; } + QDBusArgument &operator=(QDBusArgument &&other) noexcept { swap(other); return *this; } QDBusArgument &operator=(const QDBusArgument &other); ~QDBusArgument(); - void swap(QDBusArgument &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QDBusArgument &other) noexcept { qSwap(d, other.d); } // used for marshalling (Qt -> D-BUS) QDBusArgument &operator<<(uchar arg); diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index b678b9606f..3553d3d151 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -71,7 +71,7 @@ class QDBusArgumentPrivate { public: inline QDBusArgumentPrivate(int flags = 0) - : message(0), ref(1), capabilities(flags) + : message(nullptr), ref(1), capabilities(flags) { } virtual ~QDBusArgumentPrivate(); @@ -104,7 +104,7 @@ public: class QDBusMarshaller: public QDBusArgumentPrivate { public: - QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0), ba(0), closeCode(0), ok(true), skipSignature(false) + QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr), ba(nullptr), closeCode(0), ok(true), skipSignature(false) { direction = Marshalling; } ~QDBusMarshaller(); @@ -161,7 +161,7 @@ private: class QDBusDemarshaller: public QDBusArgumentPrivate { public: - inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0) + inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr) { direction = Demarshalling; } ~QDBusDemarshaller(); diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 296d5b369f..d6f3230fd2 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -47,6 +47,7 @@ #include <qvector.h> #include <qtimer.h> #include <qthread.h> +#include <QtCore/private/qlocking_p.h> #include "qdbusconnectioninterface.h" #include "qdbuserror.h" @@ -106,7 +107,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::busConnection(QDBusConnection::B // (the event loop will resume delivery) bool suspendedDelivery = qApp && qApp->thread() == QThread::currentThread(); - QMutexLocker lock(&defaultBusMutex); + const auto locker = qt_scoped_lock(defaultBusMutex); if (defaultBuses[type]) return defaultBuses[type]; @@ -178,7 +179,7 @@ void QDBusConnectionManager::run() exec(); // cleanup: - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); for (QHash<QString, QDBusConnectionPrivate *>::const_iterator it = connectionHash.constBegin(); it != connectionHash.constEnd(); ++it) { QDBusConnectionPrivate *d = it.value(); @@ -240,7 +241,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::connectToPeer(const QString &add void QDBusConnectionManager::executeConnectionRequest(QDBusConnectionManager::ConnectionRequestData *data) { - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); const QString &name = *data->name; QDBusConnectionPrivate *&d = data->result; @@ -428,7 +429,7 @@ QDBusConnection::QDBusConnection(const QString &name) if (name.isEmpty() || _q_manager.isDestroyed()) { d = 0; } else { - QMutexLocker locker(&_q_manager()->mutex); + const auto locker = qt_scoped_lock(_q_manager()->mutex); d = _q_manager()->connection(name); if (d) d->ref.ref(); @@ -537,7 +538,7 @@ QDBusConnection QDBusConnection::connectToPeer(const QString &address, void QDBusConnection::disconnectFromBus(const QString &name) { if (_q_manager()) { - QMutexLocker locker(&_q_manager()->mutex); + const auto locker = qt_scoped_lock(_q_manager()->mutex); QDBusConnectionPrivate *d = _q_manager()->connection(name); if (d && d->mode != QDBusConnectionPrivate::ClientMode) return; @@ -558,7 +559,7 @@ void QDBusConnection::disconnectFromBus(const QString &name) void QDBusConnection::disconnectFromPeer(const QString &name) { if (_q_manager()) { - QMutexLocker locker(&_q_manager()->mutex); + const auto locker = qt_scoped_lock(_q_manager()->mutex); QDBusConnectionPrivate *d = _q_manager()->connection(name); if (d && d->mode != QDBusConnectionPrivate::PeerMode) return; diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 3711981f78..368f811602 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -131,14 +131,12 @@ public: explicit QDBusConnection(const QString &name); QDBusConnection(const QDBusConnection &other); -#ifdef Q_COMPILER_RVALUE_REFS - QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; } - QDBusConnection &operator=(QDBusConnection &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusConnection(QDBusConnection &&other) noexcept : d(other.d) { other.d = nullptr; } + QDBusConnection &operator=(QDBusConnection &&other) noexcept { swap(other); return *this; } QDBusConnection &operator=(const QDBusConnection &other); ~QDBusConnection(); - void swap(QDBusConnection &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QDBusConnection &other) noexcept { qSwap(d, other.d); } bool isConnected() const; QString baseService() const; diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 7769b9ea71..da67a6c5d4 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -115,7 +115,7 @@ public: struct Watcher { - Watcher(): watch(0), read(0), write(0) {} + Watcher(): watch(nullptr), read(nullptr), write(nullptr) {} DBusWatch *watch; QSocketNotifier *read; QSocketNotifier *write; @@ -132,7 +132,7 @@ public: struct SignalHook { - inline SignalHook() : obj(0), midx(-1) { } + inline SignalHook() : obj(nullptr), midx(-1) { } QString service, path, signature; QObject* obj; int midx; @@ -150,9 +150,9 @@ public: { typedef QVector<ObjectTreeNode> DataList; - inline ObjectTreeNode() : obj(0), flags(0) { } + inline ObjectTreeNode() : obj(nullptr), flags(0) { } inline ObjectTreeNode(const QString &n) // intentionally implicit - : name(n), obj(0), flags(0) { } + : name(n), obj(nullptr), flags(0) { } inline bool operator<(const QString &other) const { return name < other; } inline bool operator<(const QStringRef &other) const @@ -194,7 +194,7 @@ public: public: // public methods are entry points from other objects - explicit QDBusConnectionPrivate(QObject *parent = 0); + explicit QDBusConnectionPrivate(QObject *parent = nullptr); ~QDBusConnectionPrivate(); void createBusService(); diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index ebb3803489..a2335a1795 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -199,6 +199,18 @@ QDBusReply<QStringList> QDBusConnectionInterface::registeredServiceNames() const } /*! + \property QDBusConnectionInterface::activatableServiceNames + \brief holds the activatable service names + \since 5.14 + + Lists all names that can be activated on the bus. +*/ +QDBusReply<QStringList> QDBusConnectionInterface::activatableServiceNames() const +{ + return internalConstCall(QDBus::AutoDetect, QLatin1String("ListActivatableNames")); +} + +/*! Returns \c true if the service name \a serviceName has is currently registered. */ diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index c7b1573722..d19e116c53 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -68,6 +68,7 @@ class Q_DBUS_EXPORT QDBusConnectionInterface: public QDBusAbstractInterface ~QDBusConnectionInterface(); Q_PROPERTY(QDBusReply<QStringList> registeredServiceNames READ registeredServiceNames) + Q_PROPERTY(QDBusReply<QStringList> activatableServiceNames READ activatableServiceNames) public: enum ServiceQueueOptions { @@ -90,6 +91,7 @@ public: public Q_SLOTS: QDBusReply<QStringList> registeredServiceNames() const; + QDBusReply<QStringList> activatableServiceNames() const; QDBusReply<bool> isServiceRegistered(const QString &serviceName) const; QDBusReply<QString> serviceOwner(const QString &name) const; QDBusReply<bool> unregisterService(const QString &serviceName); diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index c264f62b7d..312bac71de 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -41,6 +41,7 @@ #define QDBUSERROR_H #include <QtDBus/qtdbusglobal.h> +#include <QtCore/qobjectdefs.h> #include <QtCore/qstring.h> #ifndef QT_NO_DBUS @@ -54,6 +55,7 @@ class QDBusMessage; class Q_DBUS_EXPORT QDBusError { + Q_GADGET public: enum ErrorType { NoError = 0, @@ -90,6 +92,7 @@ public: LastErrorType = InvalidMember #endif }; + Q_ENUM(ErrorType) QDBusError(); #ifndef QT_BOOTSTRAPPED @@ -98,18 +101,16 @@ public: #endif QDBusError(ErrorType error, const QString &message); QDBusError(const QDBusError &other); -#ifdef Q_COMPILER_RVALUE_REFS - QDBusError(QDBusError &&other) Q_DECL_NOTHROW + QDBusError(QDBusError &&other) noexcept : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm)) {} - QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusError &operator=(QDBusError &&other) noexcept { swap(other); return *this; } QDBusError &operator=(const QDBusError &other); #ifndef QT_BOOTSTRAPPED QDBusError &operator=(const QDBusMessage &msg); #endif - void swap(QDBusError &other) Q_DECL_NOTHROW + void swap(QDBusError &other) noexcept { qSwap(code, other.code); qSwap(msg, other.msg); diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index a0b121a1a3..06fbd6062e 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -167,6 +167,14 @@ void QDBusSignature::doCheck() */ /*! + \since 5.14 + + Implicit cast to QVariant. Equivalent to calling + QVariant::fromValue() with this object as argument. +*/ +QDBusObjectPath::operator QVariant() const { return QVariant::fromValue(*this); } + +/*! \class QDBusSignature \inmodule QtDBus \since 4.2 diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 12961e2702..6bb12ffe49 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -54,29 +54,28 @@ QT_BEGIN_NAMESPACE - class Q_DBUS_EXPORT QDBusObjectPath { QString m_path; public: - QDBusObjectPath() Q_DECL_NOTHROW : m_path() {} + QDBusObjectPath() noexcept : m_path() {} // compiler-generated copy/move constructor/assignment operators are ok! // compiler-generated destructor is ok! inline explicit QDBusObjectPath(const char *path); inline explicit QDBusObjectPath(QLatin1String path); inline explicit QDBusObjectPath(const QString &path); -#ifdef Q_COMPILER_RVALUE_REFS explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); } -#endif - void swap(QDBusObjectPath &other) Q_DECL_NOTHROW { qSwap(m_path, other.m_path); } + void swap(QDBusObjectPath &other) noexcept { qSwap(m_path, other.m_path); } inline void setPath(const QString &path); inline QString path() const { return m_path; } + operator QVariant() const; + private: void doCheck(); }; @@ -114,18 +113,16 @@ class Q_DBUS_EXPORT QDBusSignature { QString m_signature; public: - QDBusSignature() Q_DECL_NOTHROW : m_signature() {} + QDBusSignature() noexcept : m_signature() {} // compiler-generated copy/move constructor/assignment operators are ok! // compiler-generated destructor is ok! inline explicit QDBusSignature(const char *signature); inline explicit QDBusSignature(QLatin1String signature); inline explicit QDBusSignature(const QString &signature); -#ifdef Q_COMPILER_RVALUE_REFS explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); } -#endif - void swap(QDBusSignature &other) Q_DECL_NOTHROW { qSwap(m_signature, other.m_signature); } + void swap(QDBusSignature &other) noexcept { qSwap(m_signature, other.m_signature); } inline void setSignature(const QString &signature); @@ -168,16 +165,14 @@ class QDBusVariant { QVariant m_variant; public: - QDBusVariant() Q_DECL_NOTHROW : m_variant() {} + QDBusVariant() noexcept : m_variant() {} // compiler-generated copy/move constructor/assignment operators are ok! // compiler-generated destructor is ok! inline explicit QDBusVariant(const QVariant &variant); -#ifdef Q_COMPILER_RVALUE_REFS - explicit QDBusVariant(QVariant &&v) Q_DECL_NOTHROW : m_variant(std::move(v)) {} -#endif + explicit QDBusVariant(QVariant &&v) noexcept : m_variant(std::move(v)) {} - void swap(QDBusVariant &other) Q_DECL_NOTHROW { qSwap(m_variant, other.m_variant); } + void swap(QDBusVariant &other) noexcept { qSwap(m_variant, other.m_variant); } inline void setVariant(const QVariant &variant); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 1125480447..4c27a93382 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -49,6 +49,7 @@ #include <qstringlist.h> #include <qtimer.h> #include <qthread.h> +#include <private/qlocking_p.h> #include "qdbusargument.h" #include "qdbusconnection_p.h" @@ -304,7 +305,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v q_dbus_connection_set_allow_anonymous(connection, true); QDBusConnectionPrivate *newConnection = new QDBusConnectionPrivate(serverConnection->parent()); - QMutexLocker locker(&QDBusConnectionManager::instance()->mutex); + const auto locker = qt_scoped_lock(QDBusConnectionManager::instance()->mutex); QDBusConnectionManager::instance()->setConnection(QLatin1String("QDBusServer-") + QString::number(reinterpret_cast<qulonglong>(newConnection), 16), newConnection); serverConnection->serverConnectionNames << newConnection->name; @@ -340,8 +341,9 @@ static QByteArray buildMatchRule(const QString &service, const QString &objectPath, const QString &interface, const QString &member, const QDBusConnectionPrivate::ArgMatchRules &argMatch, const QString & /*signature*/) { - QString result = QLatin1String("type='signal',"); - QString keyValue = QLatin1String("%1='%2',"); + QString result; + result += QLatin1String("type='signal',"); + const auto keyValue = QLatin1String("%1='%2',"); if (!service.isEmpty()) result += keyValue.arg(QLatin1String("sender"), service); @@ -354,13 +356,13 @@ static QByteArray buildMatchRule(const QString &service, // add the argument string-matching now if (!argMatch.args.isEmpty()) { - keyValue = QLatin1String("arg%1='%2',"); + const QString keyValue = QLatin1String("arg%1='%2',"); for (int i = 0; i < argMatch.args.count(); ++i) if (!argMatch.args.at(i).isNull()) result += keyValue.arg(i).arg(argMatch.args.at(i)); } if (!argMatch.arg0namespace.isEmpty()) { - result += QStringLiteral("arg0namespace='%1',").arg(argMatch.arg0namespace); + result += QLatin1String("arg0namespace='%1',").arg(argMatch.arg0namespace); } result.chop(1); // remove ending comma @@ -534,7 +536,7 @@ qDBusSignalFilter(DBusConnection *connection, DBusMessage *message, void *data) bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg) { - if (!ref.load()) + if (!ref.loadRelaxed()) return false; // local message are always delivered, regardless of filtering @@ -1077,7 +1079,7 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate() if (lastMode == ClientMode || lastMode == PeerMode) { // the bus service object holds a reference back to us; // we need to destroy it before we finish destroying ourselves - Q_ASSERT(ref.load() == 0); + Q_ASSERT(ref.loadRelaxed() == 0); QObject *obj = (QObject *)busService; if (obj) { disconnect(obj, nullptr, this, nullptr); @@ -1196,7 +1198,7 @@ void QDBusConnectionPrivate::doDispatch() PendingMessageList::Iterator end = pendingMessages.end(); for ( ; it != end; ++it) { qDBusDebug() << this << "dequeueing message" << *it; - handleMessage(qMove(*it)); + handleMessage(std::move(*it)); } pendingMessages.clear(); } @@ -1330,8 +1332,6 @@ bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hoo hook.midx = findSlot(receiver, normalizedName, hook.params); } if (hook.midx < minMIdx) { - if (hook.midx == -1) - {} return false; } @@ -1371,19 +1371,19 @@ void QDBusConnectionPrivate::sendError(const QDBusMessage &msg, QDBusError::Erro if (msg.interface().isEmpty()) interfaceMsg = QLatin1String("any interface"); else - interfaceMsg = QString::fromLatin1("interface '%1'").arg(msg.interface()); + interfaceMsg = QLatin1String("interface '%1'").arg(msg.interface()); send(msg.createErrorReply(code, - QString::fromLatin1("No such method '%1' in %2 at object path '%3' " - "(signature '%4')") + QLatin1String("No such method '%1' in %2 at object path '%3' " + "(signature '%4')") .arg(msg.member(), interfaceMsg, msg.path(), msg.signature()))); } else if (code == QDBusError::UnknownInterface) { send(msg.createErrorReply(QDBusError::UnknownInterface, - QString::fromLatin1("No such interface '%1' at object path '%2'") + QLatin1String("No such interface '%1' at object path '%2'") .arg(msg.interface(), msg.path()))); } else if (code == QDBusError::UnknownObject) { send(msg.createErrorReply(QDBusError::UnknownObject, - QString::fromLatin1("No such object path '%1'").arg(msg.path()))); + QLatin1String("No such object path '%1'").arg(msg.path()))); } } @@ -1553,8 +1553,8 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg) objThread = result.obj->thread(); if (!objThread) { send(msg.createErrorReply(QDBusError::InternalError, - QString::fromLatin1("Object '%1' (at path '%2')" - " has no thread. Cannot deliver message.") + QLatin1String("Object '%1' (at path '%2')" + " has no thread. Cannot deliver message.") .arg(result.obj->objectName(), msg.path()))); return; } @@ -1863,7 +1863,7 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) { QDBusConnectionPrivate *connection = const_cast<QDBusConnectionPrivate *>(call->connection); - QMutexLocker locker(&call->mutex); + auto locker = qt_unique_lock(call->mutex); connection->pendingCalls.removeOne(call); @@ -1980,7 +1980,7 @@ public: #endif static bool initializedAmounts = false; static QBasicMutex initializeMutex; - QMutexLocker locker(&initializeMutex); + auto locker = qt_unique_lock(initializeMutex); if (!initializedAmounts) { int tmp = 0; @@ -2084,7 +2084,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReplyLocal(const QDBusMessage &mess if (interface.isEmpty()) interface = QLatin1String("<no-interface>"); return QDBusMessage::createError(QDBusError::InternalError, - QString::fromLatin1("Internal error trying to call %1.%2 at %3 (signature '%4'") + QLatin1String("Internal error trying to call %1.%2 at %3 (signature '%4'") .arg(interface, message.member(), message.path(), message.signature())); } @@ -2128,11 +2128,11 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM if ((receiver && returnMethod) || errorMethod) { // no one waiting, will delete pcall in processFinishedCall() - pcall->ref.store(1); + pcall->ref.storeRelaxed(1); } else { // set double ref to prevent race between processFinishedCall() and ref counting // by QDBusPendingCall::QExplicitlySharedDataPointer<QDBusPendingCallPrivate> - pcall->ref.store(2); + pcall->ref.storeRelaxed(2); } if (isLoopback) { diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 3cd029a933..87db910d25 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -86,7 +86,7 @@ struct QDBusSlotCache int slotIdx; QVector<int> metaTypes; - void swap(Data &other) Q_DECL_NOTHROW + void swap(Data &other) noexcept { qSwap(flags, other.flags); qSwap(slotIdx, other.slotIdx); @@ -96,41 +96,42 @@ struct QDBusSlotCache typedef QMultiHash<QString, Data> Hash; Hash hash; - void swap(QDBusSlotCache &other) Q_DECL_NOTHROW { qSwap(hash, other.hash); } + void swap(QDBusSlotCache &other) noexcept { qSwap(hash, other.hash); } }; Q_DECLARE_SHARED(QDBusSlotCache::Data) Q_DECLARE_SHARED(QDBusSlotCache) -class QDBusCallDeliveryEvent: public QMetaCallEvent +class QDBusCallDeliveryEvent: public QAbstractMetaCallEvent { public: QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender, const QDBusMessage &msg, const QVector<int> &types, int f = 0) - : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) + : QAbstractMetaCallEvent(sender, -1), connection(c), message(msg), metaTypes(types), id(id), flags(f) { } void placeMetaCall(QObject *object) override { - QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); + QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id); } private: QDBusConnection connection; // just for refcounting QDBusMessage message; QVector<int> metaTypes; + int id; int flags; }; -class QDBusActivateObjectEvent: public QMetaCallEvent +class QDBusActivateObjectEvent: public QAbstractMetaCallEvent { public: QDBusActivateObjectEvent(const QDBusConnection &c, QObject *sender, const QDBusConnectionPrivate::ObjectTreeNode &n, - int p, const QDBusMessage &m, QSemaphore *s = 0) - : QMetaCallEvent(0, ushort(-1), 0, sender, -1, 0, 0, 0, s), connection(c), node(n), + int p, const QDBusMessage &m, QSemaphore *s = nullptr) + : QAbstractMetaCallEvent(sender, -1, s), connection(c), node(n), pathStartPos(p), message(m), handled(false) { } - ~QDBusActivateObjectEvent(); + ~QDBusActivateObjectEvent() override; void placeMetaCall(QObject *) override; @@ -142,15 +143,15 @@ private: bool handled; }; -class QDBusSpyCallEvent : public QMetaCallEvent +class QDBusSpyCallEvent : public QAbstractMetaCallEvent { public: typedef void (*Hook)(const QDBusMessage&); QDBusSpyCallEvent(QDBusConnectionPrivate *cp, const QDBusConnection &c, const QDBusMessage &msg, const Hook *hooks, int count) - : QMetaCallEvent(0, 0, nullptr, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) + : QAbstractMetaCallEvent(cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) {} - ~QDBusSpyCallEvent(); + ~QDBusSpyCallEvent() override; void placeMetaCall(QObject *) override; static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount); diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 0ef5061b5f..edee4fc1e5 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -203,7 +203,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node static inline QDBusMessage interfaceNotFoundError(const QDBusMessage &msg, const QString &interface_name) { return msg.createErrorReply(QDBusError::UnknownInterface, - QString::fromLatin1("Interface %1 was not found in object %2") + QLatin1String("Interface %1 was not found in object %2") .arg(interface_name, msg.path())); } @@ -211,10 +211,10 @@ static inline QDBusMessage propertyNotFoundError(const QDBusMessage &msg, const QString &interface_name, const QByteArray &property_name) { return msg.createErrorReply(QDBusError::UnknownProperty, - QString::fromLatin1("Property %1%2%3 was not found in object %4") + QLatin1String("Property %1%2%3 was not found in object %4") .arg(interface_name, - QString::fromLatin1(interface_name.isEmpty() ? "" : "."), - QString::fromLatin1(property_name), + QLatin1String(interface_name.isEmpty() ? "" : "."), + QLatin1String(property_name), msg.path())); } @@ -302,16 +302,16 @@ static QDBusMessage propertyWriteReply(const QDBusMessage &msg, const QString &i return propertyNotFoundError(msg, interface_name, property_name); case PropertyTypeMismatch: return msg.createErrorReply(QDBusError::InvalidArgs, - QString::fromLatin1("Invalid arguments for writing to property %1%2%3") + QLatin1String("Invalid arguments for writing to property %1%2%3") .arg(interface_name, - QString::fromLatin1(interface_name.isEmpty() ? "" : "."), - QString::fromLatin1(property_name))); + QLatin1String(interface_name.isEmpty() ? "" : "."), + QLatin1String(property_name))); case PropertyReadOnly: return msg.createErrorReply(QDBusError::PropertyReadOnly, - QString::fromLatin1("Property %1%2%3 is read-only") + QLatin1String("Property %1%2%3 is read-only") .arg(interface_name, - QString::fromLatin1(interface_name.isEmpty() ? "" : "."), - QString::fromLatin1(property_name))); + QLatin1String(interface_name.isEmpty() ? "" : "."), + QLatin1String(property_name))); case PropertyWriteFailed: return msg.createErrorReply(QDBusError::InternalError, QString::fromLatin1("Internal error")); diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 4ea6cefff6..8e0b3e4598 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -211,7 +211,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", QMetaType::typeName(id), id); - error(QString::fromLatin1("Unregistered type %1 passed in arguments") + error(QLatin1String("Unregistered type %1 passed in arguments") .arg(QLatin1String(QMetaType::typeName(id)))); return false; } @@ -253,7 +253,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginArray(int id) qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", QMetaType::typeName(id), id); - error(QString::fromLatin1("Unregistered type %1 passed in arguments") + error(QLatin1String("Unregistered type %1 passed in arguments") .arg(QLatin1String(QMetaType::typeName(id)))); return this; } @@ -268,14 +268,14 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid) qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", QMetaType::typeName(kid), kid); - error(QString::fromLatin1("Unregistered type %1 passed in arguments") + error(QLatin1String("Unregistered type %1 passed in arguments") .arg(QLatin1String(QMetaType::typeName(kid)))); return this; } if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) { qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-BUS map.", QMetaType::typeName(kid), kid); - error(QString::fromLatin1("Type %1 passed in arguments cannot be used as a key in a map") + error(QLatin1String("Type %1 passed in arguments cannot be used as a key in a map") .arg(QLatin1String(QMetaType::typeName(kid)))); return this; } @@ -286,7 +286,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid) qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", typeName, vid); - error(QString::fromLatin1("Unregistered type %1 passed in arguments") + error(QLatin1String("Unregistered type %1 passed in arguments") .arg(QLatin1String(typeName))); return this; } @@ -417,7 +417,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", QMetaType::typeName(id), id); - error(QString::fromLatin1("Unregistered type %1 passed in arguments") + error(QLatin1String("Unregistered type %1 passed in arguments") .arg(QLatin1String(QMetaType::typeName(id)))); return false; } diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 23e04045d8..41845317c4 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -68,13 +68,11 @@ public: QDBusMessage(); QDBusMessage(const QDBusMessage &other); -#ifdef Q_COMPILER_RVALUE_REFS - QDBusMessage &operator=(QDBusMessage &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusMessage &operator=(QDBusMessage &&other) noexcept { swap(other); return *this; } QDBusMessage &operator=(const QDBusMessage &other); ~QDBusMessage(); - void swap(QDBusMessage &other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); } + void swap(QDBusMessage &other) noexcept { qSwap(d_ptr, other.d_ptr); } static QDBusMessage createSignal(const QString &path, const QString &interface, const QString &name); diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index c4296f5c55..806cf7b415 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -649,7 +649,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con // mark as an error error = QDBusError(QDBusError::UnknownInterface, - QString::fromLatin1("Interface '%1' was not found") + QLatin1String("Interface '%1' was not found") .arg(interface)); return 0; } diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index 0729a3cbbb..58ce4f8930 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -93,7 +93,7 @@ void QDBusMetaTypeId::init() // reentrancy is not a problem since everything else is locked on their own // set the guard variable at the end - if (!initialized.load()) { + if (!initialized.loadRelaxed()) { // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly) (void)message(); (void)argument(); @@ -145,7 +145,7 @@ void QDBusMetaTypeId::init() qDBusRegisterMetaType<QVector<QDBusUnixFileDescriptor> >(); #endif - initialized.store(true); + initialized.storeRelaxed(true); } } diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 4d0131afff..8e604d5a77 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -47,6 +47,7 @@ #include "qcoreapplication.h" #include "qcoreevent.h" #include <private/qobject_p.h> +#include <private/qlocking_p.h> #ifndef QT_NO_DBUS @@ -221,8 +222,8 @@ void QDBusPendingCallPrivate::checkReceivedSignature() // can't use startsWith here because a null string doesn't start or end with an empty string if (replyMessage.signature().indexOf(expectedReplySignature) != 0) { - QString errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", " - "expected \"%2\""); + const auto errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", " + "expected \"%2\""); replyMessage = QDBusMessage::createError( QDBusError::InvalidSignature, errorMsg.arg(replyMessage.signature(), expectedReplySignature)); @@ -232,7 +233,7 @@ void QDBusPendingCallPrivate::checkReceivedSignature() void QDBusPendingCallPrivate::waitForFinished() { - QMutexLocker locker(&mutex); + const auto locker = qt_scoped_lock(mutex); if (replyMessage.type() != QDBusMessage::InvalidMessage) return; // already finished @@ -330,7 +331,7 @@ bool QDBusPendingCall::isFinished() const if (!d) return true; // considered finished - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() != QDBusMessage::InvalidMessage; } @@ -352,7 +353,7 @@ bool QDBusPendingCall::isValid() const { if (!d) return false; - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() == QDBusMessage::ReplyMessage; } @@ -369,7 +370,7 @@ bool QDBusPendingCall::isError() const { if (!d) return true; // considered finished and an error - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage.type() == QDBusMessage::ErrorMessage; } @@ -384,7 +385,7 @@ bool QDBusPendingCall::isError() const QDBusError QDBusPendingCall::error() const { if (d) { - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return QDBusError(d->replyMessage); } @@ -409,7 +410,7 @@ QDBusMessage QDBusPendingCall::reply() const { if (!d) return QDBusMessage::createError(error()); - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); return d->replyMessage; } @@ -473,7 +474,7 @@ QDBusPendingCall QDBusPendingCall::fromCompletedCall(const QDBusMessage &msg) msg.type() == QDBusMessage::ReplyMessage) { d = new QDBusPendingCallPrivate(QDBusMessage(), 0); d->replyMessage = msg; - d->ref.store(1); + d->ref.storeRelaxed(1); } return QDBusPendingCall(d); @@ -503,7 +504,7 @@ QDBusPendingCallWatcher::QDBusPendingCallWatcher(const QDBusPendingCall &call, Q : QObject(*new QDBusPendingCallWatcherPrivate, parent), QDBusPendingCall(call) { if (d) { // QDBusPendingCall::d - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); if (!d->watcherHelper) { d->watcherHelper = new QDBusPendingCallWatcherHelper; if (d->replyMessage.type() != QDBusMessage::InvalidMessage) { diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 24b1d6a7ca..dd99346301 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -60,12 +60,10 @@ class Q_DBUS_EXPORT QDBusPendingCall public: QDBusPendingCall(const QDBusPendingCall &other); ~QDBusPendingCall(); -#ifdef Q_COMPILER_RVALUE_REFS - QDBusPendingCall &operator=(QDBusPendingCall &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusPendingCall &operator=(QDBusPendingCall &&other) noexcept { swap(other); return *this; } QDBusPendingCall &operator=(const QDBusPendingCall &other); - void swap(QDBusPendingCall &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QDBusPendingCall &other) noexcept { qSwap(d, other.d); } #ifndef Q_CLANG_QDOC // pretend that they aren't here diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h index 10f189ae43..e1f6240f3e 100644 --- a/src/dbus/qdbuspendingcall_p.h +++ b/src/dbus/qdbuspendingcall_p.h @@ -99,7 +99,7 @@ public: // } QDBusPendingCallPrivate(const QDBusMessage &sent, QDBusConnectionPrivate *connection) - : sentMessage(sent), connection(connection), watcherHelper(0), pending(0) + : sentMessage(sent), connection(connection), watcherHelper(nullptr), pending(nullptr) { } ~QDBusPendingCallPrivate(); bool setReplyCallback(QObject *target, const char *member); diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp index 6aec571563..ec49bafb60 100644 --- a/src/dbus/qdbuspendingreply.cpp +++ b/src/dbus/qdbuspendingreply.cpp @@ -42,6 +42,8 @@ #include "qdbuspendingcall_p.h" #include "qdbusmetatype.h" +#include <QtCore/private/qlocking_p.h> + #ifndef QT_NO_DBUS /*! @@ -277,7 +279,7 @@ QVariant QDBusPendingReplyData::argumentAt(int index) const void QDBusPendingReplyData::setMetaTypes(int count, const int *types) { Q_ASSERT(d); - QMutexLocker locker(&d->mutex); + const auto locker = qt_scoped_lock(d->mutex); d->setMetaTypes(count, types); d->checkReceivedSignature(); } diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index bc5cd92c84..1d7e60ad7f 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -156,7 +156,7 @@ public: { Q_STATIC_ASSERT_X(Index >= 0 && Index < Count, "Index out of bounds"); typedef typename Select<Index>::Type ResultType; - return qdbus_cast<ResultType>(argumentAt(Index), 0); + return qdbus_cast<ResultType>(argumentAt(Index), nullptr); } #endif diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp index 6abfaf174c..cf1a70508c 100644 --- a/src/dbus/qdbusreply.cpp +++ b/src/dbus/qdbusreply.cpp @@ -228,14 +228,14 @@ void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data receivedSignature = "<empty signature>"; QString errorMsg; if (receivedType) { - errorMsg = QString::fromLatin1("Unexpected reply signature: got \"%1\" (%4), " + errorMsg = QLatin1String("Unexpected reply signature: got \"%1\" (%4), " "expected \"%2\" (%3)") .arg(QLatin1String(receivedSignature), QLatin1String(expectedSignature), QLatin1String(data.typeName()), QLatin1String(receivedType)); } else { - errorMsg = QString::fromLatin1("Unexpected reply signature: got \"%1\", " + errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", " "expected \"%2\" (%3)") .arg(QLatin1String(receivedSignature), QLatin1String(expectedSignature), diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 3ac5c794e1..eccffc3d3e 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -43,6 +43,8 @@ #include "qdbusconnectionmanager_p.h" #include "qdbusutil_p.h" +#include <QtCore/private/qlocking_p.h> + #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE @@ -121,7 +123,7 @@ QDBusServer::~QDBusServer() locker.unlock(); } d->serverObject = nullptr; - d->ref.store(0); + d->ref.storeRelaxed(0); d->deleteLater(); } diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index 459cfc6c66..73d1db2680 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -208,7 +208,7 @@ QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor() */ bool QDBusUnixFileDescriptor::isValid() const { - return d ? d->fd.load() != -1 : false; + return d ? d->fd.loadRelaxed() != -1 : false; } /*! @@ -226,7 +226,7 @@ bool QDBusUnixFileDescriptor::isValid() const */ int QDBusUnixFileDescriptor::fileDescriptor() const { - return d ? d->fd.load() : -1; + return d ? d->fd.loadRelaxed() : -1; } // actual implementation @@ -283,12 +283,12 @@ void QDBusUnixFileDescriptor::giveFileDescriptor(int fileDescriptor) else d = new QDBusUnixFileDescriptorPrivate; - const int fdl = d->fd.load(); + const int fdl = d->fd.loadRelaxed(); if (fdl != -1) qt_safe_close(fdl); if (fileDescriptor != -1) - d->fd.store(fileDescriptor); + d->fd.storeRelaxed(fileDescriptor); } /*! @@ -309,7 +309,7 @@ int QDBusUnixFileDescriptor::takeFileDescriptor() QDBusUnixFileDescriptorPrivate::~QDBusUnixFileDescriptorPrivate() { - const int fdl = fd.load(); + const int fdl = fd.loadRelaxed(); if (fdl != -1) qt_safe_close(fdl); } diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index ed3209ceda..fcd73b2ec5 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -46,9 +46,7 @@ #ifndef QT_NO_DBUS -#ifdef Q_COMPILER_RVALUE_REFS -# include <utility> -#endif +#include <utility> QT_BEGIN_NAMESPACE @@ -61,13 +59,11 @@ public: QDBusUnixFileDescriptor(); explicit QDBusUnixFileDescriptor(int fileDescriptor); QDBusUnixFileDescriptor(const QDBusUnixFileDescriptor &other); -#if defined(Q_COMPILER_RVALUE_REFS) - QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) noexcept { swap(other); return *this; } QDBusUnixFileDescriptor &operator=(const QDBusUnixFileDescriptor &other); ~QDBusUnixFileDescriptor(); - void swap(QDBusUnixFileDescriptor &other) Q_DECL_NOTHROW + void swap(QDBusUnixFileDescriptor &other) noexcept { qSwap(d, other.d); } bool isValid() const; diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 2f187687b8..0814cc8050 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -106,7 +106,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidInterfaceName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid interface class: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid interface class: %1").arg(name)); return false; } @@ -118,7 +118,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidBusName(name)) return true; - *error = QDBusError(QDBusError::InvalidService, QString::fromLatin1("Invalid service name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidService, QLatin1String("Invalid service name: %1").arg(name)); return false; } @@ -130,11 +130,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidObjectPath(path)) return true; - *error = QDBusError(QDBusError::InvalidObjectPath, QString::fromLatin1("Invalid object path: %1").arg(path)); + *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Invalid object path: %1").arg(path)); return false; } - inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error, const char *nameType = 0) + inline bool checkMemberName(const QString &name, AllowEmptyFlag empty, QDBusError *error, const char *nameType = nullptr) { if (!nameType) nameType = "member"; if (name.isEmpty()) { @@ -143,8 +143,8 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidMemberName(name)) return true; - *error = QDBusError(QDBusError::InvalidMember, QString::fromLatin1("Invalid %1 name: %2") - .arg(QString::fromLatin1(nameType), name)); + *error = QDBusError(QDBusError::InvalidMember, QLatin1String("Invalid %1 name: %2") + .arg(QLatin1String(nameType), name)); return false; } @@ -156,7 +156,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidErrorName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid error name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid error name: %1").arg(name)); return false; } diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index e3c503aa0f..c6b3b90508 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -108,14 +108,14 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method if (!signature) continue; - retval += QString::fromLatin1(" <property name=\"%1\" type=\"%2\" access=\"%3\"") + retval += QLatin1String(" <property name=\"%1\" type=\"%2\" access=\"%3\"") .arg(QLatin1String(mp.name()), QLatin1String(signature), accessAsString(mp.isReadable(), mp.isWritable())); if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { const char *typeName = QMetaType::typeName(typeId); - retval += QString::fromLatin1(">\n <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n </property>\n") + retval += QLatin1String(">\n <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n </property>\n") .arg(typeNameToXml(typeName)); } else { retval += QLatin1String("/>\n"); @@ -157,12 +157,12 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method if (typeId != QMetaType::UnknownType && typeId != QMetaType::Void) { const char *typeName = QDBusMetaType::typeToSignature(typeId); if (typeName) { - xml += QString::fromLatin1(" <arg type=\"%1\" direction=\"out\"/>\n") + xml += QLatin1String(" <arg type=\"%1\" direction=\"out\"/>\n") .arg(typeNameToXml(typeName)); // do we need to describe this argument? if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid) - xml += QString::fromLatin1(" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n") + xml += QLatin1String(" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n") .arg(typeNameToXml(QMetaType::typeName(typeId))); } else { qWarning() << "Unsupported return type" << typeId << QMetaType::typeName(typeId) << "in method" << mm.name(); @@ -199,7 +199,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method QString name; if (!names.at(j - 1).isEmpty()) - name = QString::fromLatin1("name=\"%1\" ").arg(QLatin1String(names.at(j - 1))); + name = QLatin1String("name=\"%1\" ").arg(QLatin1String(names.at(j - 1))); bool isOutput = isSignal || j > inputCount; @@ -233,7 +233,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method " value=\"true\"/>\n"); retval += xml; - retval += QString::fromLatin1(" </%1>\n") + retval += QLatin1String(" </%1>\n") .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")); } @@ -256,7 +256,7 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, if (xml.isEmpty()) return QString(); // don't add an empty interface - return QString::fromLatin1(" <interface name=\"%1\">\n%2 </interface>\n") + return QLatin1String(" <interface name=\"%1\">\n%2 </interface>\n") .arg(interface, xml); } #if 0 |