diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-02-26 14:15:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 09:39:23 +0100 |
| commit | c474f404526d82f74e3272e1debbc7f50679e9eb (patch) | |
| tree | 1271d851c54ad66e5ed5e1fd0e6a389a0b285cc6 | |
| parent | 8b0868bb17690fa601b3b0cb8c630ac7a178062a (diff) | |
Add QDBusReply::error() const.
The accessor was missing.
Task-number: QTBUG-29917
Change-Id: Ie6759a1120bc9ed6550c271df35f276e15b4eb79
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/dbus/qdbusreply.h | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 7b4a4ebcf8..4567c80131 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -111,6 +111,7 @@ public: inline bool isValid() const { return !m_error.isValid(); } inline const QDBusError& error() { return m_error; } + inline const QDBusError& error() const { return m_error; } inline Type value() const { @@ -182,6 +183,7 @@ public: inline bool isValid() const { return !m_error.isValid(); } inline const QDBusError& error() { return m_error; } + inline const QDBusError& error() const { return m_error; } private: QDBusError m_error; diff --git a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp index 5e60e468a2..8b0fa92adf 100644 --- a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp +++ b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp @@ -97,6 +97,7 @@ private slots: void simpleTypes(); void complexTypes(); void wrongTypes(); + void error(); }; class TypesInterface: public QDBusAbstractAdaptor @@ -372,6 +373,30 @@ void tst_QDBusReply::wrongTypes() QVERIFY(!rstruct.isValid()); } +void tst_QDBusReply::error() +{ + { + // Wrong type + QDBusReply<bool> result = iface->call(QDBus::BlockWithGui, "retrieveInt"); + QVERIFY(result.error().isValid()); + } + { + // Wrong type, const version + const QDBusReply<bool> result = iface->call(QDBus::BlockWithGui, "retrieveInt"); + QVERIFY(result.error().isValid()); + } + { + // Ok type + QDBusReply<void> result = iface->call(QDBus::BlockWithGui, "retrieveInt"); + QVERIFY(!result.error().isValid()); + } + { + // Ok type, const version + const QDBusReply<void> result = iface->call(QDBus::BlockWithGui, "retrieveInt"); + QVERIFY(!result.error().isValid()); + } +} + QTEST_MAIN(tst_QDBusReply) #include "tst_qdbusreply.moc" |