remove requester dummy field from project file

dmcoles · Sep 15, 2024 · 66069e0 · 66069e0
1 parent 5e463dc
commit 66069e0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/reactionObject.e b/reactionObject.e
@@ -816,26 +816,28 @@ PROC deserialise(fser:PTR TO fileStreamer) OF reactionObject
             fieldname:=list[i++]
             fieldptr:=list[i++]
             fieldtype:=list[i++]
-            StrCopy(tempStr2,fieldname)
-            StrAdd(tempStr2,': ')
-            UpperStr(tempStr2)
-            IF StrCmp(tempStr2,tempStr,EstrLen(tempStr2))
-              SELECT fieldtype
-                CASE FIELDTYPE_CHAR
-                  PutChar(fieldptr,Val(tempStr+StrLen(tempStr2)))
-                CASE FIELDTYPE_INT
-                  PutInt(fieldptr,Val(tempStr+StrLen(tempStr2)))
-                CASE FIELDTYPE_LONG
-                  PutLong(fieldptr,Val(tempStr+StrLen(tempStr2)))
-                CASE FIELDTYPE_STR
-                  AstrCopy(fieldptr,tempStr+StrLen(tempStr2))
-                CASE FIELDTYPE_STRLIST
-                  strlist:=Long(fieldptr)
-                  strlist.add(tempStr+StrLen(tempStr2))
-                CASE FIELDTYPE_INTLIST
-                  intlist:=Long(fieldptr)
-                  intlist.add(Val(tempStr+StrLen(tempStr2)))
-              ENDSELECT
+            IF fieldname
+              StrCopy(tempStr2,fieldname)
+              StrAdd(tempStr2,': ')
+              UpperStr(tempStr2)
+              IF StrCmp(tempStr2,tempStr,EstrLen(tempStr2))
+                SELECT fieldtype
+                  CASE FIELDTYPE_CHAR
+                    PutChar(fieldptr,Val(tempStr+StrLen(tempStr2)))
+                  CASE FIELDTYPE_INT
+                    PutInt(fieldptr,Val(tempStr+StrLen(tempStr2)))
+                  CASE FIELDTYPE_LONG
+                    PutLong(fieldptr,Val(tempStr+StrLen(tempStr2)))
+                  CASE FIELDTYPE_STR
+                    AstrCopy(fieldptr,tempStr+StrLen(tempStr2))
+                  CASE FIELDTYPE_STRLIST
+                    strlist:=Long(fieldptr)
+                    strlist.add(tempStr+StrLen(tempStr2))
+                  CASE FIELDTYPE_INTLIST
+                    intlist:=Long(fieldptr)
+                    intlist.add(Val(tempStr+StrLen(tempStr2)))
+                ENDSELECT
+              ENDIF
             ENDIF
           ENDWHILE
         ENDIF

diff --git a/requesterObject.e b/requesterObject.e
@@ -26,7 +26,6 @@ EXPORT ENUM REQGAD_LIST, REQGAD_ADD, REQGAD_EDIT, REQGAD_DELETE, REQGAD_OK, REQG
 CONST NUM_REQ_GADS=REQGAD_CANCEL+1
 
 EXPORT OBJECT requesterObject OF reactionObject
-  dummy:CHAR
 ENDOBJECT
 
 EXPORT PROC create(parent) OF requesterObject
@@ -35,7 +34,6 @@ EXPORT PROC create(parent) OF requesterObject
   SUPER self.create(parent)
   AstrCopy(self.name,'')
   AstrCopy(self.ident,'Requesters')
-  self.dummy:=0
 ENDPROC
 
 EXPORT PROC getTypeName() OF requesterObject
@@ -44,11 +42,9 @@ ENDPROC
 
 EXPORT PROC allowChildren() OF requesterObject IS -1
 
-
-#define makeProp(a,b) 'a',{self.a},b
 EXPORT PROC serialiseData() OF requesterObject IS
 [
-  makeProp(dummy,FIELDTYPE_CHAR)
+  0,0,FIELDTYPE_CHAR    //dummy field since we dont have any
 ]
 
 EXPORT PROC createRequesterObject(parent)