summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-02-16 13:59:24 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-02-19 05:11:26 +0000
commit9e110585d8f6f99ea1d149a8f8f76d2a218d5986 (patch)
tree0f5d3f7e94d675a8bd85bf6347caa2cea617d7f3 /src
parent337655fa62e75002ec0858368d79e2dd0cde9470 (diff)
headersclean: don't shadow members with variables
qnode.h:60:16: error: declaration of ‘clone’ shadows a member of 'this' [-Werror=shadow] Change-Id: I1a800c709d3543699131ffff13c381333ae8cec0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/nodes/qnode.h6
-rw-r--r--src/core/services/qservicelocator.h4
-rw-r--r--src/input/q3dkeyevent.h2
3 files changed, 6 insertions, 6 deletions
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<QNode> 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<class T>
T *service(int serviceType)
{
- QAbstractServiceProvider *service = _q_getServiceHelper(serviceType);
- return static_cast<T *>(service);
+ QAbstractServiceProvider *service_ = _q_getServiceHelper(serviceType);
+ return static_cast<T *>(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;