@@ -56,15 +56,15 @@ @try { void *pool = objc_autoreleasePoolPush(); OFXMLAttribute *targetAttr; if (![element.name isEqual: self.className] || - ![element.namespace isEqual: OF_SERIALIZATION_NS]) + ![element.namespace isEqual: OFSerializationNS]) @throw [OFInvalidArgumentException exception]; targetAttr = [element attributeForName: @"target" - namespace: OF_SERIALIZATION_NS]; + namespace: OFSerializationNS]; if (targetAttr.stringValue.length == 0) @throw [OFInvalidArgumentException exception]; self = [self initWithTarget: targetAttr.stringValue data: element.stringValue]; @@ -110,14 +110,14 @@ - (unsigned long)hash { unsigned long hash; - OF_HASH_INIT(hash); - OF_HASH_ADD_HASH(hash, _target.hash); - OF_HASH_ADD_HASH(hash, _data.hash); - OF_HASH_FINALIZE(hash); + OFHashInit(&hash); + OFHashAddHash(&hash, _target.hash); + OFHashAddHash(&hash, _data.hash); + OFHashFinalize(&hash); return hash; } - (OFString *)stringValue @@ -142,11 +142,11 @@ - (OFString *)XMLStringWithIndentation: (unsigned int)indentation level: (unsigned int)level { if (indentation > 0 && level > 0) { OFString *ret; - char *whitespaces = of_alloc((level * indentation) + 1, 1); + char *whitespaces = OFAllocMemory((level * indentation) + 1, 1); memset(whitespaces, ' ', level * indentation); whitespaces[level * indentation] = 0; @try { if (_data.length > 0) @@ -155,11 +155,11 @@ _target, _data]; else ret = [OFString stringWithFormat: @"%s", whitespaces, _target]; } @finally { - free(whitespaces); + OFFreeMemory(whitespaces); } return ret; } else return self.XMLString; @@ -171,11 +171,11 @@ } - (OFXMLElement *)XMLElementBySerializing { OFXMLElement *ret = [OFXMLElement elementWithName: self.className - namespace: OF_SERIALIZATION_NS + namespace: OFSerializationNS stringValue: _data]; void *pool = objc_autoreleasePoolPush(); [ret addAttribute: [OFXMLAttribute attributeWithName: @"target" stringValue: _target]];