Changeset 755

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

Location:

cpp/frams

Files:

• _demos/paramtree_print.cpp (modified) (2 diffs)
• _demos/paramtree_print.h (modified) (1 diff)
• param/paramtree.cpp (modified) (4 diffs)
• param/paramtree.h (modified) (2 diffs)

cpp/frams/_demos/paramtree_print.cpp

@@ -20 +20 @@
 #endif
 
-static void printLines(ParamTree::Node *n, bool first = true)
+static void printLines(ParamTree::ParamTreeNode *n, bool first = true)
 {
         if (n->parent)
@@ -29 +29 @@
 }
 
-void printTree(ParamTree::Node *n)
+void printTree(ParamTree::ParamTreeNode *n)
 {
         while (n != NULL)

cpp/frams/_demos/paramtree_print.h

@@ -4 +4 @@
 #include <frams/param/paramtree.h>
 
-void printTree(ParamTree::Node *n);
+void printTree(ParamTree::ParamTreeNode *n);
 
 #endif

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;

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);