1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QDBusReply::error() const.

Browse Source 
The accessor was missing.

Task-number: QTBUG-29917
Change-Id: Ie6759a1120bc9ed6550c271df35f276e15b4eb79
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jędrzej Nowacki 2013-02-26 14:15:03 +01:00 committed by The Qt Project
parent 8b0868bb17
commit c474f40452
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/qdbusreply.h
View File

@ -111,6 +111,7 @@ public:
inline bool isValid() const { return !m_error.isValid(); } inline bool isValid() const { return !m_error.isValid(); }
inline const QDBusError& error() { return m_error; } inline const QDBusError& error() { return m_error; }
inline const QDBusError& error() const { return m_error; }
inline Type value() const inline Type value() const
{ {
@ -182,6 +183,7 @@ public:
inline bool isValid() const { return !m_error.isValid(); } inline bool isValid() const { return !m_error.isValid(); }
inline const QDBusError& error() { return m_error; } inline const QDBusError& error() { return m_error; }
inline const QDBusError& error() const { return m_error; }
private: private:
QDBusError m_error; QDBusError m_error;

25
tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp
View File

@ -97,6 +97,7 @@ private slots:
void simpleTypes(); void simpleTypes();
void complexTypes(); void complexTypes();
void wrongTypes(); void wrongTypes();
void error();
}; };
class TypesInterface: public QDBusAbstractAdaptor class TypesInterface: public QDBusAbstractAdaptor
@ -372,6 +373,30 @@ void tst_QDBusReply::wrongTypes()
QVERIFY(!rstruct.isValid()); 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) QTEST_MAIN(tst_QDBusReply)
#include "tst_qdbusreply.moc" #include "tst_qdbusreply.moc"