QDBusAbstractInterface/Doc: fix example to match the description
The docs say "This example illustrates function calling with 0, 1 and 2 parameters" because it was copied from the synchronous call() documentation. But the snippet didn't do that, because back in Qt 4 when this was created, it was too difficult to exemplify that for asynchronous use. It now no longer is, with lambdas. Drive-by update the docs for both functions to refer to each other. Fixes: QTBUG-121873 Pick-to: 6.6 Change-Id: I664b9f014ffc48cbb49bfffd17b089b7f77c1cde Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit 9e73917537368d1904cc227da3332e970ad23752) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
1753af3841
commit
6c89a9d606
@ -47,12 +47,22 @@ else
|
|||||||
void Abstract_DBus_Interface::asyncCall()
|
void Abstract_DBus_Interface::asyncCall()
|
||||||
{
|
{
|
||||||
//! [1]
|
//! [1]
|
||||||
QString value = retrieveValue();
|
QDBusPendingCall pcall = interface->asyncCall("GetAPIVersion"_L1);
|
||||||
QDBusPendingCall pcall = interface->asyncCall("Process"_L1, value);
|
auto watcher = new QDBusPendingCallWatcher(pcall, this);
|
||||||
|
|
||||||
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall);
|
|
||||||
|
|
||||||
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this,
|
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this,
|
||||||
|
[&](QDBusPendingCallWatcher *w) {
|
||||||
|
QString value = retrieveValue();
|
||||||
|
QDBusPendingReply<int> reply(*w);
|
||||||
|
QDBusPendingCall pcall;
|
||||||
|
if (reply.argumentAt<0>() >= 14)
|
||||||
|
pcall = interface->asyncCall("ProcessWorkUnicode"_L1, value);
|
||||||
|
else
|
||||||
|
pcall = interface->asyncCall("ProcessWork"_L1, "UTF-8"_L1, value.toUtf8());
|
||||||
|
|
||||||
|
w = new QDBusPendingCallWatcher(pcall);
|
||||||
|
QObject::connect(w, &QDBusPendingCallWatcher::finished, this,
|
||||||
&Abstract_DBus_Interface::callFinishedSlot);
|
&Abstract_DBus_Interface::callFinishedSlot);
|
||||||
|
});
|
||||||
//! [1]
|
//! [1]
|
||||||
}
|
}
|
||||||
|
@ -723,6 +723,7 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian
|
|||||||
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
|
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
|
||||||
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
|
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
|
||||||
Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
|
Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
|
||||||
|
See asyncCall() for the same example in non-blocking (asynchronous) calls.
|
||||||
|
|
||||||
\note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
|
\note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
|
||||||
|
|
||||||
@ -780,6 +781,7 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian
|
|||||||
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
|
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
|
||||||
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
|
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
|
||||||
Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
|
Unicode string, the second call to \c "ProcessWork" will contain one string and one byte array).
|
||||||
|
See call() for the same example in blocking (synchronous) calls.
|
||||||
|
|
||||||
\note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
|
\note Before Qt 5.14, this function accepted a maximum of just eight (8) arguments.
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user