1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling of D-Bus in the source code

Browse Source 
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>
This commit is contained in:
Ievgenii Meshcheriakov 2023-07-06 14:01:36 +02:00
parent b48a588e13
commit f846454993
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/dbuscommon.pri
View File

@ -34,7 +34,7 @@ for(entry, DBUS_$${dbus_TYPE}S) {
for(subent, $$list($$unique(files))) { for(subent, $$list($$unique(files))) {
!contains(subent, .*\\w\\.xml$) { !contains(subent, .*\\w\\.xml$) {
warning("Invalid D-BUS $${dbus_type}: '$$subent', please use 'com.mydomain.myinterface.xml' instead.") warning("Invalid D-Bus $${dbus_type}: '$$subent', please use 'com.mydomain.myinterface.xml' instead.")
next() next()
} }

2
src/dbus/doc/src/qtdbus-cmake.qdoc
View File

@ -172,7 +172,7 @@ qt_generate_dbus_interface(header
\section1 Description \section1 Description
Parses the C++ source or header file containing a QObject-derived class 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, 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 and has the same base name as the header. You can specify a different name or

8
src/dbus/qdbusargument.cpp
View File

@ -51,14 +51,14 @@ QByteArray QDBusArgumentPrivate::createSignature(int id)
delete marshaller; delete marshaller;
if (signature.isEmpty() || !ok || !QDBusUtil::isValidSingleSignature(QString::fromLatin1(signature))) { 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() ?)", "(Did you forget to call beginStructure() ?)",
QMetaType(id).name(), signature.isEmpty() ? "<empty>" : signature.constData()); QMetaType(id).name(), signature.isEmpty() ? "<empty>" : signature.constData());
return ""; return "";
} else if ((signature.at(0) != DBUS_TYPE_ARRAY && signature.at(0) != DBUS_STRUCT_BEGIN_CHAR) || } 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(0) == DBUS_TYPE_ARRAY && (signature.at(1) == DBUS_TYPE_BYTE ||
signature.at(1) == DBUS_TYPE_STRING))) { 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() ?)", "(Did you forget to call beginStructure() ?)",
QMetaType(id).name(), signature.constData(), QMetaType(id).name(), signature.constData(),
QDBusMetaType::signatureToMetaType(signature).name()); 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 Extracts one D-Bus primitive argument of type \c{BYTE} from the
D-BUS stream and puts it into \a arg. D-Bus stream and puts it into \a arg.
*/ */
const QDBusArgument &QDBusArgument::operator>>(uchar &arg) const const QDBusArgument &QDBusArgument::operator>>(uchar &arg) const
{ {

4
src/dbus/qdbusargument.h
View File

@ -47,7 +47,7 @@ public:
void swap(QDBusArgument &other) noexcept { qt_ptr_swap(d, other.d); } 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<<(uchar arg);
QDBusArgument &operator<<(bool arg); QDBusArgument &operator<<(bool arg);
QDBusArgument &operator<<(short arg); QDBusArgument &operator<<(short arg);
@ -80,7 +80,7 @@ public:
void appendVariant(const QVariant &v); void appendVariant(const QVariant &v);
// used for de-marshalling (D-BUS -> Qt) // used for de-marshalling (D-Bus -> Qt)
QString currentSignature() const; QString currentSignature() const;
ElementType currentType() const; ElementType currentType() const;

2
src/dbus/qdbusextratypes.h
View File

@ -4,7 +4,7 @@
#ifndef QDBUSEXTRATYPES_H #ifndef QDBUSEXTRATYPES_H
#define QDBUSEXTRATYPES_H #define QDBUSEXTRATYPES_H
// define some useful types for D-BUS // define some useful types for D-Bus
#include <QtDBus/qtdbusglobal.h> #include <QtDBus/qtdbusglobal.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>

8
src/dbus/qdbusmarshaller.cpp
View File

@ -28,7 +28,7 @@ QDBusMarshaller::~QDBusMarshaller()
void QDBusMarshaller::unregisteredTypeError(QMetaType id) void QDBusMarshaller::unregisteredTypeError(QMetaType id)
{ {
const char *name = id.name(); 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", "Use qDBusRegisterMetaType to register it",
name ? name : "", id.id()); name ? name : "", id.id());
error("Unregistered type %1 passed in arguments"_L1 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)) { if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) {
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wformat-overflow") 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()); kid.name(), kid.id());
QT_WARNING_POP QT_WARNING_POP
error("Type %1 passed in arguments cannot be used as a key in a map"_L1 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(); Q_FALLTHROUGH();
default: default:
qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-BUS type '%s'", qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-Bus type '%s'",
signature); signature);
return false; return false;
} }
@ -492,7 +492,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller)
int code = q_dbus_message_iter_get_arg_type(&demarshaller->iterator); int code = q_dbus_message_iter_get_arg_type(&demarshaller->iterator);
if (QDBusUtil::isValidBasicType(code)) { if (QDBusUtil::isValidBasicType(code)) {
// easy: just append // 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) // (see apidocs for q_dbus_message_iter_get_basic)
qlonglong value; qlonglong value;

4
tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
View File

@ -962,7 +962,7 @@ void tst_QDBusMarshall::sendCallErrors_data()
<< (QVariantList() << QLocale::c()) << (QVariantList() << QLocale::c())
<< "org.freedesktop.DBus.Error.Failed" << "org.freedesktop.DBus.Error.Failed"
<< "Marshalling failed: Unregistered type QLocale passed in arguments" << "Marshalling failed: Unregistered type QLocale passed in arguments"
<< "QDBusMarshaller: type 'QLocale' (18) is not registered with D-BUS. Use qDBusRegisterMetaType to register it"; << "QDBusMarshaller: type 'QLocale' (18) is not registered with D-Bus. Use qDBusRegisterMetaType to register it";
// this type is known to the meta type system, but not registered with D-Bus // this type is known to the meta type system, but not registered with D-Bus
qRegisterMetaType<UnregisteredType>(); qRegisterMetaType<UnregisteredType>();
@ -970,7 +970,7 @@ void tst_QDBusMarshall::sendCallErrors_data()
<< (QVariantList() << QVariant::fromValue(UnregisteredType())) << (QVariantList() << QVariant::fromValue(UnregisteredType()))
<< "org.freedesktop.DBus.Error.Failed" << "org.freedesktop.DBus.Error.Failed"
<< "Marshalling failed: Unregistered type UnregisteredType passed in arguments" << "Marshalling failed: Unregistered type UnregisteredType passed in arguments"
<< QString("QDBusMarshaller: type 'UnregisteredType' (%1) is not registered with D-BUS. Use qDBusRegisterMetaType to register it") << QString("QDBusMarshaller: type 'UnregisteredType' (%1) is not registered with D-Bus. Use qDBusRegisterMetaType to register it")
.arg(qMetaTypeId<UnregisteredType>()); .arg(qMetaTypeId<UnregisteredType>());
QTest::newRow("invalid-object-path-arg") << serviceName << objectPath << interfaceName << "ping" QTest::newRow("invalid-object-path-arg") << serviceName << objectPath << interfaceName << "ping"

16
tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
View File

@ -374,21 +374,21 @@ void tst_QDBusMetaType::invalidTypes()
{ {
// same test // same test
if (qstrcmp(QTest::currentDataTag(), "Invalid0") == 0) if (qstrcmp(QTest::currentDataTag(), "Invalid0") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid0' produces invalid D-BUS signature '<empty>' (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid0' produces invalid D-Bus signature '<empty>' (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid1") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid1") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid1' attempts to redefine basic D-BUS type 's' (QString) (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid1' attempts to redefine basic D-Bus type 's' (QString) (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid2") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid2") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid2' attempts to redefine basic D-BUS type 'o' (QDBusObjectPath) (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid2' attempts to redefine basic D-Bus type 'o' (QDBusObjectPath) (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid3") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid3") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid3' attempts to redefine basic D-BUS type 'as' (QStringList) (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid3' attempts to redefine basic D-Bus type 'as' (QStringList) (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid4") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid4") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid4' attempts to redefine basic D-BUS type 'ay' (QByteArray) (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid4' attempts to redefine basic D-Bus type 'ay' (QByteArray) (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid5") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid5") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid5' produces invalid D-BUS signature 'ii' (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid5' produces invalid D-Bus signature 'ii' (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "Invalid7") == 0) else if (qstrcmp(QTest::currentDataTag(), "Invalid7") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid7' produces invalid D-BUS signature '()' (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'Invalid7' produces invalid D-Bus signature '()' (Did you forget to call beginStructure() ?)");
else if (qstrcmp(QTest::currentDataTag(), "QList<Invalid0>") == 0) else if (qstrcmp(QTest::currentDataTag(), "QList<Invalid0>") == 0)
QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'QList<Invalid0>' produces invalid D-BUS signature 'a' (Did you forget to call beginStructure() ?)"); QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type 'QList<Invalid0>' produces invalid D-Bus signature 'a' (Did you forget to call beginStructure() ?)");
staticTypes(); staticTypes();
staticTypes(); // run twice: the error messages should be printed once only staticTypes(); // run twice: the error messages should be printed once only