Changeset 973 for cpp/frams/model/modelparts.cpp

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

File:

• cpp/frams/model/modelparts.cpp (modified) (6 diffs)

cpp/frams/model/modelparts.cpp

@@ -149 +149 @@
         SString t;
         t = getDescription();
-        if (t.len()) t += "\n\n";
+        if (t.length()) t += "\n\n";
         t += "Characteristics:\n";
         if (getPreferredInputs())
@@ -171 +171 @@
         if (p.getPropCount())
         {
-                if (t.len()) t += "\n\n";
+                if (t.length()) t += "\n\n";
                 t += "Properties:\n";
                 const char *h;
@@ -341 +341 @@
 {
         SString ret = getClassName();
-        if (myclassparams.len()) { if (!ret.len()) ret = "N"; ret += ":"; ret += myclassparams; }
+        if (myclassparams.length()) { if (!ret.length()) ret = "N"; ret += ":"; ret += myclassparams; }
         return ret;
 }
@@ -372 +372 @@
 int Neuro::addInput(Neuro *child, double weight, const SString *info)
 {
-        inputs += NInput(child, weight, (info && (info->len())) ? new SString(*info) : 0);
+        inputs += NInput(child, weight, (info && (info->length())) ? new SString(*info) : 0);
         child->parentcount++;
         if (child->parentcount == 1) { child->parent = this; }
@@ -759 +759 @@
                 ParamEntry entries[] = {
                  { "class", 2, 0, "neuro class", "s", GETSET(neuroclass) },
-                 { "liveNeuro", 2, 1, "live Neuro object", "oNeuro", GETONLY(liveNeuro) }};
+                 { "liveNeuro", 2, 1, "live Neuro object", "oNeuro", GETONLY(liveNeuro) } };
 #undef FIELDSTRUCT
-                for(auto& e : entries) add(&e);
+                for (auto& e : entries) add(&e);
 
 #define FIELDSTRUCT Neuro
@@ -804 +804 @@
 {
 #ifndef SDK_WITHOUT_FRAMS
-        NeuroNetImpl::getLiveNeuroObject(this,ret);
+        NeuroNetImpl::getLiveNeuroObject(this, ret);
 #endif
 }