From 4e6b696c085b4475dd3429822aed6839ac343760 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 5 Mar 2013 13:31:57 +0100 Subject: [PATCH] Change template parameter name of qt_check_for_QOBJECT_macro 'T' is a fairly common name for template parameter. So if we use it in Q_OBJECT, it means you cannot use it as a template parameter name of the object itself (otherwise it does not compile as it shadow a template parameter) Use a more explicit name instead Change-Id: Id317c5b11d87f370eed6d1dc0b0142c9eb4994db Reviewed-by: Thiago Macieira --- src/corelib/kernel/qobjectdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index c489344b10..dd10e70609 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -125,7 +125,7 @@ class QString; /* qmake ignore Q_OBJECT */ #define Q_OBJECT_CHECK \ - template inline void qt_check_for_QOBJECT_macro(const T &_q_argument) const \ + template inline void qt_check_for_QOBJECT_macro(const ThisObject &_q_argument) const \ { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i + 1; } template