diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 041ce1b02..297e60653 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,5 +1,8 @@ 2010-10-26 Wolfgang Sourdeau + * NGVCard.m (-setCategories, -categories): new accessors for the + "CATEGORIES" vcard property. + * NGVCardPhoto.m (-type): fixed the returning of the default type. * CardElement.m (-setValues:): new method. Actual renamed version diff --git a/SOPE/NGCards/NGVCard.h b/SOPE/NGCards/NGVCard.h index a687e2a01..2073391d7 100644 --- a/SOPE/NGCards/NGVCard.h +++ b/SOPE/NGCards/NGVCard.h @@ -125,14 +125,14 @@ typedef enum units: (NSArray *) someUnits; - (NSArray *) org; +- (void) setCategories: (NSArray *) newCategories; +- (NSArray *) categories; + // - (void) setN: (NGVCardName *) _v; // - (NGVCardName *) n; // - (void) setOrg: (NGVCardOrg *) _v; // - (NGVCardOrg *) org; -// - (void) setCategories: (id) _v; -// - (NGVCardStrArrayValue *) categories; - // - (void) setTel: (NSArray *) _tel; // - (NSArray *) tel; // - (void) setAdr: (NSArray *) _adr; diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m index 861ef82a3..aaccf90c7 100644 --- a/SOPE/NGCards/NGVCard.m +++ b/SOPE/NGCards/NGVCard.m @@ -325,6 +325,23 @@ return org; } +- (void) setCategories: (NSArray *) newCategories +{ + CardElement *cats; + + cats = [self uniqueChildWithTag: @"categories"]; + [cats setValues: newCategories]; +} + +- (NSArray *) categories +{ + CardElement *cats; + + cats = [self uniqueChildWithTag: @"categories"]; + + return [cats values]; +} + // - (void) setOrg: (NGVCardOrg *) _v // { // ASSIGNCOPY(self->org, _v); @@ -347,19 +364,6 @@ // return self->nickname; // } -// - (void) setCategories: (id) _v -// { -// if (![_v isKindOfClass:[NGVCardStrArrayValue class]] && [_v isNotNull]) -// _v = [[[NGVCardStrArrayValue alloc] initWithPropertyList:_v] autorelease]; - -// ASSIGNCOPY(self->categories, _v); -// } - -// - (NGVCardStrArrayValue *) categories -// { -// return self->categories; -// } - // - (void) setTel: (NSArray *) _tel // { // ASSIGNCOPY(self->tel, _tel);