diff options
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbuserror.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusintrospection_p.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 18 | ||||
| -rw-r--r-- | src/dbus/qdbusmetatype.cpp | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 2a8681d1d7..22fe4a5fd8 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -513,7 +513,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCallWithArgumentList(const QString not indicate that the executed call succeeded. If it fails, the \a errorMethod is called. If the queueing failed, this function returns false and no slot will be called. - + The \a returnMethod must have as its parameters the types returned by the function call. Optionally, it may have a QDBusMessage parameter as its last or only parameter. The \a errorMethod must diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index d578bf7d76..f486c19fdc 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -72,7 +72,7 @@ for ($j = 0; $j < $i; ++$j) { } print "0\n};\n"; ===== PERL SCRIPT ==== - + * The input data is as follows: other org.freedesktop.DBus.Error.Failed diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index a9f3773acc..b892ed95f1 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -97,7 +97,7 @@ public: inline bool operator==(const Argument& other) const { return name == other.name && type == other.type; } }; - + struct Method { QString name; diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index f3bd7c28ba..799c66f6f9 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -77,7 +77,7 @@ private: QVarLengthArray<int, 4> outputTypes; int flags; }; - + struct Property { QByteArray typeName; QByteArray signature; @@ -92,14 +92,14 @@ private: QMap<QByteArray, Method> signals_; QMap<QByteArray, Method> methods; QMap<QByteArray, Property> properties; - + const QDBusIntrospection::Interface *data; QString interface; Type findType(const QByteArray &signature, const QDBusIntrospection::Annotations &annotations, const char *direction = "Out", int id = -1); - + void parseMethods(); void parseSignals(); void parseProperties(); @@ -258,7 +258,7 @@ void QDBusMetaObjectGenerator::parseMethods() mm.inputTypes.append(type.id); mm.parameterNames.append(arg.name.toLatin1()); - + prototype.append(type.name); prototype.append(','); } @@ -331,7 +331,7 @@ void QDBusMetaObjectGenerator::parseSignals() mm.inputTypes.append(type.id); mm.parameterNames.append(arg.name.toLatin1()); - + prototype.append(type.name); prototype.append(','); } @@ -361,7 +361,7 @@ void QDBusMetaObjectGenerator::parseProperties() Type type = findType(p.type.toLatin1(), p.annotations); if (type.id == QVariant::Invalid) continue; - + QByteArray name = p.name.toLatin1(); mp.signature = p.type.toLatin1(); mp.type = type.id; @@ -564,7 +564,7 @@ void QDBusMetaObjectGenerator::writeWithoutXml(const QString &interface) char *stringdata = new char[name.length() + 1]; stringdata[name.length()] = '\0'; - + d.data = reinterpret_cast<uint*>(header); d.relatedMetaObjects = 0; d.static_metacall = 0; @@ -615,7 +615,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con if (we) return we; // still nothing? - + if (parsed.isEmpty()) { // object didn't return introspection we = new QDBusMetaObject; @@ -627,7 +627,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con // merge all interfaces it = parsed.constBegin(); QDBusIntrospection::Interface merged = *it.value().constData(); - + for (++it; it != end; ++it) { merged.annotations.unite(it.value()->annotations); merged.methods.unite(it.value()->methods); diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index ff5818d684..804e80699a 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -318,10 +318,10 @@ int QDBusMetaType::signatureToType(const char *signature) case DBUS_TYPE_UINT16: return QMetaType::UShort; - + case DBUS_TYPE_INT32: return QVariant::Int; - + case DBUS_TYPE_UINT32: return QVariant::UInt; @@ -375,7 +375,7 @@ int QDBusMetaType::signatureToType(const char *signature) /*! \fn QDBusMetaType::typeToSignature(int type) - \internal + \internal Returns the D-Bus signature equivalent to the supplied meta type id \a type. |