diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-29 08:54:49 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-30 21:22:20 +0000 |
commit | ffc74e6d7031015b18b4b9a695b13e25a325979a (patch) | |
tree | 0924874988dcd9dbc09e53783ef8fc27245ac01e /src/corelib/kernel/qobjectdefs.h | |
parent | 0b440e1498699d0fa37114453dce3f463f0752fb (diff) |
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 <mw_triad@users.sourceforge.net>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
-rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |