path: root/src/dbus/qdbuspendingreply.h
diff options
authorThiago Macieira <>2013-01-11 11:25:28 -0800
committerThe Qt Project <>2013-01-14 13:03:50 +0100
commitdc131e3a5378d84026941e6626db524688b988f4 (patch)
treed1a172da2b4b87f046b08508e7d333e070ccb1e9 /src/dbus/qdbuspendingreply.h
parent9110d4f1ed65f02d8bbcb81ed0634d5a38c2bf9f (diff)
Make QDBusPendingReply behave like QDBusReply when dealing with errors
QDBusReply allows one to extract a QVariant and the type reply from an error reply and getting a default-constructed value. This is useful when a valid reply can never contain the default-constructed value (0, false, empty strings, empty arrays, etc.), so it simplifies error checking. More importantly, qdbusxml2cpp was changed a while ago from generating QDBusReply to generating QDBusPendingReply, so we need to have the same behavior. Task-number: QTBUG-29046 Change-Id: Ia873b9fd4311c0d4e94f0ef623ba405c20bc0e8c Reviewed-by: Olivier Goffart <>
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index 47a82363db..6511d2df2c 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -168,9 +168,7 @@ public:
template<int Index> inline
const typename Select<Index>::Type argumentAt() const
- // static assert?
- Q_ASSERT_X(Index < count() && Index >= 0, "QDBusPendingReply::argumentAt",
- "Index out of bounds");
+ Q_STATIC_ASSERT_X(Index >= 0 && Index < Count, "Index out of bounds");
typedef typename Select<Index>::Type ResultType;
return qdbus_cast<ResultType>(argumentAt(Index), 0);