Changeset 104 for cpp/gdk/multiparamload.h

Timestamp:

07/23/13 18:15:30 (11 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/multiparamload.h (modified) (6 diffs)

cpp/gdk/multiparamload.h

@@ -9 +9 @@
 #include "param.h"
 #include "virtfile.h"
+#include "extvalue.h"
 
 /** This is the general "framsticks-format" file parser for loading multiple objects.
@@ -37 +38 @@
 SListTempl<VirtFILE*> filestack;
 char ownfile;
-SList params;
+PtrListTempl<ExtObject*> objects;
 int status;
 SString lasterror, lastcomment, lastunknown;
-ParamInterface *lastclass;
+ExtObject lastobject;
 int breakcond;
 Param emptyparam;
 
 void init();
-void load();
 
 int maybeBreak(int cond)
@@ -58 +58 @@
 MultiParamLoader(const char* filename) {init(); load(filename);}
 
-~MultiParamLoader() {abort();}
+~MultiParamLoader() {abort();clearObjects();}
 
 void reset();
 
+void load(); //< use previously opened file
 void load(VirtFILE *f);
 void load(const char* filename);
@@ -69 +70 @@
     Note that registered classes will only work when the record name matches the class name, otherwise breakOn(BeforeUnknown) must be used and then getClassName() to check for the expected record.
  */
-void addClass(ParamInterface *pi) {params+=pi;}
-void removeClass(ParamInterface *pi) {params-=pi;}
-void clearClasses() {params.clear();}
+void addObject(ParamInterface *pi) {objects+=new ExtObject(pi);}
+void removeObject(ParamInterface *pi) {removeObject(ExtObject(pi));}
+void addObject(const ExtObject &o) {objects+=new ExtObject(o);}
+void removeObject(const ExtObject &o);
+int findObject(const ExtObject &o);
+void clearObjects();
 
 /** To be used in the main loop: while(event=loader.go()) { ... }
@@ -107 +111 @@
 
 /** Can be used BeforeObject and AfterObject */
-ParamInterface *getClass() {return lastclass;}
+ExtObject &getObject() {return lastobject;}
 /** Can be used BeforeUnknown, BeforeObject, AfterObject */
-const SString& getClassName() {return lastunknown;}
-const void setClassName(SString n) {lastunknown=n;}
+const SString& getObjectName() {return lastunknown;}
+const void setObjectName(SString n) {lastunknown=n;}
 /** Unknown object will be loaded if you set its class BeforeUnknown */
-void setClass(ParamInterface *pi) {lastclass=pi;}
+void setObject(ParamInterface *pi) {lastobject=ExtObject(pi);}
+void setObject(const ExtObject& o) {lastobject=o;}
 /** Can be used OnComment */
 const SString& getComment() {return lastcomment;}
@@ -118 +123 @@
 const SString& getError() {return lasterror;}
 /** Can be used BeforeObject and BeforeUnknown */
-int loadObjectNow(ParamInterface *pi);
+int loadObjectNow(ParamInterface *pi) {return loadObjectNow(ExtObject(pi));}
+int loadObjectNow(const ExtObject &o);
 /** Can be used BeforeObject */
-int loadObjectNow() {return loadObjectNow(getClass());}
+int loadObjectNow() {return loadObjectNow(getObject());}
 /** Can be used BeforeObject and BeforeUnknown.
     Object data will not be loaded. */