diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-13 15:48:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 22:46:50 +0100 |
| commit | 882bf3475c8926abe62ed71e6719458b024caac0 (patch) | |
| tree | f227c1c660776da1ece9149b1c9e3ca5b27d8687 /src/dbus | |
| parent | 81157d23749f6ee1feef35a04fa9cc989ebc01eb (diff) | |
expand tabs and related whitespace fixes in *.{cpp,h,qdoc}
the diff -w for this commit is empty.
Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusdemarshaller.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp index 953b0f3d03..0728192748 100644 --- a/src/dbus/qdbusdemarshaller.cpp +++ b/src/dbus/qdbusdemarshaller.cpp @@ -244,9 +244,9 @@ QVariant QDBusDemarshaller::toVariantInternal() case DBUS_TYPE_BYTE: return QVariant::fromValue(toByte()); case DBUS_TYPE_INT16: - return QVariant::fromValue(toShort()); + return QVariant::fromValue(toShort()); case DBUS_TYPE_UINT16: - return QVariant::fromValue(toUShort()); + return QVariant::fromValue(toUShort()); case DBUS_TYPE_INT32: return toInt(); case DBUS_TYPE_UINT32: diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 77de09d197..7ec19d6fec 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -986,9 +986,9 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q fail = object->qt_metacall(QMetaObject::InvokeMetaMethod, slotIdx, params.data()) >= 0; QDBusConnectionPrivate::setSender(0); - // the object might be deleted in the slot - if (!ptr.isNull()) - QDBusContextPrivate::set(object, old); + // the object might be deleted in the slot + if (!ptr.isNull()) + QDBusContextPrivate::set(object, old); } // do we create a reply? Only if the caller is waiting for a reply and one hasn't been sent |