New lib ical.Some minor changes as well.

1 files changed, 79 insertions, 94 deletions

diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index 0ec8b31..85c299e 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -97,97 +97,97 @@ extern "C" {
 #define VCAIFFProp				"AIFF"
 #define VCAOLProp				"AOL"
 #define VCAppleLinkProp			"APPLELINK"
 #define VCAttachProp			"ATTACH"
 #define VCAttendeeProp			"ATTENDEE"
 #define VCATTMailProp			"ATTMAIL"
 #define VCAudioContentProp		"AUDIOCONTENT"
 #define VCAVIProp				"AVI"
 #define VCBase64Prop			"BASE64"
 #define VCBBSProp				"BBS"
 #define VCBirthDateProp			"BDAY"
 #define VCBMPProp				"BMP"
 #define VCBodyProp				"BODY"
 #define VCBusinessRoleProp		"ROLE"
 #define VCCalProp				"VCALENDAR"
 #define VCCaptionProp			"CAP"
 #define VCCardProp				"VCARD"
 #define VCCarProp				"CAR"
 #define VCCategoriesProp		"CATEGORIES"
 #define VCCellularProp			"CELL"
 #define VCCGMProp				"CGM"
 #define VCCharSetProp			"CS"
 #define VCCIDProp				"CID"
 #define VCCISProp				"CIS"
 #define VCCityProp				"L"
 #define VCClassProp				"CLASS"
 #define VCCommentProp			"NOTE"
 #define VCCompletedProp			"COMPLETED"
 #define VCContentIDProp			"CONTENT-ID"
 #define VCCountryNameProp		"C"
 #define VCDAlarmProp			"DALARM"
 #define VCDataSizeProp			"DATASIZE"
 #define VCDayLightProp			"DAYLIGHT"
 #define VCDCreatedProp			"DCREATED"
 #define VCDeliveryLabelProp     "LABEL"
 #define VCDescriptionProp		"DESCRIPTION"
 #define VCDIBProp				"DIB"
 #define VCDisplayStringProp		"DISPLAYSTRING"
 #define VCDomesticProp			"DOM"
 #define VCDTendProp				"DTEND"
 #define VCDTstartProp			"DTSTART"
 #define VCDueProp				"DUE"
 #define VCEmailAddressProp		"EMAIL"
 #define VCEncodingProp			"ENCODING"
 #define VCEndProp				"END"
 #define VCEventProp				"VEVENT"
 #define VCEWorldProp			"EWORLD"
 #define VCExNumProp				"EXNUM"
-#define VCExDateProp			"EXDATE"
+#define VCExpDateProp			"EXDATE"
 #define VCExpectProp			"EXPECT"
 #define VCExtAddressProp		"EXT ADD"
 #define VCFamilyNameProp		"F"
 #define VCFaxProp				"FAX"
 #define VCFullNameProp			"FN"
 #define VCGeoProp				"GEO"
 #define VCGeoLocationProp		"GEO"
 #define VCGIFProp				"GIF"
 #define VCGivenNameProp			"G"
 #define VCGroupingProp			"Grouping"
 #define VCHomeProp				"HOME"
 #define VCIBMMailProp			"IBMMail"
 #define VCInlineProp			"INLINE"
 #define VCInternationalProp		"INTL"
 #define VCInternetProp			"INTERNET"
 #define VCISDNProp				"ISDN"
 #define VCJPEGProp				"JPEG"
 #define VCLanguageProp			"LANG"
 #define VCLastModifiedProp		"LAST-MODIFIED"
 #define VCLastRevisedProp		"REV"
 #define VCLocationProp			"LOCATION"
 #define VCLogoProp				"LOGO"
 #define VCMailerProp			"MAILER"
 #define VCMAlarmProp			"MALARM"
 #define VCMCIMailProp			"MCIMAIL"
 #define VCMessageProp			"MSG"
 #define VCMETProp				"MET"
 #define VCModemProp				"MODEM"
 #define VCMPEG2Prop				"MPEG2"
 #define VCMPEGProp				"MPEG"
 #define VCMSNProp				"MSN"
 #define VCNamePrefixesProp		"NPRE"
 #define VCNameProp				"N"
 #define VCNameSuffixesProp		"NSUF"
 #define VCNoteProp				"NOTE"
 #define VCOrgNameProp			"ORGNAME"
 #define VCOrgProp				"ORG"
 #define VCOrgUnit2Prop			"OUN2"
 #define VCOrgUnit3Prop			"OUN3"
 #define VCOrgUnit4Prop			"OUN4"
 #define VCOrgUnitProp			"OUN"
 #define VCPagerProp				"PAGER"
 #define VCPAlarmProp			"PALARM"
 #define VCParcelProp			"PARCEL"
 #define VCPartProp				"PART"
 #define VCPCMProp				"PCM"
 #define VCPDFProp				"PDF"
 #define VCPGPProp				"PGP"
@@ -202,183 +202,168 @@ extern "C" {
 #define VCPriorityProp			"PRIORITY"
 #define VCProcedureNameProp		"PROCEDURENAME"
 #define VCProdIdProp			"PRODID"
 #define VCProdigyProp			"PRODIGY"
 #define VCPronunciationProp		"SOUND"
 #define VCPSProp				"PS"
 #define VCPublicKeyProp			"KEY"
 #define VCQPProp				"QP"
 #define VCQuickTimeProp			"QTIME"
 #define VCQuotedPrintableProp	"QUOTED-PRINTABLE"
 #define VCRDateProp				"RDATE"
 #define VCRegionProp			"R"
 #define VCRelatedToProp			"RELATED-TO"
 #define VCRepeatCountProp		"REPEATCOUNT"
 #define VCResourcesProp			"RESOURCES"
 #define VCRNumProp				"RNUM"
 #define VCRoleProp				"ROLE"
 #define VCRRuleProp				"RRULE"
 #define VCRSVPProp				"RSVP"
 #define VCRunTimeProp			"RUNTIME"
 #define VCSequenceProp			"SEQUENCE"
 #define VCSnoozeTimeProp		"SNOOZETIME"
 #define VCStartProp				"START"
 #define VCStatusProp			"STATUS"
 #define VCStreetAddressProp		"STREET"
 #define VCSubTypeProp			"SUBTYPE"
 #define VCSummaryProp			"SUMMARY"
 #define VCTelephoneProp			"TEL"
 #define VCTIFFProp				"TIFF"
 #define VCTimeZoneProp			"TZ"
 #define VCTitleProp				"TITLE"
 #define VCTLXProp				"TLX"
 #define VCTodoProp				"VTODO"
 #define VCTranspProp			"TRANSP"
 #define VCUniqueStringProp		"UID"
 #define VCURLProp				"URL"
 #define VCURLValueProp			"URLVAL"
 #define VCValueProp				"VALUE"
 #define VCVersionProp			"VERSION"
 #define VCVideoProp				"VIDEO"
 #define VCVoiceProp				"VOICE"
 #define VCWAVEProp				"WAVE"
 #define VCWMFProp				"WMF"
 #define VCWorkProp				"WORK"
 #define VCX400Prop				"X400"
 #define VCX509Prop				"X509"
 #define VCXRuleProp				"XRULE"
 
-/* extensions for KOrganizer / KPilot */
-#define KPilotIdProp                            "X-PILOTID"
-#define KPilotStatusProp                        "X-PILOTSTAT"
+/* Extensions */
 
+#define XPilotIdProp                            "X-PILOTID"
+#define XPilotStatusProp                        "X-PILOTSTAT"
 /* extensions for iMIP / iTIP */
 #define ICOrganizerProp                         "X-ORGANIZER"
 #define ICMethodProp                            "X-METHOD"
 #define ICRequestStatusProp                     "X-REQUEST-STATUS"
-
 typedef struct VObject VObject;
 
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-    } ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-    };
-
-typedef struct StrItem StrItem;
-
-struct StrItem {
-    StrItem *next;
-    const char *s;
-    unsigned int refCnt;
-    };
-
 typedef struct VObjectIterator {
     VObject* start;
     VObject* next;
     } VObjectIterator;
 
