From 9e110585d8f6f99ea1d149a8f8f76d2a218d5986 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 16 Feb 2015 13:59:24 -0800 Subject: headersclean: don't shadow members with variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qnode.h:60:16: error: declaration of ‘clone’ shadows a member of 'this' [-Werror=shadow] Change-Id: I1a800c709d3543699131ffff13c381333ae8cec0 Reviewed-by: Paul Lemire --- src/core/nodes/qnode.h | 6 +++--- src/core/services/qservicelocator.h | 4 ++-- src/input/q3dkeyevent.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 775322363..e61f30edb 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -57,9 +57,9 @@ typedef QSharedPointer QNodePtr; #define QT3D_CLONEABLE(Class) \ QNode *doClone() const Q_DECL_OVERRIDE { \ - Class *clone = new Class; \ - clone->copy(this); \ - return clone; \ + Class *clone_ = new Class; \ + clone_->copy(this); \ + return clone_; \ } class QT3DCORESHARED_EXPORT QNode : public QObject diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator.h index 321ada9bf..ab8ddb413 100644 --- a/src/core/services/qservicelocator.h +++ b/src/core/services/qservicelocator.h @@ -91,8 +91,8 @@ public: template T *service(int serviceType) { - QAbstractServiceProvider *service = _q_getServiceHelper(serviceType); - return static_cast(service); + QAbstractServiceProvider *service_ = _q_getServiceHelper(serviceType); + return static_cast(service_); } // Convenience accessors for Qt3D provided services diff --git a/src/input/q3dkeyevent.h b/src/input/q3dkeyevent.h index a3cd00339..21f3e4b3c 100644 --- a/src/input/q3dkeyevent.h +++ b/src/input/q3dkeyevent.h @@ -74,7 +74,7 @@ public: inline bool isAccepted() const { return m_event.isAccepted(); } inline void setAccepted(bool accepted) { m_event.setAccepted(accepted); } inline QEvent::Type type() const { return m_event.type(); } - Q_INVOKABLE bool matches(QKeySequence::StandardKey key) const { return m_event.matches(key); } + Q_INVOKABLE bool matches(QKeySequence::StandardKey key_) const { return m_event.matches(key_); } private: QKeyEvent m_event; -- cgit v1.2.3