diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusconnection.h | 5 | ||||
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 3 | ||||
-rw-r--r-- | src/dbus/qdbusconnectioninterface.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusinternalfilters.cpp | 3 | ||||
-rw-r--r-- | src/dbus/qdbusutil_p.h | 6 | ||||
-rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 11 |
6 files changed, 14 insertions, 18 deletions
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index d9a894b637..ba28938b60 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -73,10 +73,9 @@ class QDBusConnectionPrivate; class Q_DBUS_EXPORT QDBusConnection { Q_GADGET - Q_ENUMS(BusType UnregisterMode) - Q_FLAGS(RegisterOptions) public: enum BusType { SessionBus, SystemBus, ActivationBus }; + Q_ENUM(BusType) enum RegisterOption { ExportAdaptors = 0x01, @@ -106,11 +105,13 @@ public: // Reserved = 0xff000000 }; Q_DECLARE_FLAGS(RegisterOptions, RegisterOption) + Q_FLAG(RegisterOptions) enum UnregisterMode { UnregisterNode, UnregisterTree }; + Q_ENUM(UnregisterMode) enum VirtualObjectRegisterOption { SingleNode = 0x0, diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 875bcd1421..d323088779 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -348,9 +348,6 @@ public: QObject *receiver, const char *signal, int minMIdx, bool buildSignature); static DBusHandlerResult messageFilter(DBusConnection *, DBusMessage *, void *); - static bool checkReplyForDelivery(QDBusConnectionPrivate *target, QObject *object, - int idx, const QList<int> &metaTypes, - const QDBusMessage &msg); static QDBusCallDeliveryEvent *prepareReply(QDBusConnectionPrivate *target, QObject *object, int idx, const QVector<int> &metaTypes, const QDBusMessage &msg); diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 7b694a1f96..37f35dbe81 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -61,7 +61,6 @@ class QByteArray; class Q_DBUS_EXPORT QDBusConnectionInterface: public QDBusAbstractInterface { Q_OBJECT - Q_ENUMS(ServiceQueueOptions ServiceReplacementOptions RegisterServiceReply) friend class QDBusConnectionPrivate; static inline const char *staticInterfaceName(); @@ -76,15 +75,18 @@ public: QueueService, ReplaceExistingService }; + Q_ENUM(ServiceQueueOptions) enum ServiceReplacementOptions { DontAllowReplacement, AllowReplacement }; + Q_ENUM(ServiceReplacementOptions) enum RegisterServiceReply { ServiceNotRegistered = 0, ServiceRegistered, ServiceQueued }; + Q_ENUM(RegisterServiceReply) public Q_SLOTS: QDBusReply<QStringList> registeredServiceNames() const; diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 03e04bb2f5..0927f326f2 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -204,8 +204,7 @@ static inline QDBusMessage interfaceNotFoundError(const QDBusMessage &msg, const { return msg.createErrorReply(QDBusError::UnknownInterface, QString::fromLatin1("Interface %1 was not found in object %2") - .arg(interface_name) - .arg(msg.path())); + .arg(interface_name, msg.path())); } static inline QDBusMessage diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 931a374ad9..2f187687b8 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -69,17 +69,17 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil Q_DBUS_EXPORT bool isValidInterfaceName(const QString &ifaceName); Q_DBUS_EXPORT bool isValidUniqueConnectionName(const QStringRef &busName); - bool inline isValidUniqueConnectionName(const QString &busName) { return isValidUniqueConnectionName(QStringRef(&busName)); } + inline bool isValidUniqueConnectionName(const QString &busName) { return isValidUniqueConnectionName(QStringRef(&busName)); } Q_DBUS_EXPORT bool isValidBusName(const QString &busName); Q_DBUS_EXPORT bool isValidMemberName(const QStringRef &memberName); - bool inline isValidMemberName(const QString &memberName) { return isValidMemberName(QStringRef(&memberName)); } + inline bool isValidMemberName(const QString &memberName) { return isValidMemberName(QStringRef(&memberName)); } Q_DBUS_EXPORT bool isValidErrorName(const QString &errorName); Q_DBUS_EXPORT bool isValidPartOfObjectPath(const QStringRef &path); - bool inline isValidPartOfObjectPath(const QString &path) { return isValidPartOfObjectPath(QStringRef(&path)); } + inline bool isValidPartOfObjectPath(const QString &path) { return isValidPartOfObjectPath(QStringRef(&path)); } Q_DBUS_EXPORT bool isValidObjectPath(const QString &path); diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index d239a69f73..e3c503aa0f 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -149,9 +149,8 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method if (!isScriptable && !(flags & (isSignal ? QDBusConnection::ExportNonScriptableSignals : QDBusConnection::ExportNonScriptableInvokables | QDBusConnection::ExportNonScriptableSlots))) continue; - QString xml = QString::fromLatin1(" <%1 name=\"%2\">\n") - .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")) - .arg(QString::fromLatin1(mm.name())); + QString xml = QString::asprintf(" <%s name=\"%s\">\n", + isSignal ? "signal" : "method", mm.name().constData()); // check the return type first int typeId = mm.returnType(); @@ -205,10 +204,8 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method bool isOutput = isSignal || j > inputCount; const char *signature = QDBusMetaType::typeToSignature(types.at(j)); - xml += QString::fromLatin1(" <arg %1type=\"%2\" direction=\"%3\"/>\n") - .arg(name) - .arg(QLatin1String(signature)) - .arg(isOutput ? QLatin1String("out") : QLatin1String("in")); + xml += QString::asprintf(" <arg %lstype=\"%s\" direction=\"%s\"/>\n", + qUtf16Printable(name), signature, isOutput ? "out" : "in"); // do we need to describe this argument? if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { |