@@ -49,13 +49,13 @@ return [[[self alloc] initWithName: name namespace: ns stringValue: stringval] autorelease]; } -+ elementWithText: (OFString*)text ++ elementWithCharacters: (OFString*)chars { - return [[[self alloc] initWithText: text] autorelease]; + return [[[self alloc] initWithCharacters: chars] autorelease]; } + elementWithComment: (OFString*)comment { return [[[self alloc] initWithComment: comment] autorelease]; @@ -99,11 +99,12 @@ name = [name_ copy]; namespace = [ns copy]; if (stringval != nil) { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];; - [self addChild: [OFXMLElement elementWithText: stringval]]; + [self addChild: + [OFXMLElement elementWithCharacters: stringval]]; [pool release]; } namespaces = [[OFMutableDictionary alloc] initWithKeysAndObjects: @"http://www.w3.org/XML/1998/namespace", @"xml", @@ -110,15 +111,15 @@ @"http://www.w3.org/2000/xmlns/", @"xmlns", nil]; return self; } -- initWithText: (OFString*)text_ +- initWithCharacters: (OFString*)chars { self = [super init]; - text = [text_ copy]; + characters = [chars copy]; return self; } - initWithComment: (OFString*)comment_ @@ -140,12 +141,12 @@ OFXMLAttribute **attrs_carray; OFString *ret, *tmp; OFMutableDictionary *all_namespaces; OFString *def_ns; - if (text != nil) - return [text stringByXMLEscaping]; + if (characters != nil) + return [characters stringByXMLEscaping]; if (comment != nil) { OFMutableString *str; str = [OFMutableString stringWithString: @"