Changeset 720 for cpp/frams/param/syntparam.cpp

Timestamp:

01/14/18 11:24:22 (6 years ago)

Author:

Maciej Komosinski

Message:

Param::save2() renamed to saveSingleLine(); unified Param::load() so that it gets a single-line/multi-line format selector

File:

• cpp/frams/param/syntparam.cpp (modified) (1 diff)

cpp/frams/param/syntparam.cpp

@@ -8 +8 @@
 #include <math.h>
 
-SyntParam::SyntParam(ParamEntry *init_pe,SString* autostr,bool handle_defaults_when_saving)
+SyntParam::SyntParam(ParamEntry *init_pe, SString* autostr, bool handle_defaults_when_saving)
         :autostring(autostr)
 {
-Param::setParamTab(init_pe);
-pe=ParamObject::makeParamTab(this);
-Param::setParamTab(pe);
-if (handle_defaults_when_saving)
+        Param::setParamTab(init_pe);
+        pe = ParamObject::makeParamTab(this);
+        Param::setParamTab(pe);
+        if (handle_defaults_when_saving)
         {
-        def_obj=ParamObject::makeObject(pe);
-        Param::select(def_obj);
+                def_obj = ParamObject::makeObject(pe);
+                Param::select(def_obj);
+                Param::setDefault();
+        }
+        else
+                def_obj = NULL;
+        obj = ParamObject::makeObject(pe);
+        Param::select(obj);
         Param::setDefault();
-        }
-else
-        def_obj=NULL;
-obj=ParamObject::makeObject(pe);
-Param::select(obj);
-Param::setDefault();
-revert();
+        revert();
 }
 
 SyntParam::SyntParam(const SyntParam& src)
-        :Param(),autostring(src.autostring)
+        :Param(), autostring(src.autostring)
 {
-Param::setParamTab(src.pe);
-pe=ParamObject::makeParamTab(this);
-Param::setParamTab(pe);
-obj=ParamObject::dupObject(src.obj);
-def_obj=src.def_obj ? ParamObject::dupObject(src.def_obj) : NULL;
-Param::select(obj);
+        Param::setParamTab(src.pe);
+        pe = ParamObject::makeParamTab(this);
+        Param::setParamTab(pe);
+        obj = ParamObject::dupObject(src.obj);
+        def_obj = src.def_obj ? ParamObject::dupObject(src.def_obj) : NULL;
+        Param::select(obj);
 }
 
 SyntParam::~SyntParam()
 {
-update();
-ParamObject::freeParamTab(pe);
-ParamObject::freeObject(obj);
-ParamObject::freeObject(def_obj);
+        update();
+        ParamObject::freeParamTab(pe);
+        ParamObject::freeObject(obj);
+        ParamObject::freeObject(def_obj);
 }
 
 void SyntParam::update(SString *s)
 {
-if (!s) s=autostring;
-if (s) {*s=""; Param::save2(*s,def_obj,0);}
+        if (!s) s = autostring;
+        if (s) { *s = ""; Param::saveSingleLine(*s, def_obj, 0); }
 }
 
 void SyntParam::revert(SString *s)
 {
-if (!s) s=autostring;
-if (s)  {
-        int p=0;
-        Param::load2(*s,p);
+        if (!s) s = autostring;
+        if (s)  {
+                Param::load(ParamInterface::FormatSingleLine, *s);
         }
 }
-
-
-
-
-