Changeset 755 for cpp/frams/param/paramtree.h

Timestamp:

03/14/18 23:52:40 (6 years ago)

Author:

Maciej Komosinski

Message:

Renamed ParamTree::Node -> ParamTree::ParamTreeNode? to avoid name conflicts with js

File:

• cpp/frams/param/paramtree.h (modified) (2 diffs)

cpp/frams/param/paramtree.h

@@ -35 +35 @@
 {
 public:
-        class Node;
-        typedef std::shared_ptr<Node> NodePtr;
-        class Node
+        class ParamTreeNode;
+        typedef std::shared_ptr<ParamTreeNode> NodePtr;
+        class ParamTreeNode
         {
         public:
                 ParamTree *tree;
-                Node *parent;
+                ParamTreeNode *parent;
                 string name; //path component name
                 int group_index; //original group index or -1 for dummy nodes
@@ -47 +47 @@
                 NodePtr next_sibling;
 
-                Node(ParamTree *_tree = NULL, Node *_parent = NULL, const string &_name = "", int _group_index = -1)
+                ParamTreeNode(ParamTree *_tree = NULL, ParamTreeNode *_parent = NULL, const string &_name = "", int _group_index = -1)
                         :tree(_tree), parent(_parent), name(_name), group_index(_group_index) {}
         };
-        Node root;
+        ParamTreeNode root;
         ParamInterface &pi;
 
-        Node *addNode(Node* parent, const string &name, int group);
-        Node *findNode(Node *parent, const string& name);
+        ParamTreeNode *addNode(ParamTreeNode* parent, const string &name, int group);
+        ParamTreeNode *findNode(ParamTreeNode *parent, const string& name);
 
         ParamTree(ParamInterface *_pi);