diff options
author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-07-06 14:01:36 +0200 |
---|---|---|
committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-07-06 21:51:29 +0200 |
commit | f846454993e4dfe6dbbc6c9a5873d3a895ff0308 (patch) | |
tree | c7ba9dad6787475bc2501a8b7e0d20d195455217 /src | |
parent | b48a588e13051eea54da8e7b9091a4e7f2889e08 (diff) |
Fix spelling of D-Bus in the source code
Replace D-BUS with correct splling D-Bus in the source code,
Keep the old spelling inside XML DTD declarations for compatibility.
Change-Id: Ifa5d43f9fa1417431c81cf1bce0d897a966409b9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/dbus/doc/src/qtdbus-cmake.qdoc | 2 | ||||
-rw-r--r-- | src/dbus/qdbusargument.cpp | 8 | ||||
-rw-r--r-- | src/dbus/qdbusargument.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusextratypes.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/dbus/doc/src/qtdbus-cmake.qdoc b/src/dbus/doc/src/qtdbus-cmake.qdoc index d64b315796..86807af6e5 100644 --- a/src/dbus/doc/src/qtdbus-cmake.qdoc +++ b/src/dbus/doc/src/qtdbus-cmake.qdoc @@ -172,7 +172,7 @@ qt_generate_dbus_interface(header \section1 Description Parses the C++ source or header file containing a QObject-derived class -declaration and generates a file containing the D-BUS Introspection XML. +declaration and generates a file containing the D-Bus Introspection XML. By default, the generated XML file is stored in the current binary directory, and has the same base name as the header. You can specify a different name or diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 5187d579cf..07c71ee40a 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -51,14 +51,14 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) delete marshaller; if (signature.isEmpty() || !ok || !QDBusUtil::isValidSingleSignature(QString::fromLatin1(signature))) { - qWarning("QDBusMarshaller: type '%s' produces invalid D-BUS signature '%s' " + qWarning("QDBusMarshaller: type '%s' produces invalid D-Bus signature '%s' " "(Did you forget to call beginStructure() ?)", QMetaType(id).name(), signature.isEmpty() ? "<empty>" : signature.constData()); return ""; } else if ((signature.at(0) != DBUS_TYPE_ARRAY && signature.at(0) != DBUS_STRUCT_BEGIN_CHAR) || (signature.at(0) == DBUS_TYPE_ARRAY && (signature.at(1) == DBUS_TYPE_BYTE || signature.at(1) == DBUS_TYPE_STRING))) { - qWarning("QDBusMarshaller: type '%s' attempts to redefine basic D-BUS type '%s' (%s) " + qWarning("QDBusMarshaller: type '%s' attempts to redefine basic D-Bus type '%s' (%s) " "(Did you forget to call beginStructure() ?)", QMetaType(id).name(), signature.constData(), QDBusMetaType::signatureToMetaType(signature).name()); @@ -562,8 +562,8 @@ QDBusArgument::ElementType QDBusArgument::currentType() const } /*! - Extracts one D-BUS primitive argument of type \c{BYTE} from the - D-BUS stream and puts it into \a arg. + Extracts one D-Bus primitive argument of type \c{BYTE} from the + D-Bus stream and puts it into \a arg. */ const QDBusArgument &QDBusArgument::operator>>(uchar &arg) const { diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index f1ecb91f0d..1774b6e40c 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -47,7 +47,7 @@ public: void swap(QDBusArgument &other) noexcept { qt_ptr_swap(d, other.d); } - // used for marshalling (Qt -> D-BUS) + // used for marshalling (Qt -> D-Bus) QDBusArgument &operator<<(uchar arg); QDBusArgument &operator<<(bool arg); QDBusArgument &operator<<(short arg); @@ -80,7 +80,7 @@ public: void appendVariant(const QVariant &v); - // used for de-marshalling (D-BUS -> Qt) + // used for de-marshalling (D-Bus -> Qt) QString currentSignature() const; ElementType currentType() const; diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 03d151f16d..775cb1e290 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -4,7 +4,7 @@ #ifndef QDBUSEXTRATYPES_H #define QDBUSEXTRATYPES_H -// define some useful types for D-BUS +// define some useful types for D-Bus #include <QtDBus/qtdbusglobal.h> #include <QtCore/qvariant.h> diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 480b19774e..0320bdb62c 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -28,7 +28,7 @@ QDBusMarshaller::~QDBusMarshaller() void QDBusMarshaller::unregisteredTypeError(QMetaType id) { const char *name = id.name(); - qWarning("QDBusMarshaller: type '%s' (%d) is not registered with D-BUS. " + qWarning("QDBusMarshaller: type '%s' (%d) is not registered with D-Bus. " "Use qDBusRegisterMetaType to register it", name ? name : "", id.id()); error("Unregistered type %1 passed in arguments"_L1 @@ -237,7 +237,7 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(QMetaType kid, QMetaType vid) if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) { QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wformat-overflow") - qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-BUS map.", + qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-Bus map.", kid.name(), kid.id()); QT_WARNING_POP error("Type %1 passed in arguments cannot be used as a key in a map"_L1 @@ -472,7 +472,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) Q_FALLTHROUGH(); default: - qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-BUS type '%s'", + qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-Bus type '%s'", signature); return false; } @@ -492,7 +492,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller) int code = q_dbus_message_iter_get_arg_type(&demarshaller->iterator); if (QDBusUtil::isValidBasicType(code)) { // easy: just append - // do exactly like the D-BUS docs suggest + // do exactly like the D-Bus docs suggest // (see apidocs for q_dbus_message_iter_get_basic) qlonglong value; |