AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate QTestResult::ignoreMessage().

Browse Source 
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>
This commit is contained in:
Jason McDonald 2012-01-13 13:26:04 +10:00 committed by Qt by Nokia
parent 7934c75f84
commit f323c700b8
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtestcase.cpp
View File

@ -2118,7 +2118,7 @@ void QTest::qWarn(const char *message, const char *file, int line)
*/ */
void QTest::ignoreMessage(QtMsgType type, const char *message) void QTest::ignoreMessage(QtMsgType type, const char *message)
{ {
QTestResult::ignoreMessage(type, message); QTestLog::ignoreMessage(type, message);
} }
/*! \internal /*! \internal

5
src/testlib/qtestresult.cpp
View File

@ -313,11 +313,6 @@ int QTestResult::skipCount()
return QTestLog::skipCount(); return QTestLog::skipCount();
} }
void QTestResult::ignoreMessage(QtMsgType type, const char *msg)
{
QTestLog::ignoreMessage(type, msg);
}
bool QTestResult::testFailed() bool QTestResult::testFailed()
{ {
return QTest::failed; return QTest::failed;

2
src/testlib/qtestresult_p.h
View File

@ -80,8 +80,6 @@ public:
static int failCount(); static int failCount();
static int skipCount(); static int skipCount();
static void ignoreMessage(QtMsgType type, const char *msg);
static void addFailure(const char *message, const char *file, int line); 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, const char *file, int line);
static bool compare(bool success, const char *msg, char *val1, char *val2, static bool compare(bool success, const char *msg, char *val1, char *val2,