Make QTest::qWarn() use __FILE__ and __LINE__.

This change makes QTest::qWarn() consistent with similar testlib
functions, which take __FILE__ and __LINE__.

Change-Id: I12977cb30672899ab38877b4a656f0cc0c7ea02c
Reviewed-on: http://codereview.qt-project.org/3559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index d4703b7b3d..898e46de61 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1963,9 +1963,9 @@ bool QTest::qExpectFail(const char *dataIndex, const char *comment,
 
 /*! \internal
  */
-void QTest::qWarn(const char *message)
+void QTest::qWarn(const char *message, const char *file, int line)
 {
-    QTestLog::warn(message);
+    QTestLog::warn(message, file, line);
 }
 
 /*!
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index b08b22e52b..b3ac5f0c4f 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -109,7 +109,7 @@ do {\
 } while (0)
 
 #define QWARN(msg)\
-    QTest::qWarn(msg)
+    QTest::qWarn(msg, __FILE__, __LINE__)
 
 class QObject;
 class QTestData;
@@ -139,7 +139,7 @@ namespace QTest
     Q_TESTLIB_EXPORT void qSkip(const char *message, SkipMode mode, const char *file, int line);
     Q_TESTLIB_EXPORT bool qExpectFail(const char *dataIndex, const char *comment, TestFailMode mode,
                            const char *file, int line);
-    Q_TESTLIB_EXPORT void qWarn(const char *message);
+    Q_TESTLIB_EXPORT void qWarn(const char *message, const char *file = 0, int line = 0);
     Q_TESTLIB_EXPORT void ignoreMessage(QtMsgType type, const char *message);
 
     Q_TESTLIB_EXPORT void *qData(const char *tagName, int typeId);
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index f3b416d3d1..acd1a49d44 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -385,12 +385,12 @@ bool QTestLog::loggerUsingStdout()
     return QTest::loggerUsingStdout;
 }
 
-void QTestLog::warn(const char *msg)
+void QTestLog::warn(const char *msg, const char *file, int line)
 {
     QTEST_ASSERT(msg);
 
     if (QTest::TestLoggers::loggerCount() > 0)
-        QTest::TestLoggers::addMessage(QAbstractTestLogger::Warn, msg);
+        QTest::TestLoggers::addMessage(QAbstractTestLogger::Warn, msg, file, line);
 }
 
 void QTestLog::info(const char *msg, const char *file, int line)
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index fe37469dc6..692a36a4e6 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -77,7 +77,7 @@ public:
     static int unhandledIgnoreMessages();
     static void printUnhandledIgnoreMessages();
 
-    static void warn(const char *msg);
+    static void warn(const char *msg, const char *file, int line);
     static void info(const char *msg, const char *file, int line);
 
     static void startLogging();