diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nodes/qnode.h | 6 | ||||
| -rw-r--r-- | src/core/services/qservicelocator.h | 4 | ||||
| -rw-r--r-- | src/input/q3dkeyevent.h | 2 |
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; |