@@ -9,12 +9,12 @@ * the packaging of this file. */ #include "config.h" -#include #include +#include #import "OFXMLElement.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" @@ -188,12 +188,12 @@ - (OFArray*)children { return [[children copy] autorelease]; } -- (OFString*)_stringWithParentNamespaces: (OFDictionary*)parent_namespaces - parentDefaultNamespace: (OFString*)parent_default_ns +- (OFString*)_stringValueWithParentNamespaces: (OFDictionary*)parent_namespaces + parentDefaultNamespace: (OFString*)parent_default_ns { OFAutoreleasePool *pool, *pool2; char *str_c; size_t len, i, j, attrs_count; OFString *prefix = nil; @@ -328,11 +328,11 @@ for (j = 0; j < children_count; j++) append(tmp, @selector( appendCStringWithoutUTF8Checking:), [[children_carray[j] - _stringWithParentNamespaces: all_namespaces + _stringValueWithParentNamespaces: all_namespaces parentDefaultNamespace: defaultNamespace] cString]); len += [tmp cStringLength] + [name cStringLength] + 2; @try { str_c = [self resizeMemory: str_c @@ -379,14 +379,19 @@ [self freeMemory: str_c]; } return ret; } -- (OFString*)string +- (OFString*)stringValue +{ + return [self _stringValueWithParentNamespaces: nil + parentDefaultNamespace: nil]; +} + +- (OFString*)description { - return [self _stringWithParentNamespaces: nil - parentDefaultNamespace: nil]; + return [self stringValue]; } - (void)addAttribute: (OFXMLAttribute*)attr { if (name == nil)