Changeset 973 for cpp/frams/param/multiparamload.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/param/multiparamload.cpp (modified) (4 diffs)

cpp/frams/param/multiparamload.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -158 +158 @@
                 }
                 buf = trim(buf);
-                if (buf.len() == 0)
-                        unexpected_line = 0;
-                else if ((buf.len() > 1) && (buf[buf.len() - 1] == ':'))
+                if (buf.length() == 0)
+                        unexpected_line = 0;
+                else if ((buf.length() > 1) && (buf[buf.length() - 1] == ':'))
                 {
                         unexpected_line = 0;
                         lastunknown = 0;
-                        lastunknown = buf.substr(0, buf.len() - 1);
+                        lastunknown = buf.substr(0, buf.length() - 1);
                         lastobject.setEmpty();
                         FOREACH(ExtObject*, o, objects)
@@ -193 +193 @@
                                         thisfilename ? SString::sprintf(" while reading '%s'", thisfilename).c_str() : "");
                         }
-                                break;
+                        break;
 
                         case 1:
@@ -293 +293 @@
                 if (stat == OnError)
                 {
-                abort();
-                return 0;
+                        abort();
+                        return 0;
                 }
         return 1;