Changeset 988 for branches/Carsten_PtrWork/Source/System/Action/Base/OSGAction.cpp

Timestamp:

10/24/07 19:30:30 (11 months ago)

Author:

cneumann

Message:

fixed: FieldBundle? templates, pointers and fields updated

lots of compile errors - some remain

Files:

• branches/Carsten_PtrWork/Source/System/Action/Base/OSGAction.cpp (modified) (7 diffs)

branches/Carsten_PtrWork/Source/System/Action/Base/OSGAction.cpp

@@ -582 +582 @@
-/*! Simple tree traversal function. Calls func for every node encountered
- */
-
-ActionBase::ResultE traverse(const std::vector<NodePtr>
-                          TraverseEnterFunctor
+
+traverse(std::vector<NodePtr> const
+TraverseEnterFunctor      
-{
-    ActionBase::ResultE res = ActionBase::Continue;
@@ -604 +604 @@
-/*! Simple tree traversal function. Calls func for every node encountered
- */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    ActionBase::ResultE res = ActionBase::Continue;
@@ -631 +653 @@
-    leave after leaving.
- */
-
-ActionBase::ResultE traverse(const std::vector<NodePtr>
-                          TraverseEnterFunctor  enter
-                          TraverseLeaveFunctor  leave
+
+traverse(std::vector<NodePtr> const
+TraverseEnterFunctor        enterFunc
+TraverseLeaveFunctor        leaveFunc
-{
-    ActionBase::ResultE res = ActionBase::Continue;
@@ -643 +665 @@
-    for(; it != en; ++it)
-    {
-, leave
+Func, leaveFunc
-        
-        if(res == Action::Quit)
@@ -652 +674 @@
-}
-
+/*! Simple tree traversal function. Calls enter before entering a node,
+    leave after leaving.
+ */
+ActionBase::ResultE
+traverse(std::vector<NodeInternalRefPtr> const &nodeList, 
+         TraverseEnterFunctor                  enterFunc, 
+         TraverseLeaveFunctor                  leaveFunc )
+{
+    ActionBase::ResultE res = ActionBase::Continue;
+
+    std::vector<NodeInternalRefPtr>::const_iterator it = nodeList.begin();
+    std::vector<NodeInternalRefPtr>::const_iterator en = nodeList.end  ();
+    
+    for(; it != en; ++it)
+    {
+        res = traverse((*it), enterFunc, leaveFunc);
+        
+        if(res == Action::Quit)
+            break;
+    }
+        
+    return res;
+}
-                            
-/*! Simple tree traversal function. Calls enter before entering a node,
-    leave after leaving.
- */
-
-ActionBase::ResultE traverse(NodePtrConstArg      node, 
-
-
+Func
+Func
-{
-    ActionBase::ResultE res = ActionBase::Continue;
-    
-
+Func
-    
-    switch(res)
@@ -673 +717 @@
-        case ActionBase::Continue:  
-            res = traverse(node->getMFChildren()->getValues(), 
-
-   
+Func
+Func
-
-        default:                
@@ -680 +724 @@
-    }
-     
-
+Func
-                
-    return res;