diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 15 | ||||
| -rw-r--r-- | src/testlib/qtestcase.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestresult.cpp | 9 | ||||
| -rw-r--r-- | src/testlib/qtestresult_p.h | 1 |
4 files changed, 0 insertions, 27 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 3075726cae..962814085f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2441,21 +2441,6 @@ QObject *QTest::testObject() } /*! \internal - */ -bool QTest::compare_helper(bool success, const char *msg, const char *file, int line) -{ - static bool warned = false; - if (!warned) { - warned = true; - QTest::qWarn("QTest::compare_helper(bool, const char *, const char *, int) is obsolete " - "and will soon be removed. Please update your code to use the other " - "version of this function."); - } - - return QTestResult::compare(success, msg, file, line); -} - -/*! \internal This function is called by various specializations of QTest::qCompare to decide whether to report a failure and to produce verbose test output. diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index acd494965e..661aaa08e8 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -198,8 +198,6 @@ namespace QTest Q_TESTLIB_EXPORT Qt::Key asciiToKey(char ascii); Q_TESTLIB_EXPORT char keyToAscii(Qt::Key key); - Q_TESTLIB_EXPORT bool compare_helper(bool success, const char *msg, const char *file, - int line); Q_TESTLIB_EXPORT bool compare_helper(bool success, const char *failureMsg, char *val1, char *val2, const char *actual, const char *expected, diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 9d62a9eb57..15630de627 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -247,15 +247,6 @@ bool QTestResult::verify(bool statement, const char *statementStr, return checkStatement(statement, msg, file, line); } -bool QTestResult::compare(bool success, const char *msg, const char *file, int line) -{ - if (QTestLog::verboseLevel() >= 2) { - QTestLog::info(msg, file, line); - } - - return checkStatement(success, msg, file, line); -} - bool QTestResult::compare(bool success, const char *failureMsg, char *val1, char *val2, const char *actual, const char *expected, diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index 1bf070f6cf..44294c3128 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -76,7 +76,6 @@ public: static void reset(); 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 *failureMsg, char *val1, char *val2, const char *actual, const char *expected, |