Changeset 124

Timestamp:

02/10/14 17:09:58 (11 years ago)

Author:

sz

Message:

Param::save altname argument is now more convenient const char*

Location:

cpp/frams

Files:

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

cpp/frams/_demos/multiline_f0_test.cpp

@@ -50 +50 @@
 
 modelparam.select(&m);
-modelparam.save(&f,&SString("m"));
+modelparam.save(&f,"m");
 
 Part *p;
@@ -59 +59 @@
         {
         partparam.select(p);
-        partparam.save(&f,&SString("p"));
+        partparam.save(&f,"p");
         }
 for (int i=0;j=(Joint*)m.getJoint(i);i++)
@@ -65 +65 @@
         jointparam.select(j);
         jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
-        jointparam.save(&f,&SString("j"));
+        jointparam.save(&f,"j");
         }
 for (int i=0;n=(Neuro*)m.getNeuro(i);i++)
         {
         neuroparam.select(n);
-        neuroparam.save(&f,&SString("n"));
+        neuroparam.save(&f,"n");
         }
 for (int a=0;n=(Neuro*)m.getNeuro(a);a++)
@@ -83 +83 @@
                 nc.info=n->getInputInfo(b);
                 connparam.select(&nc);
-                connparam.save(&f,&SString("c"));
+                connparam.save(&f,"c");
                 }
         }

cpp/frams/param/param.cpp

@@ -200 +200 @@
 {int i=findId(prop); if (i>=0) return set(i,v); else return PSET_NOPROPERTY;}
 
-int ParamInterface::save(VirtFILE* f,const SString* altname,bool force)
+int ParamInterface::save(VirtFILE* f,const char* altname,bool force)
 {
 const char *p;
@@ -206 +206 @@
 int err=0,i;
 bool withname=false;
-if ((!altname)||(altname->len()))
-        {
-        err|=(fputs(altname?((const char*)(*altname)):getName(),f)==EOF);
+if ((altname==NULL)||(altname[0]!=0))
+        {
+        err|=(fputs(altname?altname:getName(),f)==EOF);
         err|=(fputs(":\n",f)==EOF);
         withname=true;

cpp/frams/param/param.h

@@ -152 +152 @@
 void quickCopyFrom(ParamInterface *src);
 
-int save(VirtFILE*,const SString* altname=0,bool force=0);
+int save(VirtFILE*,const char* altname=NULL,bool force=0);
 int saveprop(VirtFILE*,int i,const char* p,bool force=0);
 void load(VirtFILE*);