summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-03-07 14:44:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-21 11:43:23 +0100
commit054b69c963990f4e62a1eee8a475b228944369c9 (patch)
tree5f03b18bf8b32295d4ed6ddb4071ecf083c81027
parentbfd2b30faf3da224e5bc5f86d13a57524cd6b2b3 (diff)
testlib: Remove obsolete internal compare_helper overload.
Change-Id: Ic98faf360a713ac698f9bf1ff8aaad5a4c5c176b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--src/testlib/qtestcase.cpp15
-rw-r--r--src/testlib/qtestcase.h2
-rw-r--r--src/testlib/qtestresult.cpp9
-rw-r--r--src/testlib/qtestresult_p.h1
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,