diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-01-13 13:26:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 03:54:46 +0100 |
| commit | f323c700b8f78e6d5486522371603f45b058e96d (patch) | |
| tree | 4e388b03d466172a4eb5315d09570e37c90b97c2 | |
| parent | 7934c75f844dd9a42315b18870cc72dd3e17191a (diff) | |
Eliminate QTestResult::ignoreMessage().
The removed function was just a wrapper around QTestLog::ignoreMessage()
and was only called twice (once in qtestcase.cpp and once in
qtdeclarative). Better to just call the desired function directly and
avoid the indirection.
Change-Id: Ib900f35f5d584e8f323cef9b0e7b4f8a507c199e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestresult.cpp | 5 | ||||
| -rw-r--r-- | src/testlib/qtestresult_p.h | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 666a0e880f..c6e04caa58 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2118,7 +2118,7 @@ void QTest::qWarn(const char *message, const char *file, int line) */ void QTest::ignoreMessage(QtMsgType type, const char *message) { - QTestResult::ignoreMessage(type, message); + QTestLog::ignoreMessage(type, message); } /*! \internal diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 9b5f25bccb..59ba8ff73c 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -313,11 +313,6 @@ int QTestResult::skipCount() return QTestLog::skipCount(); } -void QTestResult::ignoreMessage(QtMsgType type, const char *msg) -{ - QTestLog::ignoreMessage(type, msg); -} - bool QTestResult::testFailed() { return QTest::failed; diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index 058a74aacd..d097666f5a 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -80,8 +80,6 @@ public: static int failCount(); static int skipCount(); - static void ignoreMessage(QtMsgType type, const char *msg); - static void addFailure(const char *message, const char *file, int line); static bool compare(bool success, const char *msg, const char *file, int line); static bool compare(bool success, const char *msg, char *val1, char *val2, |