summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/doc/src/dbus-adaptors.qdoc50
-rw-r--r--src/dbus/doc/src/qdbusxml2cpp.qdoc4
-rw-r--r--src/dbus/doc/src/qtdbus-index.qdoc8
-rw-r--r--src/dbus/doc/src/qtdbus-module.qdoc8
-rw-r--r--src/dbus/qdbusabstractinterface.cpp4
-rw-r--r--src/dbus/qdbusargument.cpp26
-rw-r--r--src/dbus/qdbusconnection.cpp2
-rw-r--r--src/dbus/qdbuscontext.cpp10
-rw-r--r--src/dbus/qdbuserror.cpp2
-rw-r--r--src/dbus/qdbusextratypes.cpp6
-rw-r--r--src/dbus/qdbusintegrator.cpp2
-rw-r--r--src/dbus/qdbusinterface.cpp2
-rw-r--r--src/dbus/qdbusmessage.cpp6
-rw-r--r--src/dbus/qdbusmetatype.cpp20
-rw-r--r--src/dbus/qdbusunixfiledescriptor.cpp4
-rw-r--r--src/dbus/qdbusutil.cpp2
-rw-r--r--src/dbus/qdbusxmlgenerator.cpp2
17 files changed, 79 insertions, 79 deletions
diff --git a/src/dbus/doc/src/dbus-adaptors.qdoc b/src/dbus/doc/src/dbus-adaptors.qdoc
index 261324508e..46a6b79c0b 100644
--- a/src/dbus/doc/src/dbus-adaptors.qdoc
+++ b/src/dbus/doc/src/dbus-adaptors.qdoc
@@ -27,7 +27,7 @@
/*!
\page usingadaptors.html
- \title Using QtDBus Adaptors
+ \title Using Qt D-Bus Adaptors
\brief How to create and use DBus adaptors in Qt.
\ingroup best-practices
@@ -56,7 +56,7 @@
of the MethodCall type. (See \l {Declaring Slots in D-Bus Adaptors} for more
information). Signals in the class will be automatically relayed over D-Bus.
However, not all types are allowed signals or slots' parameter lists: see
- \l {The QtDBus Type System} for more information.
+ \l {The Qt D-Bus Type System} for more information.
Also, any property declared with Q_PROPERTY will be automatically exposed
over the Properties interface on D-Bus. Since the QObject property system
@@ -67,7 +67,7 @@
\list
\li \l{Declaring Slots in D-Bus Adaptors}
\li \l{Declaring Signals in D-Bus Adaptors}
- \li \l{The QtDBus Type System}
+ \li \l{The Qt D-Bus Type System}
\li \l{D-Bus Adaptor Example}
\endlist
@@ -78,8 +78,8 @@
\page qdbusadaptorexample.html
\title D-Bus Adaptor Example
- \previouspage The QtDBus Type System
- \contentspage Using QtDBus Adaptors
+ \previouspage The Qt D-Bus Type System
+ \contentspage Using Qt D-Bus Adaptors
The following example code shows how a D-Bus interface can be implemented
using an adaptor.
@@ -198,11 +198,11 @@
\page qdbusdeclaringslots.html
\title Declaring Slots in D-Bus Adaptors
- \contentspage Using QtDBus Adaptors
+ \contentspage Using Qt D-Bus Adaptors
\nextpage Declaring Signals in D-Bus Adaptors
Slots in D-Bus adaptors are declared just like normal, public slots, but their
- parameters must follow certain rules (see \l{The QtDBus Type System} for more
+ parameters must follow certain rules (see \l{The Qt D-Bus Type System} for more
information). Slots whose parameters do not follow those rules or that are not
public will not be accessible via D-Bus.
@@ -259,7 +259,7 @@
\section1 Automatic Replies
Method replies are generated automatically with the contents of the output
- parameters (if there were any) by the QtDBus implementation. Slots need not
+ parameters (if there were any) by the Qt D-Bus implementation. Slots need not
worry about constructing proper QDBusMessage objects and sending them over
the connection.
@@ -267,7 +267,7 @@
it needs to send a special reply or even an error, it can do so by using
QDBusMessage::createReply() or QDBusMessage::createErrorReply() on the
QDBusMessage parameter and send it with QDBusConnection::send(). The
- QtDBus implementation will not generate any reply if the slot did so.
+ Qt D-Bus implementation will not generate any reply if the slot did so.
\warning When a caller places a method call and waits for a reply, it will
only wait for a limited amount of time. Slots intending to take a long time
@@ -306,12 +306,12 @@
\snippet code/doc_src_qdbusadaptors.cpp 11
As can be seen in the example, when a delayed reply is in place,
- the return value(s) from the slot will be ignored by QtDBus. They
+ the return value(s) from the slot will be ignored by Qt D-Bus. They
are used only to determine the slot's signature when communicating
the adaptor's description to remote applications, or in case the
code in the slot decides not to use a delayed reply.
- The delayed reply itself is requested from QtDBus by calling
+ The delayed reply itself is requested from Qt D-Bus by calling
QDBusMessage::reply() on the original message. It then becomes the
resposibility of the called code to eventually send a reply to the
caller.
@@ -321,8 +321,8 @@
to complete should make that fact clear in documentation so that callers
properly set higher timeouts.
- \sa {Using QtDBus Adaptors}, {Declaring Signals in D-Bus Adaptors},
- {The QtDBus Type System}, QDBusConnection, QDBusMessage
+ \sa {Using Qt D-Bus Adaptors}, {Declaring Signals in D-Bus Adaptors},
+ {The Qt D-Bus Type System}, QDBusConnection, QDBusMessage
*/
/*!
@@ -330,12 +330,12 @@
\title Declaring Signals in D-Bus Adaptors
\previouspage Declaring Slots in D-Bus Adaptors
- \contentspage Using QtDBus Adaptors
- \nextpage The QtDBus Type System
+ \contentspage Using Qt D-Bus Adaptors
+ \nextpage The Qt D-Bus Type System
Any signal in a class derived from QDBusAbstractAdaptor will be automatically
relayed into D-Bus, provided that the signal's parameters conform to certain
- rules (see \l{The QtDBus Type System} for more information). No special code
+ rules (see \l{The Qt D-Bus Type System} for more information). No special code
is necessary to make this relay.
However, signals must still be emitted. The easiest way to emit an adaptor
@@ -349,21 +349,21 @@
the corresponding signals in the adaptor. It will inspect the list of signals
in both classes and connect those whose parameters match exactly.
- \sa {Using QtDBus Adaptors},
+ \sa {Using Qt D-Bus Adaptors},
{Declaring Slots in D-Bus Adaptors},
- {The QtDBus Type System}, QDBusAbstractAdaptor
+ {The Qt D-Bus Type System}, QDBusAbstractAdaptor
*/
/*!
\page qdbustypesystem.html
- \title The QtDBus Type System
+ \title The Qt D-Bus Type System
\previouspage Declaring Signals in D-Bus Adaptors
- \contentspage Using QtDBus Adaptors
+ \contentspage Using Qt D-Bus Adaptors
\nextpage D-Bus Adaptor Example
D-Bus has an extensible type system based on a few primitives and
- composition of the primitives in arrays and structures. QtDBus
+ composition of the primitives in arrays and structures. Qt D-Bus
implements the interface to that type system through the
QDBusArgument class, allowing user programs to send and receive
practically every C++ type over the bus.
@@ -436,13 +436,13 @@
\section1 Extending the Type System
- In order to use one's own type with QtDBus, the type has to be
+ In order to use one's own type with Qt D-Bus, the type has to be
declared as a Qt meta-type with the Q_DECLARE_METATYPE() macro and
registered with the qDBusRegisterMetaType() function. The
streaming operators \c{operator>>} and \c{operator<<} will be
automatically found by the registration system.
- QtDBus provides template specializations for arrays and maps for
+ Qt D-Bus provides template specializations for arrays and maps for
use with Qt's \l{Container classes}{container classes}, such as
QMap and QList, so it is not necessary to write the streaming
operator functions for those. For other types, and specially for
@@ -454,7 +454,7 @@
\section1 The Type System in Use
- All of the QtDBus types (primitives and user-defined alike) can be
+ All of the Qt D-Bus types (primitives and user-defined alike) can be
used to send and receive messages of all types over the bus.
\warning You may not use any type that is not on the list above,
@@ -477,5 +477,5 @@
Its presence in the method implementation (outside the class declaration) is optional.
- \sa {Using QtDBus Adaptors}
+ \sa {Using Qt D-Bus Adaptors}
*/
diff --git a/src/dbus/doc/src/qdbusxml2cpp.qdoc b/src/dbus/doc/src/qdbusxml2cpp.qdoc
index 90fb2e15ec..7ec9d446d6 100644
--- a/src/dbus/doc/src/qdbusxml2cpp.qdoc
+++ b/src/dbus/doc/src/qdbusxml2cpp.qdoc
@@ -27,10 +27,10 @@
/*!
\page qdbusxml2cpp.html
- \title QtDBus XML compiler (qdbusxml2cpp)
+ \title Qt D-Bus XML compiler (qdbusxml2cpp)
\keyword qdbusxml2cpp
- The QtDBus XML compiler is a tool that can be used to parse interface descriptions and produce
+ The Qt D-Bus XML compiler is a tool that can be used to parse interface descriptions and produce
static code representing those interfaces, which can then be used to make calls to remote
objects or implement said interfaces.
diff --git a/src/dbus/doc/src/qtdbus-index.qdoc b/src/dbus/doc/src/qtdbus-index.qdoc
index ccef4de614..261183cb96 100644
--- a/src/dbus/doc/src/qtdbus-index.qdoc
+++ b/src/dbus/doc/src/qtdbus-index.qdoc
@@ -96,7 +96,7 @@
purpose is to be used in a one-to-many context, signal messages
are designed to work over an "opt-in" mechanism.
- The QtDBus module fully encapsulates the low-level concept of
+ The Qt D-Bus module fully encapsulates the low-level concept of
messages into a simpler, object-oriented approach familiar to Qt
developers. In most cases, the developer need not worry about
sending or receiving messages.
@@ -208,9 +208,9 @@
type information over the bus:
\list
- \li \l{Using QtDBus Adaptors}
- \li \l{The QtDBus Type System}
- \li \l{QtDBus XML compiler (qdbusxml2cpp)}
+ \li \l{Using Qt D-Bus Adaptors}
+ \li \l{The Qt D-Bus Type System}
+ \li \l{Qt D-Bus XML compiler (qdbusxml2cpp)}
\li \l{Qt D-Bus C++ Classes}
\endlist
*/
diff --git a/src/dbus/doc/src/qtdbus-module.qdoc b/src/dbus/doc/src/qtdbus-module.qdoc
index a2801e856b..12fc864e16 100644
--- a/src/dbus/doc/src/qtdbus-module.qdoc
+++ b/src/dbus/doc/src/qtdbus-module.qdoc
@@ -28,7 +28,7 @@
/*!
\module QtDBus
\title Qt D-Bus C++ Classes
- \brief The QtDBus module is a Unix-only library that you can use
+ \brief The Qt D-Bus module is a Unix-only library that you can use
to perform Inter-Process Communication using the \l{D-Bus} protocol.
\ingroup modules
@@ -37,12 +37,12 @@
\target The QDBus compiler
- Applications using the QtDBus module can provide services to
+ Applications using the Qt D-Bus module can provide services to
other, remote applications by exporting objects, as well as use
services exported by those applications by placing calls and
accessing properties.
- The QtDBus module provides an interface that extends the Qt \l
+ The Qt D-Bus module provides an interface that extends the Qt \l
{signalsandslots.html}{Signals and Slots} mechanism, allowing one
to connect to a signal emitted remotely as well as to connect a
local signal to remote slot.
@@ -52,7 +52,7 @@
\snippet code/doc_src_qtdbus.cpp 0
If you're using qmake to build your application, you can add this
- line to your .pro file to make it link against the QtDBus
+ line to your .pro file to make it link against the Qt D-Bus
libraries:
\snippet code/doc_src_qtdbus.pro 1
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index a7bdbe4525..2a8681d1d7 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -128,7 +128,7 @@ void QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, QVariant &
if (int(mp.type()) != QMetaType::QVariant) {
expectedSignature = QDBusMetaType::typeToSignature(where.userType());
if (expectedSignature == 0) {
- qWarning("QDBusAbstractInterface: type %s must be registered with QtDBus before it can be "
+ qWarning("QDBusAbstractInterface: type %s must be registered with Qt D-Bus before it can be "
"used to read property %s.%s",
mp.typeName(), qPrintable(interface), mp.name());
lastError = QDBusError(QDBusError::Failed,
@@ -264,7 +264,7 @@ int QDBusAbstractInterfaceBase::qt_metacall(QMetaObject::Call _c, int _id, void
\inmodule QtDBus
\since 4.2
- \brief The QDBusAbstractInterface class is the base class for all D-Bus interfaces in the QtDBus binding, allowing access to remote interfaces
+ \brief The QDBusAbstractInterface class is the base class for all D-Bus interfaces in the Qt D-Bus binding, allowing access to remote interfaces
Generated-code classes also derive from QDBusAbstractInterface,
all methods described here are also valid for generated-code
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index d88a1b893e..191eb5eea6 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -177,10 +177,10 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
The class is used to send arguments over D-Bus to remote
applications and to receive them back. D-Bus offers an extensible
type system, based on a few primitive types and associations of
- them. See the \l {qdbustypesystem.html}{QtDBus type system} page
+ them. See the \l {qdbustypesystem.html}{Qt D-Bus Type System} page
for more information on the type system.
- QDBusArgument is the central class in the QtDBus type system,
+ QDBusArgument is the central class in the Qt D-Bus type system,
providing functions to marshall and demarshall the primitive
types. The compound types are then created by association of one
or more of the primitive types in arrays, dictionaries or
@@ -188,7 +188,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
The following example illustrates how a structure containing an
integer and a string can be constructed using the \l
- {qdbustypesystem.html}{QtDBus type system}:
+ {qdbustypesystem.html}{Qt D-Bus type system}:
\snippet code/src_qdbus_qdbusargument.cpp 0
@@ -229,9 +229,9 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
In this example, both the \c{operator<<} and the \c{operator>>}
functions may produce a different number of reads/writes. This can
- confuse the QtDBus type system and should be avoided.
+ confuse the Qt D-Bus type system and should be avoided.
- \sa QDBusAbstractInterface, {qdbustypesystem.html}{The QtDBus type
+ \sa QDBusAbstractInterface, {qdbustypesystem.html}{The Qt D-Bus type
system}, {usingadaptors.html}{Using Adaptors}, qdbus_cast()
*/
@@ -522,7 +522,7 @@ QDBusArgument &QDBusArgument::operator<<(const QDBusVariant &arg)
that are supported directly by QDBusArgument because of their
widespread usage in Qt applications.
- Other arrays are supported through compound types in QtDBus.
+ Other arrays are supported through compound types in Qt D-Bus.
*/
QDBusArgument &QDBusArgument::operator<<(const QStringList &arg)
{
@@ -540,7 +540,7 @@ QDBusArgument &QDBusArgument::operator<<(const QStringList &arg)
that are supported directly by QDBusArgument because of their
widespread usage in Qt applications.
- Other arrays are supported through compound types in QtDBus.
+ Other arrays are supported through compound types in Qt D-Bus.
*/
QDBusArgument &QDBusArgument::operator<<(const QByteArray &arg)
{
@@ -784,7 +784,7 @@ const QDBusArgument &QDBusArgument::operator>>(QDBusVariant &arg) const
that are supported directly by QDBusArgument because of their
widespread usage in Qt applications.
- Other arrays are supported through compound types in QtDBus.
+ Other arrays are supported through compound types in Qt D-Bus.
*/
const QDBusArgument &QDBusArgument::operator>>(QStringList &arg) const
{
@@ -802,7 +802,7 @@ const QDBusArgument &QDBusArgument::operator>>(QStringList &arg) const
that are supported directly by QDBusArgument because of their
widespread usage in Qt applications.
- Other arrays are supported through compound types in QtDBus.
+ Other arrays are supported through compound types in Qt D-Bus.
*/
const QDBusArgument &QDBusArgument::operator>>(QByteArray &arg) const
{
@@ -855,7 +855,7 @@ void QDBusArgument::endStructure()
If the type you want to marshall is a QList, QVector or any of the
Qt's \l {Container Classes} that take one template parameter,
you need not declare an \c{operator<<} function for it, since
- QtDBus provides generic templates to do the job of marshalling
+ Qt D-Bus provides generic templates to do the job of marshalling
the data. The same applies for STL's sequence containers, such
as \c {std::list}, \c {std::vector}, etc.
@@ -892,7 +892,7 @@ void QDBusArgument::endArray()
\snippet code/src_qdbus_qdbusargument.cpp 7
If the type you want to marshall is a QMap or QHash, you need not
- declare an \c{operator<<} function for it, since QtDBus provides
+ declare an \c{operator<<} function for it, since Qt D-Bus provides
generic templates to do the job of marshalling the data.
\sa endMap(), beginStructure(), beginArray(), beginMapEntry()
@@ -981,7 +981,7 @@ void QDBusArgument::endStructure() const
If the type you want to demarshall is a QList, QVector or any of the
Qt's \l {Container Classes} that take one template parameter, you
- need not declare an \c{operator>>} function for it, since QtDBus
+ need not declare an \c{operator>>} function for it, since Qt D-Bus
provides generic templates to do the job of demarshalling the data.
The same applies for STL's sequence containers, such as \c {std::list},
\c {std::vector}, etc.
@@ -1016,7 +1016,7 @@ void QDBusArgument::endArray() const
\snippet code/src_qdbus_qdbusargument.cpp 10
If the type you want to demarshall is a QMap or QHash, you need not
- declare an \c{operator>>} function for it, since QtDBus provides
+ declare an \c{operator>>} function for it, since Qt D-Bus provides
generic templates to do the job of demarshalling the data.
\sa endMap(), beginStructure(), beginArray(), beginMapEntry()
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 7e56ea9fbd..74a3a752a5 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1168,7 +1168,7 @@ QByteArray QDBusConnection::localMachineId()
\inmodule QtDBus
\brief The QDBus namespace contains miscellaneous identifiers used
- throughout the QtDBus library.
+ throughout the Qt D-Bus module.
*/
/*!
diff --git a/src/dbus/qdbuscontext.cpp b/src/dbus/qdbuscontext.cpp
index 4bf229355b..7cc3648cf8 100644
--- a/src/dbus/qdbuscontext.cpp
+++ b/src/dbus/qdbuscontext.cpp
@@ -84,7 +84,7 @@ QDBusContextPrivate *QDBusContextPrivate::set(QObject *obj, QDBusContextPrivate
The QDBusContext class is an alternative to accessing the context
that doesn't involve modifying the code generated by the \l
- {QtDBus XML Compiler (qdbusxml2cpp)}.
+ {Qt D-Bus XML compiler (qdbusxml2cpp)}.
QDBusContext is used by subclassing it from the objects being
exported using QDBusConnection::registerObject(). The following
@@ -159,10 +159,10 @@ bool QDBusContext::isDelayedReply() const
/*!
Sets whether this call will have a delayed reply or not.
- If \a enable is false, QtDBus will automatically generate a reply
+ If \a enable is false, Qt D-Bus will automatically generate a reply
back to the caller, if needed, as soon as the called slot returns.
- If \a enable is true, QtDBus will not generate automatic
+ If \a enable is true, Qt D-Bus will not generate automatic
replies. It will also ignore the return value from the slot and
any output parameters. Instead, the called object is responsible
for storing the incoming message and send a reply or error at a
@@ -181,7 +181,7 @@ void QDBusContext::setDelayedReply(bool enable) const
msg parameter is a human-readable text explaining the failure.
If an error is sent, the return value and any output parameters
- from the called slot will be ignored by QtDBus.
+ from the called slot will be ignored by Qt D-Bus.
*/
void QDBusContext::sendErrorReply(const QString &name, const QString &msg) const
{
@@ -195,7 +195,7 @@ void QDBusContext::sendErrorReply(const QString &name, const QString &msg) const
msg parameter is a human-readable text explaining the failure.
If an error is sent, the return value and any output parameters
- from the called slot will be ignored by QtDBus.
+ from the called slot will be ignored by Qt D-Bus.
*/
void QDBusContext::sendErrorReply(QDBusError::ErrorType type, const QString &msg) const
{
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index 7e98c2405f..d578bf7d76 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -176,7 +176,7 @@ static inline QDBusError::ErrorType get(const char *name)
C++ and Java exceptions are a valid analogy for D-Bus errors:
instead of returning normally with a return value, remote
applications and the bus may decide to throw an error
- condition. However, the QtDBus implementation does not use the C++
+ condition. However, the Qt D-Bus implementation does not use the C++
exception-throwing mechanism, so you will receive QDBusErrors in
the return reply (see QDBusReply::error()).
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp
index 20619624fc..87dd4f7dd9 100644
--- a/src/dbus/qdbusextratypes.cpp
+++ b/src/dbus/qdbusextratypes.cpp
@@ -82,7 +82,7 @@ void QDBusSignature::doCheck()
The QVariant within a QDBusVariant is required to distinguish between a normal
D-Bus value and a value within a D-Bus variant.
- \sa {The QtDBus type system}
+ \sa {The Qt D-Bus Type System}
*/
/*!
@@ -123,7 +123,7 @@ void QDBusSignature::doCheck()
\brief The QDBusObjectPath class enables the programmer to
identify the OBJECT_PATH type provided by the D-Bus typesystem.
- \sa {The QtDBus type system}
+ \sa {The Qt D-Bus Type System}
*/
/*!
@@ -176,7 +176,7 @@ void QDBusSignature::doCheck()
\brief The QDBusSignature class enables the programmer to
identify the SIGNATURE type provided by the D-Bus typesystem.
- \sa {The QtDBus type system}
+ \sa {The Qt D-Bus Type System}
*/
/*!
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 4326ee1fa0..90f011de54 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -115,7 +115,7 @@ static inline QDebug operator<<(QDebug dbg, const QDBusConnectionPrivate *conn)
void qdbusDefaultThreadDebug(int action, int condition, QDBusConnectionPrivate *conn)
{
qDBusDebug() << QThread::currentThread()
- << "QtDBus threading action" << action
+ << "Qt D-Bus threading action" << action
<< (condition == QDBusLockerBase::BeforeLock ? "before lock" :
condition == QDBusLockerBase::AfterLock ? "after lock" :
condition == QDBusLockerBase::BeforeUnlock ? "before unlock" :
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index deb933d8c4..d4a027f2db 100644
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -198,7 +198,7 @@ QDBusInterfacePrivate::~QDBusInterfacePrivate()
\snippet code/src_qdbus_qdbusinterface.cpp 0
- \sa {QtDBus XML compiler (qdbusxml2cpp)}
+ \sa {Qt D-Bus XML compiler (qdbusxml2cpp)}
*/
/*!
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 62599bdf83..ce5af42e74 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -620,7 +620,7 @@ bool QDBusMessage::isReplyRequired() const
/*!
Sets whether the message will be replied later (if \a enable is
- true) or if an automatic reply should be generated by QtDBus
+ true) or if an automatic reply should be generated by Qt D-Bus
(if \a enable is false).
In D-Bus, all method calls must generate a reply to the caller, unless the
@@ -639,7 +639,7 @@ void QDBusMessage::setDelayedReply(bool enable) const
/*!
Returns the delayed reply flag, as set by setDelayedReply(). By default, this
- flag is false, which means QtDBus will generate automatic replies
+ flag is false, which means Qt D-Bus will generate automatic replies
when necessary.
*/
bool QDBusMessage::isDelayedReply() const
@@ -674,7 +674,7 @@ void QDBusMessage::setAutoStartService(bool enable)
/*!
Returns the auto start flag, as set by setAutoStartService(). By default, this
- flag is true, which means QtDBus will auto start a service, if it is
+ flag is true, which means Qt D-Bus will auto start a service, if it is
not running already.
\sa setAutoStartService()
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index 9d478fe959..ff5818d684 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -96,7 +96,7 @@ void QDBusMetaTypeId::init()
// reentrancy is not a problem since everything else is locked on their own
// set the guard variable at the end
if (!initialized.load()) {
- // register our types with QtCore (calling qMetaTypeId<T>() does this implicitly)
+ // register our types with Qt Core (calling qMetaTypeId<T>() does this implicitly)
(void)message();
(void)argument();
(void)variant();
@@ -106,7 +106,7 @@ void QDBusMetaTypeId::init()
(void)unixfd();
#ifndef QDBUS_NO_SPECIALTYPES
- // and register QtCore's with us
+ // and register Qt Core's with us
registerHelper<QDate>();
registerHelper<QTime>();
registerHelper<QDateTime>();
@@ -145,21 +145,21 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
/*!
\class QDBusMetaType
\inmodule QtDBus
- \brief Meta-type registration system for the QtDBus module.
+ \brief Meta-type registration system for the Qt D-Bus module.
\internal
The QDBusMetaType class allows you to register class types for
marshalling and demarshalling over D-Bus. D-Bus supports a very
limited set of primitive types, but allows one to extend the type
system by creating compound types, such as arrays (lists) and
- structs. In order to use them with QtDBus, those types must be
+ structs. In order to use them with Qt D-Bus, those types must be
registered.
- See \l {qdbustypesystem.html}{QtDBus type system} for more
+ See \l {qdbustypesystem.html}{Qt D-Bus Type System} for more
information on the type system and how to register additional
types.
- \sa {qdbustypesystem.html}{QtDBus type system},
+ \sa {qdbustypesystem.html}{Qt D-Bus Type System},
qDBusRegisterMetaType(), QMetaType, QVariant, QDBusArgument
*/
@@ -170,7 +170,7 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
\since 4.2
Registers \c{T} with the
- \l {qdbustypesystem.html}{QtDBus type system} and the Qt \l
+ \l {qdbustypesystem.html}{Qt D-Bus Type System} and the Qt \l
{QMetaType}{meta-type system}, if it's not already registered.
To register a type, it must be declared as a meta-type with the
@@ -182,14 +182,14 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
If \c{T} isn't a type derived from one of
Qt's \l{container classes}, the \c{operator<<} and
\c{operator>>} streaming operators between \c{T} and QDBusArgument
- must be already declared. See the \l {qdbustypesystem.html}{QtDBus
- type system} page for more information on how to declare such
+ must be already declared. See the \l {qdbustypesystem.html}{Qt D-Bus
+ Type System} page for more information on how to declare such
types.
This function returns the Qt meta type id for the type (the same
value that is returned from qRegisterMetaType()).
- \sa {qdbustypesystem.html}{QtDBus type system}, qRegisterMetaType(), QMetaType
+ \sa {qdbustypesystem.html}{Qt D-Bus Type System}, qRegisterMetaType(), QMetaType
*/
/*!
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index 2ad5b52d4d..53fb439887 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
\brief The QDBusUnixFileDescriptor class holds one Unix file descriptor.
The QDBusUnixFileDescriptor class is used to hold one Unix file
- descriptor for use with the QtDBus module. This allows applications to
+ descriptor for use with the Qt D-Bus module. This allows applications to
send and receive Unix file descriptors over the D-Bus connection, mapping
automatically to the D-Bus type 'h'.
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
Unix file descriptor passing is not available in all D-Bus connections.
This feature is present with D-Bus library and bus daemon version 1.4 and
- upwards on Unix systems. QtDBus automatically enables the feature if such
+ upwards on Unix systems. Qt D-Bus automatically enables the feature if such
a version was found at compile-time and run-time.
To verify that your connection does support passing file descriptors,
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index ea8424dc8b..df5e272a1e 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -315,7 +315,7 @@ namespace QDBusUtil
/*!
\internal
\since 4.5
- Dumps the contents of a QtDBus argument from \a arg into a string.
+ Dumps the contents of a Qt D-Bus argument from \a arg into a string.
*/
QString argumentToString(const QVariant &arg)
{
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp
index 6871387130..387caae957 100644
--- a/src/dbus/qdbusxmlgenerator.cpp
+++ b/src/dbus/qdbusxmlgenerator.cpp
@@ -59,7 +59,7 @@ extern Q_DBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const
static inline QString typeNameToXml(const char *typeName)
{
// ### copied from qtextdocument.cpp
- // ### move this into QtCore at some point
+ // ### move this into Qt Core at some point
QString plain = QLatin1String(typeName);
QString rich;
rich.reserve(int(plain.length() * 1.1));
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 14:04:10 +0000