Changeset 104 for cpp/gdk/multiparamload.cpp

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.cpp (modified) (4 diffs)

cpp/gdk/multiparamload.cpp

@@ -19 +19 @@
 breakcond=OnError;
 emptyparam.setParamTab(empty_paramtab);
+}
+
+int MultiParamLoader::findObject(const ExtObject &o)
+{
+for(int i=0;i<objects.size();i++)
+        if ((*objects(i))==o)
+                return i;
+return -1;
+}
+
+void MultiParamLoader::removeObject(const ExtObject &o)
+{
+int i=findObject(o);
+if (i>=0)
+        {
+        delete objects(i);
+        objects-=i;
+        }
+}
+
+void MultiParamLoader::clearObjects()
+{
+FOREACH(ExtObject*,o,objects)
+        delete o;
+objects.clear();
 }
 
@@ -102 +127 @@
 while (!finished())
         {
-        if ((status==BeforeObject) || ((status==BeforeUnknown)&&lastclass))
-                {
-                lastclass->load(file);
+        if ((status==BeforeObject) || ((status==BeforeUnknown) && !lastobject.isEmpty()))
+                {
+                Param tmp_param;
+                ParamInterface *pi=lastobject.getParamInterface(tmp_param);
+                pi->load(file);
                 if ((status!=Finished) && maybeBreak(AfterObject))
                         break;
@@ -155 +182 @@
                 lastunknown=0;
                 lastunknown.append(t,linlen-1);
-                lastclass=0;
-                FOREACH(ParamInterface*,pi,params)
-                        {
-                        if (!strcmp(pi->getName(),lastunknown)) { lastclass=pi; break; }
-                        }
-                        if (lastclass)
+                lastobject.setEmpty();
+                FOREACH(ExtObject*,o,objects)
+                        {
+                        if (!strcmp(o->interfaceName(),lastunknown)) {lastobject=*o; break;}
+                        }
+                        if (!lastobject.isEmpty())
                                 {
                                 if (maybeBreak(BeforeObject))
@@ -244 +271 @@
 }
 
-int MultiParamLoader::loadObjectNow(ParamInterface *pi)
-{
+int MultiParamLoader::loadObjectNow(const ExtObject& o)
+{
+Param tmp_param;
+ParamInterface *pi=o.getParamInterface(tmp_param);
 pi->load(file);
 status=AfterObject;