-extern VObject* newVObject(const char *id);
-extern void deleteVObject(VObject *p);
-extern char* dupStr(const char *s, unsigned int size);
-extern void deleteStr(const char *p);
-extern void unUseStr(const char *s);
-
-extern void setVObjectName(VObject *o, const char* id);
-extern void setVObjectStringZValue(VObject *o, const char *s);
-extern void setVObjectStringZValue_(VObject *o, const char *s);
-extern void setVObjectUStringZValue(VObject *o, const wchar_t *s);
-extern void setVObjectUStringZValue_(VObject *o, const wchar_t *s);
-extern void setVObjectIntegerValue(VObject *o, unsigned int i);
-extern void setVObjectLongValue(VObject *o, unsigned long l);
-extern void setVObjectAnyValue(VObject *o, void *t);
-extern VObject* setValueWithSize(VObject *prop, void *val, unsigned int size);
-extern VObject* setValueWithSize_(VObject *prop, void *val, unsigned int size);
-
-extern const char* vObjectName(VObject *o);
-extern const char* vObjectStringZValue(VObject *o);
-extern const wchar_t* vObjectUStringZValue(VObject *o);
-extern unsigned int vObjectIntegerValue(VObject *o);
-extern unsigned long vObjectLongValue(VObject *o);
-extern void* vObjectAnyValue(VObject *o);
-extern VObject* vObjectVObjectValue(VObject *o);
-extern void setVObjectVObjectValue(VObject *o, VObject *p);
-
-extern VObject* addVObjectProp(VObject *o, VObject *p);
-extern VObject* addProp(VObject *o, const char *id);
-extern VObject* addProp_(VObject *o, const char *id);
-extern VObject* addPropValue(VObject *o, const char *p, const char *v);
-extern VObject* addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
-extern VObject* addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
-extern VObject* addGroup(VObject *o, const char *g);
-extern void addList(VObject **o, VObject *p);
-
-extern VObject* isAPropertyOf(VObject *o, const char *id);
-
-extern VObject* nextVObjectInList(VObject *o);
-extern void initPropIterator(VObjectIterator *i, VObject *o);
-extern int moreIteration(VObjectIterator *i);
-extern VObject* nextVObject(VObjectIterator *i);
-
-extern char* writeMemVObject(char *s, int *len, VObject *o);
-extern char* writeMemVObjects(char *s, int *len, VObject *list);
-
-extern const char* lookupStr(const char *s);
-extern void cleanStrTbl();
-
-extern void cleanVObject(VObject *o);
-extern void cleanVObjects(VObject *list);
-
-extern const char* lookupProp(const char* str);
-extern const char* lookupProp_(const char* str);
-
-extern wchar_t* fakeUnicode(const char *ps, int *bytes);
-extern int uStrLen(const wchar_t *u);
-extern char* fakeCString(const wchar_t *u);
-
-extern void printVObjectToFile(char *fname,VObject *o);
-extern void printVObjectsToFile(char *fname,VObject *list);
-extern void writeVObjectToFile(char *fname, VObject *o);
-extern void writeVObjectsToFile(char *fname, VObject *list);
-
-extern int vObjectValueType(VObject *o);
+extern DLLEXPORT(VObject*) newVObject(const char *id);
+extern DLLEXPORT(void) deleteVObject(VObject *p);
+extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
+extern DLLEXPORT(void) deleteStr(const char *p);
+extern DLLEXPORT(void) unUseStr(const char *s);
+
+extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
+extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
+extern DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s);
+extern DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s);
+extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
+extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
+extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
+extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
+extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
+
+extern DLLEXPORT(const char*) vObjectName(VObject *o);
+extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
+extern DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o);
+extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
+extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
+extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
+extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
+extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
+
+extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
+extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
+extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
+extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
+extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
+extern DLLEXPORT(void) addList(VObject **o, VObject *p);
+
+extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
+
+extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
+extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
+extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
+extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
+
+extern DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o);
+extern DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list);
+
+extern DLLEXPORT(const char*) lookupStr(const char *s);
+extern DLLEXPORT(void) cleanStrTbl();
+
+extern DLLEXPORT(void) cleanVObject(VObject *o);
+extern DLLEXPORT(void) cleanVObjects(VObject *list);
+
+extern DLLEXPORT(const char*) lookupProp(const char* str);
+extern DLLEXPORT(const char*) lookupProp_(const char* str);
+
+extern DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes);
+extern DLLEXPORT(int) uStrLen(const wchar_t *u);
+extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
+
+extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
+extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
+extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
+extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
+
+extern DLLEXPORT(int) vObjectValueType(VObject *o);
 
 /* return type of vObjectValueType: */
 #define VCVT_NOVALUE	0
 	/* if the VObject has no value associated with it. */
 #define VCVT_STRINGZ	1
 	/* if the VObject has value set by setVObjectStringZValue. */
 #define VCVT_USTRINGZ	2
 	/* if the VObject has value set by setVObjectUStringZValue. */
 #define VCVT_UINT		3
 	/* if the VObject has value set by setVObjectIntegerValue. */
 #define VCVT_ULONG		4
 	/* if the VObject has value set by setVObjectLongValue. */
 #define VCVT_RAW		5
 	/* if the VObject has value set by setVObjectAnyValue. */
 #define VCVT_VOBJECT	6
 	/* if the VObject has value set by setVObjectVObjectValue. */
 
 extern const char** fieldedProp;
 
+/* NOTE regarding printVObject and writeVObject
+
+The functions below are not exported from the DLL because they
+take a FILE* as a parameter, which cannot be passed across a DLL 
+interface (at least that is my experience). Instead you can use
+their companion functions which take file names or pointers
+to memory. However, if you are linking this code into 
+your build directly then you may find them a more convenient API
+and you can go ahead and use them. If you try to use them with 
+the DLL LIB you will get a link error.
+*/
 extern void printVObject(FILE *fp,VObject *o);
 extern void writeVObject(FILE *fp, VObject *o);
 
 
 #if defined(__CPLUSPLUS__) || defined(__cplusplus)
 }
 #endif
 
 #endif /* __VOBJECT_H__ */