Changeset 734 for cpp

Timestamp:

02/15/18 00:44:00 (7 years ago)

Author:

Maciej Komosinski

Message:

SString -> std::string

Location:

cpp/frams/param

Files:

• paramtree.cpp (modified) (4 diffs)
• paramtree.h (modified) (3 diffs)

cpp/frams/param/paramtree.cpp

@@ +1 @@
+// This file is a part of Framsticks SDK.  http://www.framsticks.com/
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// See LICENSE.txt for details.
+
 #include "paramtree.h"
 
-ParamTree::Node *ParamTree::addNode(ParamTree::Node* parent, const SString& name, int group)
+ParamTree::Node *ParamTree::addNode(ParamTree::Node* parent, const string& name, int group)
 {
         std::shared_ptr<Node> new_it(new Node(this, parent, name, group));
@@ -21 +25 @@
 }
 
-ParamTree::Node *ParamTree::findNode(ParamTree::Node *parent, const SString& name)
+ParamTree::Node *ParamTree::findNode(ParamTree::Node *parent, const string& name)
 {
         for (ParamTree::Node *it = parent->first_child.get(); it != NULL; it = it->next_sibling.get())
@@ -53 +57 @@
                         if (colons != level) continue;
 
-                        SString name = grname; // "abc:def:ghi"
+                        string name = grname; // "abc:def:ghi"
                         Node *parentnode = &root;
                         int i = 0;
@@ -59 +63 @@
                         for (int haslevel = 0; haslevel < level; haslevel++)
                         {
-                                i = name.indexOf(':', 0); // can't fail!
+                                i = name.find(':'); // always succeeds because we counted the colons before
                                 // "na:me" -> prefix="na",name="me"
-                                SString prefix = name.substr(0, i);
+                                string prefix = name.substr(0, i);
                                 // search for parent node in listview ('prefix')
                                 Node *it = findNode(parentnode, prefix);

cpp/frams/param/paramtree.h

@@ +1 @@
+// This file is a part of Framsticks SDK.  http://www.framsticks.com/
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// See LICENSE.txt for details.
+
 #ifndef _PARAMTREE_H_
 #define _PARAMTREE_H_
@@ -38 +42 @@
                 ParamTree *tree;
                 Node *parent;
-                SString name; //path component name
+                string name; //path component name
                 int group_index; //original group index or -1 for dummy nodes
                 NodePtr first_child;
                 NodePtr next_sibling;
 
-                Node(ParamTree *_tree = NULL, Node *_parent = NULL, const SString &_name = "", int _group_index = -1)
+                Node(ParamTree *_tree = NULL, Node *_parent = NULL, const string &_name = "", int _group_index = -1)
                         :tree(_tree), parent(_parent), name(_name), group_index(_group_index) {}
         };
@@ -49 +53 @@
         ParamInterface π
 
-        Node *addNode(Node* parent, const SString &name, int group);
-        Node *findNode(Node *parent, const SString& name);
+        Node *addNode(Node* parent, const string &name, int group);
+        Node *findNode(Node *parent, const string& name);
 
         ParamTree(ParamInterface &_pi);