summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestcase.h
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2016-12-05 13:18:57 +0100
committerKevin Funk <kevin.funk@kdab.com>2016-12-06 15:32:00 +0000
commit6ff4d8c61afc2ede16d60195dc30ea6538e2d5c9 (patch)
tree17f1f83f0431b959c7d3791fdfee1fbcf9bce5cf /src/testlib/qtestcase.h
parent82a6f38873b75c75b345c4eea1a378fd867f5e69 (diff)
QTest::addColumn: Use nullptr instead of 0
Fixes -Wzero-as-null-pointer-constant warning in user code Change-Id: I59492633d14947e90e91efa7c4fcd14c33fa413e Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
-rw-r--r--src/testlib/qtestcase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index c3ccfc3f8c..4c226830e9 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -309,7 +309,7 @@ namespace QTest
Q_TESTLIB_EXPORT void addColumnInternal(int id, const char *name);
template <typename T>
- inline void addColumn(const char *name, T * = 0)
+ inline void addColumn(const char *name, T * = nullptr)
{
typedef std::is_same<T, const char*> QIsSameTConstChar;
Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format.");