From ffc74e6d7031015b18b4b9a695b13e25a325979a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 29 Mar 2015 08:54:49 -0700 Subject: Use Q_NULLPTR for the null pointers used in macros User code should build with -Werror=zero-as-null-pointer-constant Task-number: QTBUG-45291 Change-Id: Iee8cbc07c4434ce9b560ffff13d0031979b4c2fe Reviewed-by: Matthew Woehlke Reviewed-by: Friedemann Kleint --- src/corelib/global/qlogging.h | 4 ++-- src/corelib/kernel/qobjectdefs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index b1f69b66b9..679afddb20 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -143,9 +143,9 @@ private: #define QT_MESSAGELOG_LINE __LINE__ #define QT_MESSAGELOG_FUNC Q_FUNC_INFO #else - #define QT_MESSAGELOG_FILE 0 + #define QT_MESSAGELOG_FILE Q_NULLPTR #define QT_MESSAGELOG_LINE 0 - #define QT_MESSAGELOG_FUNC 0 + #define QT_MESSAGELOG_FUNC Q_NULLPTR #endif #define qDebug QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC).debug diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 33c123be6c..31e8a670e9 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -97,9 +97,9 @@ class QString; #ifndef QT_NO_TRANSLATION // full set of tr functions # define QT_TR_FUNCTIONS \ - static inline QString tr(const char *s, const char *c = 0, int n = -1) \ + static inline QString tr(const char *s, const char *c = Q_NULLPTR, int n = -1) \ { return staticMetaObject.tr(s, c, n); } \ - QT_DEPRECATED static inline QString trUtf8(const char *s, const char *c = 0, int n = -1) \ + QT_DEPRECATED static inline QString trUtf8(const char *s, const char *c = Q_NULLPTR, int n = -1) \ { return staticMetaObject.tr(s, c, n); } #else // inherit the ones from QObject -- cgit v1.2.3