From 749f4392dae83bc8feb12f402735513eb4fd7139 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Thu, 7 Jul 2016 21:05:10 -0700 Subject: [PATCH] Use properties like latest NSXML headers --- KissXML/DDXMLDocument.h | 2 +- KissXML/DDXMLNode.h | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/KissXML/DDXMLDocument.h b/KissXML/DDXMLDocument.h index ec5276c6..9e39c762 100644 --- a/KissXML/DDXMLDocument.h +++ b/KissXML/DDXMLDocument.h @@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN //- (void)replaceChildAtIndex:(NSUInteger)index withNode:(DDXMLNode *)node; -- (NSData *)XMLData; +@property (readonly, copy) NSData *XMLData; - (NSData *)XMLDataWithOptions:(NSUInteger)options; //- (instancetype)objectByApplyingXSLT:(NSData *)xslt arguments:(NSDictionary *)arguments error:(NSError **)error; diff --git a/KissXML/DDXMLNode.h b/KissXML/DDXMLNode.h index 68f00b2a..eafde87f 100644 --- a/KissXML/DDXMLNode.h +++ b/KissXML/DDXMLNode.h @@ -80,43 +80,43 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark --- Properties --- -- (DDXMLNodeKind)kind; +@property (readonly) DDXMLNodeKind kind; -@property (nullable, copy) NSString *name; //primitive +@property (nullable, copy) NSString *name; //- (void)setObjectValue:(id)value; //- (instancetype)objectValue; -@property (nullable, copy) NSString *stringValue; //primitive +@property (nullable, copy) NSString *stringValue; + //- (void)setStringValue:(NSString *)string resolvingEntities:(BOOL)resolve; #pragma mark --- Tree Navigation --- -- (NSUInteger)index; - -- (NSUInteger)level; +@property (readonly) NSUInteger index; +@property (readonly) NSUInteger level; -- (nullable DDXMLDocument *)rootDocument; +@property (nullable, readonly, retain) DDXMLDocument *rootDocument; -- (nullable DDXMLNode *)parent; -- (NSUInteger)childCount; -- (nullable NSArray *)children; +@property (nullable, readonly, copy) DDXMLNode *parent; +@property (readonly) NSUInteger childCount; +@property (nullable, readonly, copy) NSArray *children; - (nullable DDXMLNode *)childAtIndex:(NSUInteger)index; -- (nullable DDXMLNode *)previousSibling; -- (nullable DDXMLNode *)nextSibling; +@property (nullable, readonly, copy) DDXMLNode *previousSibling; +@property (nullable, readonly, copy) DDXMLNode *nextSibling; -- (nullable DDXMLNode *)previousNode; -- (nullable DDXMLNode *)nextNode; +@property (nullable, readonly, copy) DDXMLNode *previousNode; +@property (nullable, readonly, copy) DDXMLNode *nextNode; - (void)detach; -- (nullable NSString *)XPath; +@property (nullable, readonly, copy) NSString *XPath; #pragma mark --- QNames --- -- (nullable NSString *)localName; -- (nullable NSString *)prefix; +@property (nullable, readonly, copy) NSString *localName; +@property (nullable, readonly, copy) NSString *prefix; @property (nullable, copy) NSString *URI; //primitive @@ -126,8 +126,8 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark --- Output --- -- (nonnull NSString *)description; -- (nonnull NSString *)XMLString; +@property (readonly, copy) NSString *description; +@property (readonly, copy) NSString *XMLString; - (nonnull NSString *)XMLStringWithOptions:(NSUInteger)options; //- (NSString *)canonicalXMLStringPreservingComments:(BOOL)comments;