+2005-07-15 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * iCalObject.[hm], iCalEntityObject.m, iCalToDo.m, iCalAlarm.m,
+ iCalPerson.m, iCalCalendar.m, iCalEvent.m, iCalTrigger.m,
+ iCalObject.m, iCalFreeBusy.m, iCalRepeatableEntityObject.m:
+ fixed NSCopying (v4.5.56)
+
2005-07-15 Helge Hess <helge.hess@opengroupware.org>
* added fragile base class version checks (v4.5.55)
MAJOR_VERSION=4
MINOR_VERSION=5
-SUBMINOR_VERSION:=55
+SUBMINOR_VERSION:=56
# v4.5.40 requires NGExtensions v4.5.145
# v4.5.37 requires NGExtensions v4.5.140
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->trigger, self->trigger);
- ASSIGNCOPY(new->comment, self->comment);
- ASSIGNCOPY(new->action, self->action);
- ASSIGNCOPY(new->attach, self->attach);
- ASSIGNCOPY(new->recurrenceRule, self->recurrenceRule);
+ new->trigger = [self->trigger copyWithZone:_zone];
+ new->comment = [self->comment copyWithZone:_zone];
+ new->action = [self->action copyWithZone:_zone];
+ new->attach = [self->attach copyWithZone:_zone];
+ new->recurrenceRule = [self->recurrenceRule copyWithZone:_zone];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->version, self->version);
- ASSIGNCOPY(new->calscale, self->calscale);
- ASSIGNCOPY(new->prodId, self->prodId);
- ASSIGNCOPY(new->method, self->method);
-
- ASSIGNCOPY(new->todos, self->todos);
- ASSIGNCOPY(new->events, self->events);
- ASSIGNCOPY(new->journals, self->journals);
- ASSIGNCOPY(new->freeBusys, self->freeBusys);
- ASSIGNCOPY(new->timezones, self->timezones);
+ new->version = [self->version copyWithZone:_zone];
+ new->calscale = [self->calscale copyWithZone:_zone];
+ new->prodId = [self->prodId copyWithZone:_zone];
+ new->method = [self->method copyWithZone:_zone];
+
+ new->todos = [self->todos copyWithZone:_zone];
+ new->events = [self->events copyWithZone:_zone];
+ new->journals = [self->journals copyWithZone:_zone];
+ new->freeBusys = [self->freeBusys copyWithZone:_zone];
+ new->timezones = [self->timezones copyWithZone:_zone];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->uid, self->uid);
- ASSIGNCOPY(new->summary, self->summary);
- new->timestamp = self->timestamp;
- ASSIGNCOPY(new->created, self->created);
- ASSIGNCOPY(new->lastModified, self->lastModified);
- ASSIGNCOPY(new->startDate, self->startDate);
- ASSIGNCOPY(new->accessClass, self->accessClass);
- ASSIGNCOPY(new->priority, self->priority);
- ASSIGNCOPY(new->alarms, self->alarms);
- ASSIGNCOPY(new->organizer, self->organizer);
- ASSIGNCOPY(new->attendees, self->attendees);
- ASSIGNCOPY(new->comment, self->comment);
- ASSIGNCOPY(new->sequence, self->sequence);
- ASSIGNCOPY(new->location, self->location);
- ASSIGNCOPY(new->status, self->status);
- ASSIGNCOPY(new->categories, self->categories);
- ASSIGNCOPY(new->userComment, self->userComment);
+ new->uid = [self->uid copyWithZone:_zone];
+ new->summary = [self->summary copyWithZone:_zone];
+ new->timestamp = self->timestamp;
+ new->created = [self->created copyWithZone:_zone];
+ new->lastModified = [self->lastModified copyWithZone:_zone];
+ new->startDate = [self->startDate copyWithZone:_zone];
+ new->accessClass = [self->accessClass copyWithZone:_zone];
+ new->priority = [self->priority copyWithZone:_zone];
+ new->alarms = [self->alarms copyWithZone:_zone];
+ new->organizer = [self->organizer copyWithZone:_zone];
+ new->attendees = [self->attendees copyWithZone:_zone];
+ new->comment = [self->comment copyWithZone:_zone];
+ new->sequence = [self->sequence copyWithZone:_zone];
+ new->location = [self->location copyWithZone:_zone];
+ new->status = [self->status copyWithZone:_zone];
+ new->categories = [self->categories copyWithZone:_zone];
+ new->userComment = [self->userComment copyWithZone:_zone];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->endDate, self->endDate);
- ASSIGNCOPY(new->duration, self->duration);
- ASSIGNCOPY(new->transparency, self->transparency);
+ new->endDate = [self->endDate copyWithZone:_zone];
+ new->duration = [self->duration copyWithZone:_zone];
+ new->transparency = [self->transparency copyWithZone:_zone];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->entries, self->entries);
- ASSIGNCOPY(new->organizer, self->organizer);
- ASSIGNCOPY(new->startDate, self->startDate);
- ASSIGNCOPY(new->endDate, self->endDate);
- ASSIGNCOPY(new->url, self->url);
-
+ new->entries = [self->entries copyWithZone:_zone];
+ new->organizer = [self->organizer copyWithZone:_zone];
+ new->startDate = [self->startDate copyWithZone:_zone];
+ new->endDate = [self->endDate copyWithZone:_zone];
+ new->url = [self->url copyWithZone:_zone];
+
return new;
}
- (id)copyWithZone:(NSZone *)_zone {
iCalObject *new;
- new = [[iCalObject allocWithZone:_zone] init];
+ new = [[[self class] allocWithZone:_zone] init];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->cn, self->cn);
- ASSIGNCOPY(new->email, self->email);
- ASSIGNCOPY(new->rsvp, self->rsvp);
- ASSIGNCOPY(new->partStat, self->partStat);
- ASSIGNCOPY(new->role, self->role);
- ASSIGNCOPY(new->xuid, self->xuid);
-
+ new->cn = [self->cn copyWithZone:_zone];
+ new->email = [self->email copyWithZone:_zone];
+ new->rsvp = [self->rsvp copyWithZone:_zone];
+ new->partStat = [self->partStat copyWithZone:_zone];
+ new->role = [self->role copyWithZone:_zone];
+ new->xuid = [self->xuid copyWithZone:_zone];
+
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->rRules, self->rRules);
- ASSIGNCOPY(new->exRules, self->exRules);
- ASSIGNCOPY(new->exDates, self->exDates);
+ new->rRules = [self->rRules copyWithZone:_zone];
+ new->exRules = [self->exRules copyWithZone:_zone];
+ new->exDates = [self->exDates copyWithZone:_zone];
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->due, self->due);
- ASSIGNCOPY(new->percentComplete, self->percentComplete);
- ASSIGNCOPY(new->completed, self->completed);
-
+ new->due = [self->due copyWithZone:_zone];
+ new->percentComplete = [self->percentComplete copyWithZone:_zone];
+ new->completed = [self->completed copyWithZone:_zone];
+
return new;
}
new = [super copyWithZone:_zone];
- ASSIGNCOPY(new->valueType, self->valueType);
- ASSIGNCOPY(new->value, self->value);
+ new->valueType = [self->valueType copyWithZone:_zone];
+ new->value = [self->value copyWithZone:_zone];
return new;
}
projects / sope / commitdiff