diff options
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusargument.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusmetatype.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusutil.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 4e9c1ad..0ea8c8d 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -560,7 +560,7 @@ void QDBusAbstractInterface::connectNotify(const char *signal) if (!d->isValid) return; - // we end up recursing here, so optimise away + // we end up recursing here, so optimize away if (qstrcmp(signal + 1, "destroyed(QObject*)") == 0) return; diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 30f2cda..84d0349 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -172,7 +172,7 @@ template<typename T> inline T qdbus_cast(const QVariant &v return qvariant_cast<T>(v); } -// specialise for QVariant, allowing it to be used in place of QDBusVariant +// specialize for QVariant, allowing it to be used in place of QDBusVariant template<> inline QVariant qdbus_cast<QVariant>(const QDBusArgument &arg, QVariant *) { QDBusVariant item; diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 31588e7..a5d8ada 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -801,7 +801,7 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu ++cacheIt; if (cacheIt == slotCache.hash.constEnd() || cacheIt.key() != cacheKey) { - // not cached, analyse the meta object + // not cached, analyze the meta object const QMetaObject *mo = object->metaObject(); QByteArray memberName = msg.member().toUtf8(); diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 8b174a1..e620152 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -507,7 +507,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller) if (code == DBUS_TYPE_ARRAY) { int element = q_dbus_message_iter_get_element_type(&demarshaller->iterator); if (q_dbus_type_is_fixed(element)) { - // another optimisation: fixed size arrays + // another optimization: fixed size arrays // code is exactly like QDBusDemarshaller::toByteArray DBusMessageIter sub; q_dbus_message_iter_recurse(&demarshaller->iterator, &sub); diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index d838e37..10b2768 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -292,7 +292,7 @@ QDBusMessage QDBusMessagePrivate::makeLocal(const QDBusConnectionPrivate &conn, } // no complex types seen - // optimise by using the variant list itself + // optimize by using the variant list itself QDBusMessage retval; QDBusMessagePrivate *d = retval.d_ptr; d->arguments = asSent.d_ptr->arguments; @@ -452,7 +452,7 @@ QDBusMessage QDBusMessage::createReply(const QVariantList &arguments) const d_ptr->localReply = new QDBusMessage(reply); // keep an internal copy } - // the reply must have a msg or be a local-loop optimisation + // the reply must have a msg or be a local-loop optimization Q_ASSERT(reply.d_ptr->reply || reply.d_ptr->localMessage); return reply; } @@ -471,7 +471,7 @@ QDBusMessage QDBusMessage::createErrorReply(const QString name, const QString &m d_ptr->localReply = new QDBusMessage(reply); // keep an internal copy } - // the reply must have a msg or be a local-loop optimisation + // the reply must have a msg or be a local-loop optimization Q_ASSERT(reply.d_ptr->reply || reply.d_ptr->localMessage); return reply; } diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index cb377cb..821a227 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -242,7 +242,7 @@ bool QDBusMetaType::marshall(QDBusArgument &arg, int id, const void *data) QReadLocker locker(customTypesLock()); QVector<QDBusCustomTypeInfo> *ct = customTypes(); if (id >= ct->size()) - return false; // non-existant + return false; // non-existent const QDBusCustomTypeInfo &info = (*ct).at(id); if (!info.marshall) { @@ -271,7 +271,7 @@ bool QDBusMetaType::demarshall(const QDBusArgument &arg, int id, void *data) QReadLocker locker(customTypesLock()); QVector<QDBusCustomTypeInfo> *ct = customTypes(); if (id >= ct->size()) - return false; // non-existant + return false; // non-existent const QDBusCustomTypeInfo &info = (*ct).at(id); if (!info.demarshall) { diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 61e561e..918a46c 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -85,7 +85,7 @@ namespace QDBusPendingReplyTypes { template<typename T1> inline int metaTypeFor(T1 * = 0) { return qMetaTypeId<T1>(); } - // specialise for QVariant, allowing it to be used in place of QDBusVariant + // specialize for QVariant, allowing it to be used in place of QDBusVariant template<> inline int metaTypeFor<QVariant>(QVariant *) { return qMetaTypeId<QDBusVariant>(); } diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 2fcdc73..b7b0407 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -309,7 +309,7 @@ namespace QDBusUtil Returns true if \a connName is a valid unique connection name. Unique connection names start with a colon (":") and are followed by a list of dot-separated - components composed of ASCII letters, digits, the hypen or the underscore ("_") character. + components composed of ASCII letters, digits, the hyphen or the underscore ("_") character. */ bool isValidUniqueConnectionName(const QString &connName) { |