From 11afecbaa700a03ab1e307f6096e0a185667bb6c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 21 Nov 2012 16:30:14 +0100 Subject: Use QT_STRINGIFY in qobjectdefs.h Since it is declared in qglobal.h, we do not need to re-implement the hack here. QTOSTRING was only defined if QT_NO_META_MACROS was defined, so practically not safe to use in other places. Change-Id: Ie5b07d0fa7537ba79380b882a4c822583ee5635e Reviewed-by: Thiago Macieira --- src/corelib/kernel/qobjectdefs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 0ae5d4bc29..78a6827b63 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -209,10 +209,8 @@ private: Q_CORE_EXPORT const char *qFlagLocation(const char *method); #ifndef QT_NO_META_MACROS -#define QTOSTRING_HELPER(s) #s -#define QTOSTRING(s) QTOSTRING_HELPER(s) #ifndef QT_NO_DEBUG -# define QLOCATION "\0" __FILE__ ":" QTOSTRING(__LINE__) +# define QLOCATION "\0" __FILE__ ":" QT_STRINGIFY(__LINE__) # ifndef QT_NO_KEYWORDS # define METHOD(a) qFlagLocation("0"#a QLOCATION) # endif -- cgit v1.2.3