diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-29 18:12:51 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-15 02:08:39 +0000 |
| commit | 6734c50a9eefa51f693e3d799d7b18fba9b7da04 (patch) | |
| tree | 2eef2259c9928e04bef0f027dc66aae2546330d9 /src/dbus/qdbusintegrator.cpp | |
| parent | 42858a9e88db6006ab541f3077f033415386400d (diff) | |
Remove superfluous code in QDBusConnectionPrivate::sendWithReply
No need to check for the local loop if that's the first thing
QDBusConnectionPrivate::sendWithReplyAsync will do. The side effect is
that this now allocates memory for the QDBusPendingCallPrivate object,
but loopback messages aren't that common to be worth the special casing.
Task-number: QTBUG-43585
Change-Id: Ic5d393bfd36e48a193fcffff13b73756ab802ba2
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index e87ae5b29d..8cffe4d706 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1969,12 +1969,6 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, { QDBusBlockingCallWatcher watcher(message); - checkThread(); - if ((sendMode == QDBus::BlockWithGui || sendMode == QDBus::Block) - && isServiceRegisteredByThread(message.service())) - // special case for synchronous local calls - return sendWithReplyLocal(message); - QDBusPendingCallPrivate *pcall = sendWithReplyAsync(message, 0, 0, 0, timeout); Q_ASSERT(pcall); |