From 7f04e1471b72aeccf862096bd7baaca1d3150acb Mon Sep 17 00:00:00 2001 From: David Olesch Date: Thu, 4 Feb 2016 11:15:35 -0600 Subject: [PATCH 1/3] Update IGHTMLDocument.h Fixed conflicting parameter types. --- IGHTMLQuery/Classes/IGHTMLDocument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IGHTMLQuery/Classes/IGHTMLDocument.h b/IGHTMLQuery/Classes/IGHTMLDocument.h index 5e45a2a..f284b82 100644 --- a/IGHTMLQuery/Classes/IGHTMLDocument.h +++ b/IGHTMLQuery/Classes/IGHTMLDocument.h @@ -25,6 +25,6 @@ - (nullable id)initWithHTMLFragmentData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding error:(NSError * _Nullable * _Nullable)outError; -- (nullable id)initWithHTMLData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding options:(int)options error:(NSError * _Nullable * _Nullable)outError; +- (nullable id)initWithHTMLData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding options:(htmlParserOption)options error:(NSError * _Nullable * _Nullable)outError; @end From 3d296318253c1d8ca6662d8762fc2c0feda18b5a Mon Sep 17 00:00:00 2001 From: David Olesch Date: Thu, 4 Feb 2016 11:30:08 -0600 Subject: [PATCH 2/3] Update IGHTMLDocument.h --- IGHTMLQuery/Classes/IGHTMLDocument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IGHTMLQuery/Classes/IGHTMLDocument.h b/IGHTMLQuery/Classes/IGHTMLDocument.h index f284b82..5e45a2a 100644 --- a/IGHTMLQuery/Classes/IGHTMLDocument.h +++ b/IGHTMLQuery/Classes/IGHTMLDocument.h @@ -25,6 +25,6 @@ - (nullable id)initWithHTMLFragmentData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding error:(NSError * _Nullable * _Nullable)outError; -- (nullable id)initWithHTMLData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding options:(htmlParserOption)options error:(NSError * _Nullable * _Nullable)outError; +- (nullable id)initWithHTMLData:(nonnull NSData *)data encoding:(nonnull NSString*)encoding options:(int)options error:(NSError * _Nullable * _Nullable)outError; @end From 0c9a9d1aa8eec22c00462dfec963e916d3d5d4a2 Mon Sep 17 00:00:00 2001 From: David Olesch Date: Thu, 4 Feb 2016 11:30:28 -0600 Subject: [PATCH 3/3] Update IGHTMLDocument.m --- IGHTMLQuery/Classes/IGHTMLDocument.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IGHTMLQuery/Classes/IGHTMLDocument.m b/IGHTMLQuery/Classes/IGHTMLDocument.m index f021592..15efd04 100644 --- a/IGHTMLQuery/Classes/IGHTMLDocument.m +++ b/IGHTMLQuery/Classes/IGHTMLDocument.m @@ -50,7 +50,7 @@ - (id)initWithHTMLFragmentData:(NSData *)data encoding:(NSString*)encoding error return [self initWithHTMLData:data encoding:encoding options:(HTML_PARSE_RECOVER | HTML_PARSE_NOWARNING | HTML_PARSE_NOERROR | HTML_PARSE_NOIMPLIED | HTML_PARSE_NONET) error:outError]; } -- (id)initWithHTMLData:(NSData *)data encoding:(NSString*)encoding options:(htmlParserOption)options error:(NSError**)outError{ +- (id)initWithHTMLData:(NSData *)data encoding:(NSString*)encoding options:(int)options error:(NSError**)outError{ if ((self = [super init])) { NSParameterAssert(data);