Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

optimize QDBusConnection methods

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-07-16 12:52:17 +00:00
parent 3104a28631
commit 5812411d37
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dbus/qdbusconnection.cpp
View file

@ -454,11 +454,10 @@ void QDBusConnection::disconnectFromPeer(const QString &name)
*/
bool QDBusConnection::send(const QDBusMessage &message) const
{
if (!d || !d->connection) {
QDBusError err = QDBusError(QDBusError::Disconnected,
QLatin1String("Not connected to D-BUS server"));
if (Q_UNLIKELY(!d || !d->connection)) {
if (d)
d->lastError = err;
d->lastError = QDBusError(QDBusError::Disconnected,
QLatin1String("Not connected to D-BUS server"));
return false;
}
return d->send(message) != 0;
@ -487,14 +486,13 @@ bool QDBusConnection::callWithCallback(const QDBusMessage &message, QObject *rec
const char *returnMethod, const char *errorMethod,
int timeout) const
{
if (!d || !d->connection) {
QDBusError err = QDBusError(QDBusError::Disconnected,
QLatin1String("Not connected to D-BUS server"));
if (Q_UNLIKELY(!d || !d->connection)) {
if (d)
d->lastError = err;
d->lastError = QDBusError(QDBusError::Disconnected,
QLatin1String("Not connected to D-BUS server"));
return false;
}
return d->sendWithReplyAsync(message, receiver, returnMethod, errorMethod, timeout) != 0;
return (d->sendWithReplyAsync(message, receiver, returnMethod, errorMethod, timeout) != 0);
}
/*!
@ -545,7 +543,7 @@ bool QDBusConnection::callWithCallback(const QDBusMessage &message, QObject *rec
*/
QDBusMessage QDBusConnection::call(const QDBusMessage &message, QDBus::CallMode mode, int timeout) const
{
if (!d || !d->connection) {
if (Q_UNLIKELY(!d || !d->connection)) {
QDBusError err = QDBusError(QDBusError::Disconnected,
QLatin1String("Not connected to D-Bus server"));
if (d)
@ -576,7 +574,7 @@ QDBusMessage QDBusConnection::call(const QDBusMessage &message, QDBus::CallMode
*/
QDBusPendingCall QDBusConnection::asyncCall(const QDBusMessage &message, int timeout) const
{
if (!d || !d->connection) {
if (Q_UNLIKELY(!d || !d->connection)) {
return QDBusPendingCall(Q_NULLPTR); // null pointer -> disconnected
}