From 5a89e39d4c1e22dbd2b8db911fb08530004000bc Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 2 May 2005 22:51:25 +0000 Subject: [PATCH] renamed DOM implementations from DOMxx to NGDOMxx fixed some gcc 4.0 warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@783 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WOXML/ChangeLog | 5 +++ sope-appserver/WOXML/Version | 4 +- sope-appserver/WOXML/WOXMLMapDecoder.m | 12 +++--- sope-core/NGExtensions/ChangeLog | 5 +++ .../NGExtensions/DOMNode+EOQualifier.h | 2 +- .../NGExtensions/NGExtensions/NGCharBuffers.h | 25 ++++++----- sope-core/NGExtensions/Version | 2 +- .../XmlExt.subproj/DOMNode+EOQualifier.m | 12 +++--- sope-xml/DOM/ChangeLog | 7 ++++ sope-xml/DOM/DOM+JS.m | 32 +++++++-------- sope-xml/DOM/DOMAttribute.h | 6 +-- sope-xml/DOM/DOMAttribute.m | 12 ++---- sope-xml/DOM/DOMCDATASection.h | 4 +- sope-xml/DOM/DOMCDATASection.m | 4 +- sope-xml/DOM/DOMCharacterData.h | 2 +- sope-xml/DOM/DOMCharacterData.m | 8 ++-- sope-xml/DOM/DOMComment.h | 2 +- sope-xml/DOM/DOMComment.m | 4 +- sope-xml/DOM/DOMDocument+factory.m | 4 +- sope-xml/DOM/DOMDocument.h | 12 +++--- sope-xml/DOM/DOMDocument.m | 24 +++++------ sope-xml/DOM/DOMDocumentFragment.h | 8 ++-- sope-xml/DOM/DOMDocumentType.h | 4 +- sope-xml/DOM/DOMDocumentType.m | 4 +- sope-xml/DOM/DOMElement.h | 4 +- sope-xml/DOM/DOMElement.m | 24 +++++------ sope-xml/DOM/DOMEntity.h | 4 +- sope-xml/DOM/DOMEntity.m | 4 +- sope-xml/DOM/DOMEntityReference.h | 4 +- sope-xml/DOM/DOMEntityReference.m | 4 +- sope-xml/DOM/DOMImplementation.h | 4 +- sope-xml/DOM/DOMImplementation.m | 41 ++++++++----------- sope-xml/DOM/DOMNode+Enum.h | 6 +-- sope-xml/DOM/DOMNode+Enum.m | 8 ++-- sope-xml/DOM/DOMNode+QPEval.m | 8 ++-- sope-xml/DOM/DOMNode+QueryPath.h | 2 +- sope-xml/DOM/DOMNode+QueryPath.m | 2 +- sope-xml/DOM/DOMNode.h | 8 ++-- sope-xml/DOM/DOMNode.m | 22 +++++----- sope-xml/DOM/DOMNodeFilter.h | 2 +- sope-xml/DOM/DOMNodeFilter.m | 4 +- sope-xml/DOM/DOMNodeIterator.h | 2 +- sope-xml/DOM/DOMNodeIterator.m | 4 +- sope-xml/DOM/DOMNodeWalker.h | 6 +-- sope-xml/DOM/DOMNodeWalker.m | 14 +++---- sope-xml/DOM/DOMNodeWithChildren.m | 4 +- sope-xml/DOM/DOMNotation.h | 4 +- sope-xml/DOM/DOMNotation.m | 4 +- sope-xml/DOM/DOMPYXOutputter.h | 2 +- sope-xml/DOM/DOMPYXOutputter.m | 4 +- sope-xml/DOM/DOMProcessingInstruction.h | 4 +- sope-xml/DOM/DOMProcessingInstruction.m | 4 +- sope-xml/DOM/DOMProtocols.h | 4 +- sope-xml/DOM/DOMQueryPathExpression.m | 4 +- sope-xml/DOM/DOMSaxHandler.m | 2 +- sope-xml/DOM/DOMText.h | 2 +- sope-xml/DOM/DOMText.m | 4 +- sope-xml/DOM/DOMTreeWalker.h | 4 +- sope-xml/DOM/DOMTreeWalker.m | 4 +- sope-xml/DOM/Version | 2 +- sope-xml/samples/ChangeLog | 4 ++ sope-xml/samples/domxml.m | 2 +- sope-xml/samples/testqp.m | 2 +- 63 files changed, 221 insertions(+), 220 deletions(-) diff --git a/sope-appserver/WOXML/ChangeLog b/sope-appserver/WOXML/ChangeLog index 2ba79d72..3f116d1f 100644 --- a/sope-appserver/WOXML/ChangeLog +++ b/sope-appserver/WOXML/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Helge Hess + + * WOXMLMapDecoder.m: fixed a gcc 4.0 warnings, changed for the new + DOM implementation naming (v4.5.8) + 2004-08-40 Helge Hess * added hack to install the project in FHS locations - the library, diff --git a/sope-appserver/WOXML/Version b/sope-appserver/WOXML/Version index cab297dc..edfa2d83 100644 --- a/sope-appserver/WOXML/Version +++ b/sope-appserver/WOXML/Version @@ -1,3 +1,3 @@ -# $Id$ +# Version file -SUBMINOR_VERSION:=7 +SUBMINOR_VERSION:=8 diff --git a/sope-appserver/WOXML/WOXMLMapDecoder.m b/sope-appserver/WOXML/WOXMLMapDecoder.m index 09744e92..54cd2c05 100644 --- a/sope-appserver/WOXML/WOXMLMapDecoder.m +++ b/sope-appserver/WOXML/WOXMLMapDecoder.m @@ -30,16 +30,18 @@ @implementation WOXMLMapDecoder -- (id)initWithModel:(id)_model { - self->model = RETAIN(_model); +- (id)initWithModel:(WOXMLMappingModel *)_model { + self->model = [_model retain]; return self; } - (void)dealloc { - RELEASE(self->model); + [self->model release]; [super dealloc]; } +/* operations */ + - (WOXMLMappingEntity *)defaultEntity { return nil; } @@ -174,7 +176,7 @@ - (id)decodeRootObjectFromString:(NSString *)_str { id doc; - doc = [DOMDocument documentFromString:_str]; + doc = [NGDOMDocument documentFromString:_str]; return [self _processDOMDocument:doc]; } @@ -182,7 +184,7 @@ - (id)decodeRootObjectFromData:(NSData *)_data { id doc; - doc = [DOMDocument documentFromData:_data]; + doc = [NGDOMDocument documentFromData:_data]; return [self _processDOMDocument:doc]; } diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index f7fcd50e..9aac9839 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Helge Hess + + * XmlExt.subproj/DOMNode+EOQualifier.m: reworked for new DOM + (v4.5.159) + 2005-04-24 Helge Hess * fixed gcc 4.0 warnings (v4.5.158) diff --git a/sope-core/NGExtensions/NGExtensions/DOMNode+EOQualifier.h b/sope-core/NGExtensions/NGExtensions/DOMNode+EOQualifier.h index 739042a3..6b49ddc6 100644 --- a/sope-core/NGExtensions/NGExtensions/DOMNode+EOQualifier.h +++ b/sope-core/NGExtensions/NGExtensions/DOMNode+EOQualifier.h @@ -27,7 +27,7 @@ @class NSArray; @class EOQualifier; -@interface DOMNode(EOQualifier) +@interface NGDOMNode(EOQualifier) - (NSArray *)childrenMatchingQualifier:(EOQualifier *)_qualifier; - (NSArray *)descendantsMatchingQualifier:(EOQualifier *)_qualifier; diff --git a/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h b/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h index 84732431..dc5ceaaf 100644 --- a/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h +++ b/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h @@ -66,7 +66,7 @@ static inline NGCharBuffer8 NGCharBuffer8_newWithCString(const char *_cstr) { NGCharBuffer8 str = NULL; str = NGMalloc(sizeof(NGCharBuffer8Struct)); str = NGCharBuffer8_init(str, strlen(_cstr) + 2); - strcpy(str->buffer, _cstr); + strcpy((char *)str->buffer, _cstr); return str; } @@ -111,7 +111,7 @@ static inline void NGCharBuffer8_addCString(NGCharBuffer8 _str, char *_cstr) { len = strlen(_cstr); NGCharBuffer8_checkCapacity(_str, len); - strcat(_str->buffer, _cstr); + strcat((char *)_str->buffer, _cstr); _str->length += len; } @@ -120,20 +120,19 @@ static inline void NGCharBuffer8_removeContents(NGCharBuffer8 _str) { _str->buffer[0] = '\0'; } -static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str) { - if (_str == NULL) { +static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str){ + NSString *str; + + if (_str == NULL) return nil; - } - else { - NSString *str = [NSString stringWithCString:_str->buffer length:_str->length]; - NSCAssert3(strlen(_str->buffer) == _str->length, - @"length of cstring(%s) and the buffer do not match (%i vs %i)", - _str->buffer, strlen(_str->buffer), _str->length); + str = [NSString stringWithCString:(char *)_str->buffer length:_str->length]; + NSCAssert3(strlen((char *)_str->buffer) == _str->length, + @"length of cstring(%s) and the buffer do not match (%i vs %i)", + _str->buffer, strlen((char *)_str->buffer), _str->length); - NGCharBuffer8_dealloc(_str); _str = NULL; - return str; - } + NGCharBuffer8_dealloc(_str); _str = NULL; + return str; } static inline void NGCharBuffer8_stripTrailingSpaces(NGCharBuffer8 _str) { diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index 55539210..67f337cd 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=158 +SUBMINOR_VERSION:=159 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 diff --git a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m index 9f150a4e..aaaf1226 100644 --- a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m +++ b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m @@ -38,10 +38,10 @@ static NSArray *emptyArray = nil; id children; unsigned count; - if (![(DOMNode *)self hasChildNodes]) + if (![(id)self hasChildNodes]) return nil; - if ((children = [(DOMNode *)self childNodes]) == nil) + if ((children = [(id)self childNodes]) == nil) return nil; if ((count = [children count]) == 0) { @@ -80,10 +80,10 @@ static NSArray *emptyArray = nil; [_array addObject:self]; } - if (![(DOMNode *)self hasChildNodes]) + if (![(id)self hasChildNodes]) return; - children = [(DOMNode *)self childNodes]; + children = [(id)self childNodes]; for (i = 0, count = [children count]; i < count; i++) { [[children objectAtIndex:i] _addDOMDescendantsMatchingQualifier:_qualifier @@ -107,7 +107,7 @@ static NSArray *emptyArray = nil; @end /* NSObject(DOMNodeEOQualifier) */ -@implementation DOMNode(EOQualifier) +@implementation NGDOMNode(EOQualifier) - (NSArray *)childrenMatchingQualifier:(EOQualifier *)_qualifier { return [self _domChildrenMatchingQualifier:_qualifier]; @@ -118,4 +118,4 @@ static NSArray *emptyArray = nil; includeSelf:NO]; } -@end /* DOMNode(EOQualifier) */ +@end /* NGDOMNode(EOQualifier) */ diff --git a/sope-xml/DOM/ChangeLog b/sope-xml/DOM/ChangeLog index 149a3c42..3dc74c92 100644 --- a/sope-xml/DOM/ChangeLog +++ b/sope-xml/DOM/ChangeLog @@ -1,3 +1,10 @@ +2005-05-03 Helge Hess + + * renamed most implementations from DOMxx to NGDOMxx to avoid linking + issues with Tiger WebKit (still incomplete). Note that protocols are + still the same, so 'real' DOM apps will continue to work ;-) + (v4.5.15) + 2005-04-23 Helge Hess * fixed loads of @protocol related gcc 4.0 warnings (v4.5.14) diff --git a/sope-xml/DOM/DOM+JS.m b/sope-xml/DOM/DOM+JS.m index 30af993d..0fa475fc 100644 --- a/sope-xml/DOM/DOM+JS.m +++ b/sope-xml/DOM/DOM+JS.m @@ -55,7 +55,7 @@ documentElement | getDocumentElement() */ -@implementation DOMImplementation(JSSupport) +@implementation NGDOMImplementation(JSSupport) - (id)_jsfunc_createDocument:(NSArray *)_args { NSString *nsuri = nil, *qname = nil, *doctype = nil; @@ -83,9 +83,9 @@ return [self createDocumentType:qname publicId:pubId systemId:sysId]; } -@end /* DOMImplementation(JSSupport) */ +@end /* NGDOMImplementation(JSSupport) */ -@implementation DOMDocument(JSSupport) +@implementation NGDOMDocument(JSSupport) - (id)_jsprop_doctype { return [self doctype]; @@ -185,9 +185,9 @@ return [self createEntityReference:[[_args objectAtIndex:0] stringValue]]; } -@end /* DOMDocument(JSSupport) */ +@end /* NGDOMDocument(JSSupport) */ -@implementation DOMNode(JSSupport) +@implementation NGDOMNode(JSSupport) - (NSString *)_jsprop_nodeName { return [self nodeName]; @@ -259,9 +259,9 @@ // #warning some JS DOMNode API missing -@end /* DOMNode(JSSupport) */ +@end /* NGDOMNode(JSSupport) */ -@implementation DOMCharacterData(JSSupport) +@implementation NGDOMCharacterData(JSSupport) - (void)_jsprop_data:(NSString *)_data { _data = [_data stringValue]; @@ -314,9 +314,9 @@ return self; } -@end /* DOMCharacterData(JSSupport) */ +@end /* NGDOMCharacterData(JSSupport) */ -@implementation DOMAttribute(JSSupport) +@implementation NGDOMAttribute(JSSupport) - (NSString *)_jsprop_name { return [self name]; @@ -336,9 +336,9 @@ return [self ownerElement]; } -@end /* DOMAttribute(JSSupport) */ +@end /* NGDOMAttribute(JSSupport) */ -@implementation DOMElement(JSSupport) +@implementation NGDOMElement(JSSupport) - (NSString *)_jsprop_tagName { return [self tagName]; @@ -437,9 +437,9 @@ namespaceURI:[[_args objectAtIndex:0] stringValue]]; } -@end /* DOMElement(JSSupport) */ +@end /* NGDOMElement(JSSupport) */ -@implementation DOMDocumentType(JSSupport) +@implementation NGDOMDocumentType(JSSupport) - (NSString *)_jsprop_name { return [self name]; @@ -454,9 +454,9 @@ return [self internalSubset]; } -@end /* DOMDocumentType(JSSupport) */ +@end /* NGDOMDocumentType(JSSupport) */ -@implementation DOMProcessingInstruction(JSSupport) +@implementation NGDOMProcessingInstruction(JSSupport) - (NSString *)_jsprop_target { return [self target]; @@ -469,4 +469,4 @@ return [self data]; } -@end /* DOMProcessingInstruction(JSSupport) */ +@end /* NGDOMProcessingInstruction(JSSupport) */ diff --git a/sope-xml/DOM/DOMAttribute.h b/sope-xml/DOM/DOMAttribute.h index 93015199..4cac2ced 100644 --- a/sope-xml/DOM/DOMAttribute.h +++ b/sope-xml/DOM/DOMAttribute.h @@ -47,7 +47,7 @@ parentNode, nextSibling, previousSibling always return nil !!! */ -@interface DOMAttribute : DOMNodeWithChildren < DOMAttr > +@interface NGDOMAttribute : NGDOMNodeWithChildren < DOMAttr > { id element; NSString *name; @@ -59,7 +59,7 @@ @end -@interface DOMAttribute(PrivateCtors) +@interface NGDOMAttribute(PrivateCtors) /* use DOMDocument for constructing DOMAttributes ! */ - (id)initWithName:(NSString *)_name; @@ -67,7 +67,7 @@ @end -@interface DOMAttribute(ObjCValues) +@interface NGDOMAttribute(ObjCValues) - (NSString *)stringValue; - (int)intValue; diff --git a/sope-xml/DOM/DOMAttribute.m b/sope-xml/DOM/DOMAttribute.m index 24d9a08e..bccd18b9 100644 --- a/sope-xml/DOM/DOMAttribute.m +++ b/sope-xml/DOM/DOMAttribute.m @@ -23,7 +23,7 @@ #include "DOMDocument.h" #include "common.h" -@implementation DOMAttribute +@implementation NGDOMAttribute - (id)initWithName:(NSString *)_name namespaceURI:(NSString *)_uri { if ((self = [super init])) { @@ -171,9 +171,7 @@ [self stringValue]]; } -@end /* DOMAttribute */ - -@implementation DOMAttribute(ObjCValues) +/* ObjCValues */ - (NSString *)stringValue { return [self value]; @@ -185,9 +183,7 @@ return [[self stringValue] doubleValue]; } -@end /* DOMAttribute(Values) */ - -@implementation DOMAttribute(QPValues) +/* QPValues */ - (NSException *)setQueryPathValue:(id)_value { [self setValue:[_value stringValue]]; @@ -197,4 +193,4 @@ return [self value]; } -@end /* DOMAttribute(QPValues) */ +@end /* NGDOMAttribute */ diff --git a/sope-xml/DOM/DOMCDATASection.h b/sope-xml/DOM/DOMCDATASection.h index c302b337..b740a276 100644 --- a/sope-xml/DOM/DOMCDATASection.h +++ b/sope-xml/DOM/DOMCDATASection.h @@ -24,13 +24,13 @@ #include -@interface DOMCDATASection : DOMText < DOMCDATASection > +@interface NGDOMCDATASection : NGDOMText < DOMCDATASection > { } @end -@interface DOMCDATASection(PrivateCtors) +@interface NGDOMCDATASection(PrivateCtors) /* use DOMDocument for constructing DOMCDATASection's ! */ @end diff --git a/sope-xml/DOM/DOMCDATASection.m b/sope-xml/DOM/DOMCDATASection.m index 4a3716cc..fc6d71b4 100644 --- a/sope-xml/DOM/DOMCDATASection.m +++ b/sope-xml/DOM/DOMCDATASection.m @@ -21,7 +21,7 @@ #include "DOMCDATASection.h" -@implementation DOMCDATASection +@implementation NGDOMCDATASection /* node */ @@ -46,4 +46,4 @@ return nil; } -@end /* DOMCDATASection */ +@end /* NGDOMCDATASection */ diff --git a/sope-xml/DOM/DOMCharacterData.h b/sope-xml/DOM/DOMCharacterData.h index 75a33eb0..629873b3 100644 --- a/sope-xml/DOM/DOMCharacterData.h +++ b/sope-xml/DOM/DOMCharacterData.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMCharacterData : DOMNode < DOMCharacterData > +@interface NGDOMCharacterData : NGDOMNode < DOMCharacterData > { id parent; NSString *data; diff --git a/sope-xml/DOM/DOMCharacterData.m b/sope-xml/DOM/DOMCharacterData.m index decf705a..8fbfc892 100644 --- a/sope-xml/DOM/DOMCharacterData.m +++ b/sope-xml/DOM/DOMCharacterData.m @@ -22,7 +22,7 @@ #include "DOMCharacterData.h" #include "common.h" -@implementation DOMCharacterData +@implementation NGDOMCharacterData - (id)initWithString:(NSString *)_s { if ((self = [super init])) { @@ -103,9 +103,7 @@ return self->parent; } -@end /* DOMCharacterData */ - -@implementation DOMCharacterData(QPValues) +/* QPValues */ - (NSException *)setQueryPathValue:(id)_value { [self setData:[_value stringValue]]; @@ -115,4 +113,4 @@ return [self data]; } -@end /* DOMCharacterData(QPValues) */ +@end /* NGDOMCharacterData(QPValues) */ diff --git a/sope-xml/DOM/DOMComment.h b/sope-xml/DOM/DOMComment.h index c73ca2c2..c13f69d4 100644 --- a/sope-xml/DOM/DOMComment.h +++ b/sope-xml/DOM/DOMComment.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMComment : DOMCharacterData < DOMComment > +@interface NGDOMComment : NGDOMCharacterData < DOMComment > { } diff --git a/sope-xml/DOM/DOMComment.m b/sope-xml/DOM/DOMComment.m index 6cd88fbf..a4f34198 100644 --- a/sope-xml/DOM/DOMComment.m +++ b/sope-xml/DOM/DOMComment.m @@ -21,7 +21,7 @@ #include "DOMComment.h" -@implementation DOMComment +@implementation NGDOMComment /* node */ @@ -46,4 +46,4 @@ return nil; } -@end /* DOMComment */ +@end /* NGDOMComment */ diff --git a/sope-xml/DOM/DOMDocument+factory.m b/sope-xml/DOM/DOMDocument+factory.m index 3bebc9d9..6cb2f651 100644 --- a/sope-xml/DOM/DOMDocument+factory.m +++ b/sope-xml/DOM/DOMDocument+factory.m @@ -29,7 +29,7 @@ #include -@implementation DOMDocument(DocumentTraversal) +@implementation NGDOMDocument(DocumentTraversal) - (Class)domTreeWalkerClass { return NSClassFromString(@"DOMTreeWalker"); @@ -61,4 +61,4 @@ return [walker autorelease]; } -@end /* DOMDocument(DocumentTraversal) */ +@end /* NGDOMDocument(DocumentTraversal) */ diff --git a/sope-xml/DOM/DOMDocument.h b/sope-xml/DOM/DOMDocument.h index 68e3f833..7042e9e6 100644 --- a/sope-xml/DOM/DOMDocument.h +++ b/sope-xml/DOM/DOMDocument.h @@ -25,14 +25,14 @@ #include @class NSString, NSArray; -@class DOMImplementation; +@class NGDOMImplementation; -@interface DOMDocument : DOMNodeWithChildren < DOMDocument > +@interface NGDOMDocument : NGDOMNodeWithChildren < DOMDocument > { NSString *qname; NSString *uri; id doctype; - DOMImplementation *dom; + NGDOMImplementation *dom; NSArray *errors; NSArray *warnings; @@ -49,7 +49,7 @@ @end -@interface DOMDocument(DocumentTraversal) +@interface NGDOMDocument(DocumentTraversal) - (id)createNodeIterator:(id)_node whatToShow:(unsigned long)_whatToShow @@ -62,14 +62,14 @@ @end -@interface DOMDocument(PrivateCtors) +@interface NGDOMDocument(PrivateCtors) /* use DOMImplementation for constructing DOMDocument ! */ - (id)initWithName:(NSString *)_qname namespaceURI:(NSString *)_uri documentType:(id)_doctype - dom:(DOMImplementation *)_dom; + dom:(NGDOMImplementation *)_dom; @end diff --git a/sope-xml/DOM/DOMDocument.m b/sope-xml/DOM/DOMDocument.m index 005fdd25..cd5da1f8 100644 --- a/sope-xml/DOM/DOMDocument.m +++ b/sope-xml/DOM/DOMDocument.m @@ -32,7 +32,7 @@ //#define PROF_DEALLOC 1 -@implementation DOMDocument +@implementation NGDOMDocument + (id)documentFromData:(NSData *)_data { id builder; @@ -54,7 +54,7 @@ - (id)initWithName:(NSString *)_qname namespaceURI:(NSString *)_uri documentType:(id)_doctype - dom:(DOMImplementation *)_dom + dom:(NGDOMImplementation *)_dom { self->dom = [_dom retain]; self->qname = [_qname copy]; @@ -112,7 +112,7 @@ - (id)doctype { return self->doctype; } -- (DOMImplementation *)implementation { +- (NGDOMImplementation *)implementation { return self->dom; } @@ -198,8 +198,8 @@ } - (id)getElementsByTagName:(NSString *)_tagName { /* introduced in DOM2, should return a *live* list ! */ - NSMutableArray *array; - DOMNodePreorderWalker *walker; + NSMutableArray *array; + NGDOMNodePreorderWalker *walker; SEL sel; id ctx; @@ -209,7 +209,7 @@ if (_tagName == nil) return nil; - array = [NSMutableArray array]; + array = [NSMutableArray arrayWithCapacity:4]; if ([_tagName isEqualToString:@"*"]) { _tagName = nil; @@ -221,10 +221,8 @@ sel = @selector(_walk_getElementsByTagName:); } - walker = [[DOMNodePreorderWalker alloc] - initWithTarget:self - selector:sel - context:ctx]; + walker = [[NGDOMNodePreorderWalker alloc] + initWithTarget:self selector:sel context:ctx]; [walker walkNode:self]; @@ -357,9 +355,7 @@ return [elem autorelease]; } -@end /* DOMDocument */ - -@implementation DOMDocument(QPValues) +/* QPValues */ - (NSException *)setQueryPathValue:(id)_value { return [NSException exceptionWithName:@"QueryPathEvalException" @@ -370,4 +366,4 @@ return [self documentElement]; } -@end /* DOMDocument(QPValues) */ +@end /* NGDOMDocument */ diff --git a/sope-xml/DOM/DOMDocumentFragment.h b/sope-xml/DOM/DOMDocumentFragment.h index 87ba807d..d18602b0 100644 --- a/sope-xml/DOM/DOMDocumentFragment.h +++ b/sope-xml/DOM/DOMDocumentFragment.h @@ -25,20 +25,20 @@ #include @class NSString; -@class DOMImplementation; +@class NGDOMImplementation; -@interface DOMDocumentFragment : DOMNodeWithChildren < DOMDocumentFragment > +@interface NGDOMDocumentFragment : NGDOMNodeWithChildren < DOMDocumentFragment > { } @end -@interface DOMDocumentFragment(PrivateCtors) +@interface NGDOMDocumentFragment(PrivateCtors) /* use DOMImplementation for constructing DOMDocumentFragment's ! */ - (id)initWithName:(NSString *)_name publicId:(NSString *)_p systemId:(NSString *)_s - dom:(DOMImplementation *)_dom; + dom:(NGDOMImplementation *)_dom; @end diff --git a/sope-xml/DOM/DOMDocumentType.h b/sope-xml/DOM/DOMDocumentType.h index eac18d27..ecd6f2e5 100644 --- a/sope-xml/DOM/DOMDocumentType.h +++ b/sope-xml/DOM/DOMDocumentType.h @@ -24,7 +24,7 @@ #include -@interface DOMDocumentType : DOMNode +@interface NGDOMDocumentType : NGDOMNode { id parent; } @@ -42,7 +42,7 @@ @end -@interface DOMDocumentType(PrivateCtors) +@interface NGDOMDocumentType(PrivateCtors) /* use DOMDocument for constructing DOMDocumentType's ! */ - (id)initWithName:(NSString *)_name diff --git a/sope-xml/DOM/DOMDocumentType.m b/sope-xml/DOM/DOMDocumentType.m index aec8878a..8701166e 100644 --- a/sope-xml/DOM/DOMDocumentType.m +++ b/sope-xml/DOM/DOMDocumentType.m @@ -22,7 +22,7 @@ #include "DOMDocumentType.h" #include "common.h" -@implementation DOMDocumentType +@implementation NGDOMDocumentType - (id)initWithName:(NSString *)_name publicId:(NSString *)_pubId @@ -88,4 +88,4 @@ return self->parent; } -@end /* DOMDocumentType */ +@end /* NGDOMDocumentType */ diff --git a/sope-xml/DOM/DOMElement.h b/sope-xml/DOM/DOMElement.h index 99378940..b55481e3 100644 --- a/sope-xml/DOM/DOMElement.h +++ b/sope-xml/DOM/DOMElement.h @@ -40,7 +40,7 @@ @class NSString, NSMutableDictionary, NSMutableArray; -@interface DOMElement : DOMNodeWithChildren < DOMElement > +@interface NGDOMElement : NGDOMNodeWithChildren < DOMElement > { id parent; NSString *tagName; @@ -59,7 +59,7 @@ @end -@interface DOMElement(PrivateCtors) +@interface NGDOMElement(PrivateCtors) /* use DOMDocument for constructing DOMElements ! */ - (id)initWithTagName:(NSString *)_tagName; diff --git a/sope-xml/DOM/DOMElement.m b/sope-xml/DOM/DOMElement.m index 9712f3f1..256901c0 100644 --- a/sope-xml/DOM/DOMElement.m +++ b/sope-xml/DOM/DOMElement.m @@ -28,7 +28,7 @@ @interface _DOMElementAttrNamedNodeMap : NSObject < DOMNamedNodeMap > { - DOMElement *element; /* non-retained */ + NGDOMElement *element; /* non-retained */ } - (id)initWithElement:(id)_element; @@ -39,7 +39,7 @@ @end /* _DOMElementAttrNamedNodeMap */ -@interface DOMElement(Privates) +@interface NGDOMElement(Privates) - (unsigned)_numberOfAttributes; - (id)_attributeNodeAtIndex:(unsigned)_idx; - (id)attributeNode:(NSString *)_localName; @@ -48,7 +48,7 @@ static NSNull *null = nil; -@implementation DOMElement +@implementation NGDOMElement - (id)initWithTagName:(NSString *)_tagName namespaceURI:(NSString *)_uri { if (null == nil) @@ -132,8 +132,8 @@ static NSNull *null = nil; } - (id)getElementsByTagName:(NSString *)_tagName { /* introduced in DOM2, should return a *live* list ! */ - NSMutableArray *array; - DOMNodePreorderWalker *walker; + NGDOMNodePreorderWalker *walker; + NSMutableArray *array; SEL sel; id ctx; @@ -143,7 +143,7 @@ static NSNull *null = nil; if (_tagName == nil) return nil; - array = [NSMutableArray array]; + array = [NSMutableArray arrayWithCapacity:4]; if ([_tagName isEqualToString:@"*"]) { _tagName = nil; @@ -155,10 +155,8 @@ static NSNull *null = nil; sel = @selector(_walk_getElementsByTagName:); } - walker = [[DOMNodePreorderWalker alloc] - initWithTarget:self - selector:sel - context:ctx]; + walker = [[NGDOMNodePreorderWalker alloc] + initWithTarget:self selector:sel context:ctx]; [walker walkNode:self]; @@ -511,9 +509,7 @@ static NSNull *null = nil; [self hasChildNodes] ? [[self childNodes] length] : 0]; } -@end /* DOMElement */ - -@implementation DOMElement(QPValues) +/* QPValues */ - (NSException *)setQueryPathValue:(id)_value { return [NSException exceptionWithName:@"QueryPathEvalException" @@ -524,7 +520,7 @@ static NSNull *null = nil; return [self childNodes]; } -@end /* DOMElement(QPValues) */ +@end /* NGDOMElement */ @implementation _DOMElementAttrNamedNodeMap diff --git a/sope-xml/DOM/DOMEntity.h b/sope-xml/DOM/DOMEntity.h index 46bb614a..08e6d856 100644 --- a/sope-xml/DOM/DOMEntity.h +++ b/sope-xml/DOM/DOMEntity.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMEntity : DOMNodeWithChildren +@interface NGDOMEntity : NGDOMNodeWithChildren { } @@ -40,7 +40,7 @@ @end -@interface DOMEntity(PrivateCtors) +@interface NGDOMEntity(PrivateCtors) /* use DOMDocument for constructing DOMEntity's ! */ @end diff --git a/sope-xml/DOM/DOMEntity.m b/sope-xml/DOM/DOMEntity.m index 51510665..012acf42 100644 --- a/sope-xml/DOM/DOMEntity.m +++ b/sope-xml/DOM/DOMEntity.m @@ -22,7 +22,7 @@ #include "DOMEntity.h" #include "common.h" -@implementation DOMEntity +@implementation NGDOMEntity /* attributes */ @@ -76,4 +76,4 @@ return nil; } -@end /* DOMEntity */ +@end /* NGDOMEntity */ diff --git a/sope-xml/DOM/DOMEntityReference.h b/sope-xml/DOM/DOMEntityReference.h index f880529a..77ad6d29 100644 --- a/sope-xml/DOM/DOMEntityReference.h +++ b/sope-xml/DOM/DOMEntityReference.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMEntityReference : DOMNodeWithChildren +@interface NGDOMEntityReference : NGDOMNodeWithChildren { id parent; NSString *name; @@ -38,7 +38,7 @@ @end -@interface DOMEntityReference(PrivateCtors) +@interface NGDOMEntityReference(PrivateCtors) /* use DOMDocument for constructing DOMEntityReference's ! */ - (id)initWithName:(NSString *)_name; diff --git a/sope-xml/DOM/DOMEntityReference.m b/sope-xml/DOM/DOMEntityReference.m index fe0a8aca..f5c9e5f5 100644 --- a/sope-xml/DOM/DOMEntityReference.m +++ b/sope-xml/DOM/DOMEntityReference.m @@ -22,7 +22,7 @@ #include "DOMEntityReference.h" #include "common.h" -@implementation DOMEntityReference +@implementation NGDOMEntityReference - (id)initWithName:(NSString *)_name { self->name = [_name copy]; @@ -55,4 +55,4 @@ return self->parent; } -@end /* DOMEntityReference */ +@end /* NGDOMEntityReference */ diff --git a/sope-xml/DOM/DOMImplementation.h b/sope-xml/DOM/DOMImplementation.h index f9e5ba0d..d05879eb 100644 --- a/sope-xml/DOM/DOMImplementation.h +++ b/sope-xml/DOM/DOMImplementation.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMImplementation : NSObject +@interface NGDOMImplementation : NSObject { Class elementClass; Class textNodeClass; @@ -43,7 +43,7 @@ @end -@interface DOMImplementation(PrivateClassRegistry) +@interface NGDOMImplementation(PrivateClassRegistry) - (Class)domElementClass; - (Class)domElementNSClass; - (Class)domDocumentFragmentClass; diff --git a/sope-xml/DOM/DOMImplementation.m b/sope-xml/DOM/DOMImplementation.m index c003f0ef..4a80a7c4 100644 --- a/sope-xml/DOM/DOMImplementation.m +++ b/sope-xml/DOM/DOMImplementation.m @@ -24,20 +24,20 @@ #include "DOMDocumentFragment.h" #include "common.h" -@implementation DOMImplementation +@implementation NGDOMImplementation - (id)init { - self->elementClass = NSClassFromString(@"DOMElement"); - self->textNodeClass = NSClassFromString(@"DOMText"); - self->attrClass = NSClassFromString(@"DOMAttribute"); + self->elementClass = NSClassFromString(@"NGDOMElement"); + self->textNodeClass = NSClassFromString(@"NGDOMText"); + self->attrClass = NSClassFromString(@"NGDOMAttribute"); return self; } - (Class)domDocumentClass { - return [DOMDocument class]; + return [NGDOMDocument class]; } - (Class)domDocumentTypeClass { - return NSClassFromString(@"DOMDocumentType"); + return NSClassFromString(@"NGDOMDocumentType"); } - (Class)domElementClass { @@ -47,19 +47,19 @@ return self->elementClass; } - (Class)domDocumentFragmentClass { - return NSClassFromString(@"DOMDocumentFragment"); + return NSClassFromString(@"NGDOMDocumentFragment"); } - (Class)domTextNodeClass { return self->textNodeClass; } - (Class)domCommentClass { - return NSClassFromString(@"DOMComment"); + return NSClassFromString(@"NGDOMComment"); } - (Class)domCDATAClass { - return NSClassFromString(@"DOMCDATA"); + return NSClassFromString(@"NGDOMCDATA"); } - (Class)domProcessingInstructionClass { - return NSClassFromString(@"DOMProcessingInstruction"); + return NSClassFromString(@"NGDOMProcessingInstruction"); } - (Class)domAttributeClass { return self->attrClass; @@ -68,7 +68,7 @@ return self->attrClass; } - (Class)domEntityReferenceClass { - return NSClassFromString(@"DOMEntityReference"); + return NSClassFromString(@"NGDOMEntityReference"); } - (id)createDocumentWithName:(NSString *)_qname @@ -77,12 +77,9 @@ { id doc; - doc = [[[self domDocumentClass] - alloc] - initWithName:_qname - namespaceURI:_uri - documentType:_doctype - dom:self]; + doc = [[[self domDocumentClass] alloc] + initWithName:_qname namespaceURI:_uri documentType:_doctype + dom:self]; return [doc autorelease]; } @@ -93,14 +90,10 @@ { id doc; - doc = [[[self domDocumentTypeClass] - alloc] - initWithName:_qname - publicId:_pubId - systemId:_sysId - dom:self]; + doc = [[[self domDocumentTypeClass] alloc] + initWithName:_qname publicId:_pubId systemId:_sysId dom:self]; return [doc autorelease]; } -@end /* DOMImplementation */ +@end /* NGDOMImplementation */ diff --git a/sope-xml/DOM/DOMNode+Enum.h b/sope-xml/DOM/DOMNode+Enum.h index 298d1928..4a2d87b8 100644 --- a/sope-xml/DOM/DOMNode+Enum.h +++ b/sope-xml/DOM/DOMNode+Enum.h @@ -30,12 +30,12 @@ - (NSEnumerator *)domParentNodeEnumerator; -@end /* DOMNode(Enum) */ +@end /* NSObject(DOMNodeEnum) */ -@interface DOMNode(Enum) +@interface NGDOMNode(Enum) - (NSEnumerator *)parentNodeEnumerator; -@end /* DOMNode(Enum) */ +@end /* NGDOMNode(Enum) */ #endif /* __DOM_DOMNodeEnum_H__ */ diff --git a/sope-xml/DOM/DOMNode+Enum.m b/sope-xml/DOM/DOMNode+Enum.m index 9b301951..220ae008 100644 --- a/sope-xml/DOM/DOMNode+Enum.m +++ b/sope-xml/DOM/DOMNode+Enum.m @@ -33,18 +33,18 @@ - (NSEnumerator *)domParentNodeEnumerator { return [_DOMNodeParentNodeEnumerator enumeratorWithDOMNode: - [(DOMNode *)self parentNode]]; + [(NGDOMNode *)self parentNode]]; } -@end /* DOMNode(Enum) */ +@end /* NSObject(DOMNodeEnum) */ -@implementation DOMNode(Enum) +@implementation NGDOMNode(Enum) - (NSEnumerator *)parentNodeEnumerator { return [self domParentNodeEnumerator]; } -@end /* DOMNode(Enum) */ +@end /* NGDOMNode(Enum) */ @implementation _DOMNodeParentNodeEnumerator diff --git a/sope-xml/DOM/DOMNode+QPEval.m b/sope-xml/DOM/DOMNode+QPEval.m index dc478b75..c51501ec 100644 --- a/sope-xml/DOM/DOMNode+QPEval.m +++ b/sope-xml/DOM/DOMNode+QPEval.m @@ -24,18 +24,18 @@ #include "DOMDocument.h" #include "common.h" -@implementation DOMNode(QPEval) +@implementation NGDOMNode(QPEval) - (id)queryPathRootObjectInContext:(id)_ctx { return [self ownerDocument]; } -@end /* DOMNode(QPEval) */ +@end /* NGDOMNode(QPEval) */ -@implementation DOMDocument(QPEval) +@implementation NGDOMDocument(QPEval) - (id)queryPathRootObjectInContext:(id)_ctx { return self; } -@end /* DOMNode(QPEval) */ +@end /* NGDOMNode(QPEval) */ diff --git a/sope-xml/DOM/DOMNode+QueryPath.h b/sope-xml/DOM/DOMNode+QueryPath.h index 3f2c3ae8..3ac4ca6c 100644 --- a/sope-xml/DOM/DOMNode+QueryPath.h +++ b/sope-xml/DOM/DOMNode+QueryPath.h @@ -32,7 +32,7 @@ @class NSString, NSArray; -@interface DOMNode(QueryPath) +@interface NGDOMNode(QueryPath) /* Evaluate a stack of path specifiers. */ - (id)lookupPathComponents:(NSArray *)_path; diff --git a/sope-xml/DOM/DOMNode+QueryPath.m b/sope-xml/DOM/DOMNode+QueryPath.m index a2812db6..e29d9805 100644 --- a/sope-xml/DOM/DOMNode+QueryPath.m +++ b/sope-xml/DOM/DOMNode+QueryPath.m @@ -23,7 +23,7 @@ #include "DOMQueryPathExpression.h" #include "common.h" -@implementation DOMNode(QueryPath) +@implementation NGDOMNode(QueryPath) - (id)lookupPathComponents:(NSArray *)_path { DOMQueryPathExpression *expr; diff --git a/sope-xml/DOM/DOMNode.h b/sope-xml/DOM/DOMNode.h index f0598518..62b7c88b 100644 --- a/sope-xml/DOM/DOMNode.h +++ b/sope-xml/DOM/DOMNode.h @@ -26,15 +26,15 @@ #include @class NSMutableArray, NSData; -@class DOMDocument; +@class NGDOMDocument; -@interface DOMNode : NSObject < DOMNode > +@interface NGDOMNode : NSObject < DOMNode > { } @end -@interface DOMNode(Additions) +@interface NGDOMNode(Additions) - (NSString *)nodeTypeString; - (NSString *)xmlStringValue; @@ -43,7 +43,7 @@ @end -@interface DOMNodeWithChildren : DOMNode +@interface NGDOMNodeWithChildren : NGDOMNode { @private NSMutableArray *childNodes; diff --git a/sope-xml/DOM/DOMNode.m b/sope-xml/DOM/DOMNode.m index 5f541f8b..5aa908b6 100644 --- a/sope-xml/DOM/DOMNode.m +++ b/sope-xml/DOM/DOMNode.m @@ -64,7 +64,7 @@ NSString *DOMNodeValue(id _node) { case DOM_CDATA_SECTION_NODE: case DOM_COMMENT_NODE: case DOM_TEXT_NODE: - return [(DOMCharacterData *)_node data]; + return [(id)_node data]; case DOM_DOCUMENT_NODE: case DOM_DOCUMENT_FRAGMENT_NODE: @@ -72,7 +72,7 @@ NSString *DOMNodeValue(id _node) { return nil; case DOM_PROCESSING_INSTRUCTION_NODE: - return [(DOMProcessingInstruction *)_node data]; + return [(id)_node data]; case DOM_DOCUMENT_TYPE_NODE: case DOM_ENTITY_NODE: @@ -84,7 +84,7 @@ NSString *DOMNodeValue(id _node) { } } -@implementation DOMNode +@implementation NGDOMNode - (void)_domNodeRegisterParentNode:(id)_parent { } @@ -169,17 +169,17 @@ NSString *DOMNodeValue(id _node) { } - (id)previousSibling { - DOMNode *parent; + NGDOMNode *parent; - if ((parent = (DOMNode *)[self parentNode]) == nil) return nil; + if ((parent = (NGDOMNode *)[self parentNode]) == nil) return nil; if (parent == nil) return nil; if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil; return [parent _domNodeBeforeNode:self]; } - (id)nextSibling { - DOMNode *parent; + NGDOMNode *parent; - if ((parent = (DOMNode *)[self parentNode]) == nil) return nil; + if ((parent = (NGDOMNode *)[self parentNode]) == nil) return nil; if (parent == nil) return nil; if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil; return [parent _domNodeAfterNode:self]; @@ -210,12 +210,12 @@ NSString *DOMNodeValue(id _node) { [self hasChildNodes] ? [[self childNodes] length] : 0]; } -@end /* DOMNode */ +@end /* NGDOMNode */ #include "DOMXMLOutputter.h" #include "DOMCharacterData.h" -@implementation DOMNode(Additions) +@implementation NGDOMNode(Additions) - (NSString *)nodeTypeString { switch ([self nodeType]) { @@ -282,7 +282,7 @@ NSString *DOMNodeValue(id _node) { case DOM_TEXT_NODE: case DOM_COMMENT_NODE: case DOM_CDATA_SECTION_NODE: - [s appendString:[(DOMCharacterData *)self data]]; + [s appendString:[(id)self data]]; break; default: @@ -292,7 +292,7 @@ NSString *DOMNodeValue(id _node) { return [[s copy] autorelease]; } -@end /* DOMNode(Additions) */ +@end /* NGDOMNode(Additions) */ @implementation NSArray(DOMNodeList) diff --git a/sope-xml/DOM/DOMNodeFilter.h b/sope-xml/DOM/DOMNodeFilter.h index 99cb41d5..3a0da1a6 100644 --- a/sope-xml/DOM/DOMNodeFilter.h +++ b/sope-xml/DOM/DOMNodeFilter.h @@ -46,7 +46,7 @@ typedef enum { #define DOM_SHOW_DOCUMENT_FRAGMENT 0x00000400 #define DOM_SHOW_NOTATION 0x00000800 -@interface DOMNodeFilter : NSObject +@interface NGDOMNodeFilter : NSObject - (DOMNodeFilterType)acceptNode:(id)_node; diff --git a/sope-xml/DOM/DOMNodeFilter.m b/sope-xml/DOM/DOMNodeFilter.m index 3bffca4e..27226437 100644 --- a/sope-xml/DOM/DOMNodeFilter.m +++ b/sope-xml/DOM/DOMNodeFilter.m @@ -21,10 +21,10 @@ #include "DOMNodeFilter.h" -@implementation DOMNodeFilter +@implementation NGDOMNodeFilter - (DOMNodeFilterType)acceptNode:(id)_node { return DOM_FILTER_ACCEPT; } -@end /* DOMNodeFilter */ +@end /* NGDOMNodeFilter */ diff --git a/sope-xml/DOM/DOMNodeIterator.h b/sope-xml/DOM/DOMNodeIterator.h index 7b6d6978..3929c6ab 100644 --- a/sope-xml/DOM/DOMNodeIterator.h +++ b/sope-xml/DOM/DOMNodeIterator.h @@ -24,7 +24,7 @@ #import -@interface DOMNodeIterator : NSObject +@interface NGDOMNodeIterator : NSObject { id root; unsigned long whatToShow; diff --git a/sope-xml/DOM/DOMNodeIterator.m b/sope-xml/DOM/DOMNodeIterator.m index ab493ea4..48542e51 100644 --- a/sope-xml/DOM/DOMNodeIterator.m +++ b/sope-xml/DOM/DOMNodeIterator.m @@ -24,7 +24,7 @@ #include #include "common.h" -@implementation DOMNodeIterator +@implementation NGDOMNodeIterator - (id)initWithRootNode:(id)_rootNode whatToShow:(unsigned long)_whatToShow @@ -82,4 +82,4 @@ - (void)detach { } -@end /* DOMNodeIterator */ +@end /* NGDOMNodeIterator */ diff --git a/sope-xml/DOM/DOMNodeWalker.h b/sope-xml/DOM/DOMNodeWalker.h index 368f74e5..9b718b9b 100644 --- a/sope-xml/DOM/DOMNodeWalker.h +++ b/sope-xml/DOM/DOMNodeWalker.h @@ -24,7 +24,7 @@ #import -@interface DOMNodeWalker : NSObject +@interface NGDOMNodeWalker : NSObject { id target; SEL selector; @@ -52,9 +52,9 @@ @end -@interface DOMNodePreorderWalker : DOMNodeWalker +@interface NGDOMNodePreorderWalker : NGDOMNodeWalker @end -@interface DOMNodePostorderWalker : DOMNodeWalker +@interface NGDOMNodePostorderWalker : NGDOMNodeWalker @end #endif /* __DOMNodeWalker_H__ */ diff --git a/sope-xml/DOM/DOMNodeWalker.m b/sope-xml/DOM/DOMNodeWalker.m index 7c719c31..3356ffd5 100644 --- a/sope-xml/DOM/DOMNodeWalker.m +++ b/sope-xml/DOM/DOMNodeWalker.m @@ -23,11 +23,11 @@ #include "DOMNode.h" #include "common.h" -@interface DOMNodeWalker(Privates) +@interface NGDOMNodeWalker(Privates) - (void)_processCurrentNode; @end -@implementation DOMNodeWalker +@implementation NGDOMNodeWalker - (id)initWithTarget:(id)_target selector:(SEL)_selector context:(id)_ctx { self->target = [_target retain]; @@ -125,9 +125,9 @@ self->isStopped = YES; } -@end /* DOMNodeWalker */ +@end /* NGDOMNodeWalker */ -@implementation DOMNodePreorderWalker +@implementation NGDOMNodePreorderWalker - (void)_beforeChildren { [self _processCurrentNode]; @@ -135,9 +135,9 @@ - (void)_afterChildren { } -@end /* DOMNodePreorderWalker */ +@end /* NGDOMNodePreorderWalker */ -@implementation DOMNodePostorderWalker +@implementation NGDOMNodePostorderWalker - (void)_beforeChildren { } @@ -145,4 +145,4 @@ [self _processCurrentNode]; } -@end /* DOMNodePreorderWalker */ +@end /* NGDOMNodePreorderWalker */ diff --git a/sope-xml/DOM/DOMNodeWithChildren.m b/sope-xml/DOM/DOMNodeWithChildren.m index ec6fc853..f4c28033 100644 --- a/sope-xml/DOM/DOMNodeWithChildren.m +++ b/sope-xml/DOM/DOMNodeWithChildren.m @@ -22,7 +22,7 @@ #include #include "common.h" -@implementation DOMNodeWithChildren +@implementation NGDOMNodeWithChildren - (void)dealloc { [self->childNodes makeObjectsPerformSelector: @@ -161,4 +161,4 @@ return [self->childNodes objectAtIndex:(idx + 1)]; } -@end /* DOMNodeWithChildren */ +@end /* NGDOMNodeWithChildren */ diff --git a/sope-xml/DOM/DOMNotation.h b/sope-xml/DOM/DOMNotation.h index 6fec173c..a3c3433e 100644 --- a/sope-xml/DOM/DOMNotation.h +++ b/sope-xml/DOM/DOMNotation.h @@ -24,7 +24,7 @@ #include -@interface DOMNotation : DOMNode +@interface NGDOMNotation : NGDOMNode { } @@ -34,7 +34,7 @@ @end -@interface DOMNotation(PrivateCtors) +@interface NGDOMNotation(PrivateCtors) /* use DOMDocument for constructing DOMNotation's ! */ @end diff --git a/sope-xml/DOM/DOMNotation.m b/sope-xml/DOM/DOMNotation.m index 0cb1ca50..e883e170 100644 --- a/sope-xml/DOM/DOMNotation.m +++ b/sope-xml/DOM/DOMNotation.m @@ -21,7 +21,7 @@ #include "DOMNotation.h" -@implementation DOMNotation +@implementation NGDOMNotation - (DOMNodeType)nodeType { return DOM_NOTATION_NODE; @@ -56,4 +56,4 @@ return nil; } -@end /* DOMNotation */ +@end /* NGDOMNotation */ diff --git a/sope-xml/DOM/DOMPYXOutputter.h b/sope-xml/DOM/DOMPYXOutputter.h index a267dbc5..d14d30b5 100644 --- a/sope-xml/DOM/DOMPYXOutputter.h +++ b/sope-xml/DOM/DOMPYXOutputter.h @@ -24,7 +24,7 @@ #import -@interface DOMPYXOutputter : NSObject +@interface NGDOMPYXOutputter : NSObject { } diff --git a/sope-xml/DOM/DOMPYXOutputter.m b/sope-xml/DOM/DOMPYXOutputter.m index f3bb5fb0..ce69a2af 100644 --- a/sope-xml/DOM/DOMPYXOutputter.m +++ b/sope-xml/DOM/DOMPYXOutputter.m @@ -24,12 +24,12 @@ #include "DOMElement.h" #include "common.h" -@interface DOMPYXOutputter(Privates) +@interface NGDOMPYXOutputter(Privates) - (void)outputNode:(id)_node to:(id)_target; - (void)outputNodeList:(id)_nodeList to:(id)_target; @end -@implementation DOMPYXOutputter +@implementation NGDOMPYXOutputter - (void)write:(NSString *)s to:(id)_target { printf("%s", [s cString]); diff --git a/sope-xml/DOM/DOMProcessingInstruction.h b/sope-xml/DOM/DOMProcessingInstruction.h index c755d10c..5caa3072 100644 --- a/sope-xml/DOM/DOMProcessingInstruction.h +++ b/sope-xml/DOM/DOMProcessingInstruction.h @@ -26,7 +26,7 @@ @class NSString; -@interface DOMProcessingInstruction : DOMNode +@interface NGDOMProcessingInstruction : NGDOMNode { id parent; NSString *target; @@ -43,7 +43,7 @@ @end -@interface DOMProcessingInstruction(PrivateCtors) +@interface NGDOMProcessingInstruction(PrivateCtors) /* use DOMDocument for constructing DOMProcessingInstructions ! */ - (id)initWithTarget:(NSString *)_target data:(NSString *)_data; diff --git a/sope-xml/DOM/DOMProcessingInstruction.m b/sope-xml/DOM/DOMProcessingInstruction.m index 8b5fb440..8efe4a05 100644 --- a/sope-xml/DOM/DOMProcessingInstruction.m +++ b/sope-xml/DOM/DOMProcessingInstruction.m @@ -22,7 +22,7 @@ #include "DOMProcessingInstruction.h" #include "common.h" -@implementation DOMProcessingInstruction +@implementation NGDOMProcessingInstruction - (id)initWithTarget:(NSString *)_target data:(NSString *)_data { if ((self = [super init])) { @@ -101,4 +101,4 @@ [self target], [self data]]; } -@end /* DOMProcessingInstruction */ +@end /* NGDOMProcessingInstruction */ diff --git a/sope-xml/DOM/DOMProtocols.h b/sope-xml/DOM/DOMProtocols.h index ef84547f..46a72c91 100644 --- a/sope-xml/DOM/DOMProtocols.h +++ b/sope-xml/DOM/DOMProtocols.h @@ -222,12 +222,12 @@ typedef enum { @protocol DOMEntityReference < DOMNode > @end -@class DOMImplementation; +@class NGDOMImplementation; @protocol DOMDocument < DOMNode > - (id)doctype; -- (DOMImplementation *)implementation; +- (NGDOMImplementation *)implementation; - (id)documentElement; - (id)getElementsByTagName:(NSString *)_tagName; diff --git a/sope-xml/DOM/DOMQueryPathExpression.m b/sope-xml/DOM/DOMQueryPathExpression.m index d285b54e..48e92f80 100644 --- a/sope-xml/DOM/DOMQueryPathExpression.m +++ b/sope-xml/DOM/DOMQueryPathExpression.m @@ -237,7 +237,7 @@ switch ([_domNode nodeType]) { case DOM_DOCUMENT_NODE: case DOM_DOCUMENT_FRAGMENT_NODE: - root = [(DOMDocument *)_domNode documentElement]; + root = [(id)_domNode documentElement]; if (root == nil) { NSLog(@"WARNING(%s): document node %@ has no root element !", __PRETTY_FUNCTION__, _domNode); @@ -256,7 +256,7 @@ break; case DOM_ATTRIBUTE_NODE: - root = [(DOMAttribute *)_domNode ownerElement]; + root = [(id)_domNode ownerElement]; if (root == nil) { NSLog(@"WARNING(%s): attribute node %@ has no owner element !", __PRETTY_FUNCTION__, _domNode); diff --git a/sope-xml/DOM/DOMSaxHandler.m b/sope-xml/DOM/DOMSaxHandler.m index 6a8a91ee..40757cfd 100644 --- a/sope-xml/DOM/DOMSaxHandler.m +++ b/sope-xml/DOM/DOMSaxHandler.m @@ -45,7 +45,7 @@ static BOOL printErrors = NO; static id idom = nil; if (idom == nil) - idom = [[DOMImplementation alloc] init]; + idom = [[NGDOMImplementation alloc] init]; return [self initWithDOMImplementation:idom]; } diff --git a/sope-xml/DOM/DOMText.h b/sope-xml/DOM/DOMText.h index 0a0badcc..bb99c548 100644 --- a/sope-xml/DOM/DOMText.h +++ b/sope-xml/DOM/DOMText.h @@ -42,7 +42,7 @@ not seen in that view. */ -@interface DOMText : DOMCharacterData < DOMText > +@interface NGDOMText : NGDOMCharacterData < DOMText > { } diff --git a/sope-xml/DOM/DOMText.m b/sope-xml/DOM/DOMText.m index 26821308..f8108af7 100644 --- a/sope-xml/DOM/DOMText.m +++ b/sope-xml/DOM/DOMText.m @@ -25,7 +25,7 @@ - (id)doesNotRecognizeSelector:(SEL)_sel; @end -@implementation DOMText +@implementation NGDOMText /* node */ @@ -71,4 +71,4 @@ return nil; } -@end /* DOMText */ +@end /* NGDOMText */ diff --git a/sope-xml/DOM/DOMTreeWalker.h b/sope-xml/DOM/DOMTreeWalker.h index 70c062cb..d4722c4b 100644 --- a/sope-xml/DOM/DOMTreeWalker.h +++ b/sope-xml/DOM/DOMTreeWalker.h @@ -27,7 +27,7 @@ @class NSArray; -@interface DOMTreeWalker : NSObject +@interface NGDOMTreeWalker : NSObject { id root; unsigned long whatToShow; @@ -62,7 +62,7 @@ @end -@interface DOMTreeWalker(PrivateCtors) +@interface NGDOMTreeWalker(PrivateCtors) /* use DOMDocument(DocumentTraversal) for constructing DOMTreeWalker's ! */ - (id)initWithRootNode:(id)_rootNode diff --git a/sope-xml/DOM/DOMTreeWalker.m b/sope-xml/DOM/DOMTreeWalker.m index b8954d6f..eb305a2d 100644 --- a/sope-xml/DOM/DOMTreeWalker.m +++ b/sope-xml/DOM/DOMTreeWalker.m @@ -24,7 +24,7 @@ #include #include "common.h" -@implementation DOMTreeWalker +@implementation NGDOMTreeWalker - (id)initWithRootNode:(id)_rootNode whatToShow:(unsigned long)_whatToShow @@ -293,4 +293,4 @@ return nil; } -@end /* DOMTreeWalker */ +@end /* NGDOMTreeWalker */ diff --git a/sope-xml/DOM/Version b/sope-xml/DOM/Version index a6180019..cabd6ef3 100644 --- a/sope-xml/DOM/Version +++ b/sope-xml/DOM/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=14 +SUBMINOR_VERSION:=15 diff --git a/sope-xml/samples/ChangeLog b/sope-xml/samples/ChangeLog index d31d8f20..21621003 100644 --- a/sope-xml/samples/ChangeLog +++ b/sope-xml/samples/ChangeLog @@ -1,3 +1,7 @@ +2005-05-03 Helge Hess + + * fixed gcc 4.0 warnings, changed for new DOM implemention names + 2004-08-31 Helge Hess * fixed linking for FHS configurations diff --git a/sope-xml/samples/domxml.m b/sope-xml/samples/domxml.m index 897f29be..aaa2f570 100644 --- a/sope-xml/samples/domxml.m +++ b/sope-xml/samples/domxml.m @@ -71,7 +71,7 @@ int main(int argc, char **argv, char **env) { if ([path hasPrefix:@"-"]) { if ([path isEqualToString:@"-pyx"]) { - out = [[[DOMPYXOutputter alloc] init] autorelease]; + out = [[[NGDOMPYXOutputter alloc] init] autorelease]; } else if ([path isEqualToString:@"-xml"]) { out = [[[DOMXMLOutputter alloc] init] autorelease]; diff --git a/sope-xml/samples/testqp.m b/sope-xml/samples/testqp.m index 726915aa..996e835b 100644 --- a/sope-xml/samples/testqp.m +++ b/sope-xml/samples/testqp.m @@ -68,7 +68,7 @@ int main(int argc, char **argv, char **env) { if ([path hasPrefix:@"-"]) { if ([path isEqualToString:@"-pyx"]) { - out = [[[DOMPYXOutputter alloc] init] autorelease]; + out = [[[NGDOMPYXOutputter alloc] init] autorelease]; } else if ([path isEqualToString:@"-xml"]) { out = [[[DOMXMLOutputter alloc] init] autorelease]; -- 2.39.5