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

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.cpp (modified) (4 diffs)

cpp/frams/param/paramtree.cpp

@@ -5 +5 @@
 #include "paramtree.h"
 
-ParamTree::Node *ParamTree::addNode(ParamTree::Node* parent, const string& name, int group)
+ParamTree::ParamTreeNode *ParamTree::addNode(ParamTree::ParamTreeNode* parent, const string& name, int group)
 {
-        std::shared_ptr<Node> new_it(new Node(this, parent, name, group));
-        Node *last = parent->first_child.get();
+        std::shared_ptr<ParamTreeNode> new_it(new ParamTreeNode(this, parent, name, group));
+        ParamTreeNode *last = parent->first_child.get();
         if (last)
         {
-                Node *next;
+                ParamTreeNode *next;
                 while (true)
                 {
@@ -25 +25 @@
 }
 
-ParamTree::Node *ParamTree::findNode(ParamTree::Node *parent, const string& name)
+ParamTree::ParamTreeNode *ParamTree::findNode(ParamTree::ParamTreeNode *parent, const string& name)
 {
-        for (ParamTree::Node *it = parent->first_child.get(); it != NULL; it = it->next_sibling.get())
+        for (ParamTree::ParamTreeNode *it = parent->first_child.get(); it != NULL; it = it->next_sibling.get())
                 if (it->name == name) return it;
         return NULL;
@@ -58 +58 @@
 
                         string name = grname; // "abc:def:ghi"
-                        Node *parentnode = &root;
+                        ParamTreeNode *parentnode = &root;
                         int i = 0;
                         // search for parentnode for level 'level'
@@ -67 +67 @@
                                 string prefix = name.substr(0, i);
                                 // search for parent node in listview ('prefix')
-                                Node *it = findNode(parentnode, prefix);
+                                ParamTreeNode *it = findNode(parentnode, prefix);
                                 name = name.substr(i + 1);
                                 if (it) parentnode = it;