diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-29 21:58:04 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-30 07:05:46 +0100 |
| commit | c2ba286730162091865ea32af648579c7d662d01 (patch) | |
| tree | 9d40f6dc4885a2a69d0e5d221e003a0b376d49f7 /src/core/nodes | |
| parent | 04628d6221c396f37e3f4e25d7c8f78f6b5b61b9 (diff) | |
Fix strict-warning header compilation
nodevisitor.h:64:5: error: declaration of ‘rootNode’ shadows a member of 'this' [-Werror=shadow]
Change-Id: I0274c53037c4496b53340be510b473bd22ac8b90
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/nodes')
| -rw-r--r-- | src/core/nodes/nodevisitor.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/nodes/nodevisitor.h b/src/core/nodes/nodevisitor.h index b5a5b16b4..12d8c673f 100644 --- a/src/core/nodes/nodevisitor.h +++ b/src/core/nodes/nodevisitor.h @@ -60,15 +60,15 @@ public: virtual ~NodeVisitor(); template<typename NodeVisitorFunc, typename EntityVisitorFunc> - void traverse(QNode *rootNode, NodeVisitorFunc fN, EntityVisitorFunc fE) + void traverse(QNode *rootNode_, NodeVisitorFunc fN, EntityVisitorFunc fE) { - startTraversing(rootNode, createFunctor(fN), createFunctor(fE)); + startTraversing(rootNode_, createFunctor(fN), createFunctor(fE)); } template<typename Obj, typename NodeVisitorFunc, typename EntityVisitorFunc> - void traverse(QNode *rootNode, Obj *instance, NodeVisitorFunc fN, EntityVisitorFunc fE) + void traverse(QNode *rootNode_, Obj *instance, NodeVisitorFunc fN, EntityVisitorFunc fE) { - startTraversing(rootNode, createFunctor(instance, fN), createFunctor(instance, fE)); + startTraversing(rootNode_, createFunctor(instance, fN), createFunctor(instance, fE)); } QNode *rootNode() const; @@ -81,15 +81,15 @@ private: bool m_traverseDisabled; template<typename NodeVisitorFunctor, typename EntityVisitorFunctor> - void startTraversing(QNode *rootNode, NodeVisitorFunctor fN, EntityVisitorFunctor fE) + void startTraversing(QNode *rootNode_, NodeVisitorFunctor fN, EntityVisitorFunctor fE) { - m_path = NodeList() << rootNode; - QEntity* rootEntity = qobject_cast<QEntity *>(rootNode); + m_path = NodeList() << rootNode_; + QEntity* rootEntity = qobject_cast<QEntity *>(rootNode_); if (rootEntity) visitEntity(rootEntity, fN, fE); else - visitNode(rootNode, fN, fE); + visitNode(rootNode_, fN, fE); } template<typename NodeVisitorFunctor, typename EntityVisitorFunctor> |