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 <[email protected]>
Alegriabaile · Jan 30, 2012 · f323c70 · f323c70
1 parent 7934c75
commit f323c70
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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
@@ -80,8 +80,6 @@ class Q_TESTLIB_EXPORT QTestResult
     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,