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

testlib: Remove obsolete internal compare_helper overload.

Browse Source 
Change-Id: Ic98faf360a713ac698f9bf1ff8aaad5a4c5c176b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-03-07 14:44:03 +10:00 committed by Qt by Nokia
parent bfd2b30faf
commit 054b69c963
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/testlib/qtestcase.cpp
View File

@ -2440,21 +2440,6 @@ QObject *QTest::testObject()
return currentTestObject;
}
/*! \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.

2
src/testlib/qtestcase.h
View File

@ -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,

9
src/testlib/qtestresult.cpp
View File

@ -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,

1
src/testlib/qtestresult_p.h
View File

@ -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,