diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2013-03-05 13:31:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-07 16:28:44 +0200 |
commit | 4e6b696c085b4475dd3429822aed6839ac343760 (patch) | |
tree | 99c721ab21c0c15e92be8eed79f5e7371fa33f8c | |
parent | 5dd2713c8ba98e06ae5c4f3da44b2ed73121d247 (diff) |
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 <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <typename T> inline void qt_check_for_QOBJECT_macro(const T &_q_argument) const \ + template <typename ThisObject> inline void qt_check_for_QOBJECT_macro(const ThisObject &_q_argument) const \ { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i + 1; } template <typename T> |