From b9a9481c56362b99adcf2441287017da96eba0f9 Mon Sep 17 00:00:00 2001
From: Frederik Seiffert <frederik@algoriddim.com>
Date: Mon, 13 Jul 2020 14:10:54 +0200
Subject: [PATCH] Update NSURLRequest header to use "instancetype".

---
 ChangeLog                         |  6 ++++++
 Headers/Foundation/NSURLRequest.h | 16 ++++++++--------
 Source/NSURLRequest.m             | 16 ++++++++--------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8cd0a3011..1cb21cf82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-07-13  Frederik Seiffert <frederik@algoriddim.com>
+
+	* Headers/Foundation/NSURLRequest.h:
+	* Source/NSURLRequest.m:
+	Update NSURLRequest header to use "instancetype".
+
 2020-07-08  Frederik Seiffert <frederik@algoriddim.com>
 
 	* Source/NSLog.m:
diff --git a/Headers/Foundation/NSURLRequest.h b/Headers/Foundation/NSURLRequest.h
index 7b964feb8..5f4db1beb 100644
--- a/Headers/Foundation/NSURLRequest.h
+++ b/Headers/Foundation/NSURLRequest.h
@@ -99,15 +99,15 @@ typedef NSUInteger NSURLRequestCachePolicy;
  * and with the default cache policy (NSURLRequestUseProtocolCachePolicy)
  * and a sixty second timeout.
  */
-+ (id) requestWithURL: (NSURL *)URL;
++ (instancetype) requestWithURL: (NSURL *)URL;
 
 /**
  * Returns an autoreleased instance initialised with the specified URL,
  * cachePolicy, and timeoutInterval.
  */
-+ (id) requestWithURL: (NSURL *)URL
-	  cachePolicy: (NSURLRequestCachePolicy)cachePolicy
-      timeoutInterval: (NSTimeInterval)timeoutInterval;
++ (instancetype) requestWithURL: (NSURL *)URL
+                    cachePolicy: (NSURLRequestCachePolicy)cachePolicy
+                timeoutInterval: (NSTimeInterval)timeoutInterval;
 
 /**
  * Returns the cache policy associated with the receiver.
@@ -119,15 +119,15 @@ typedef NSUInteger NSURLRequestCachePolicy;
  * and with the default cache policy (NSURLRequestUseProtocolCachePolicy)
  * and a sixty second timeout.
  */
-- (id) initWithURL: (NSURL *)URL;
+- (instancetype) initWithURL: (NSURL *)URL;
 
 /**
  * Initialises the receiver with the specified URL,
  * cachePolicy, and timeoutInterval.
  */
-- (id) initWithURL: (NSURL *)URL
-       cachePolicy: (NSURLRequestCachePolicy)cachePolicy
-   timeoutInterval: (NSTimeInterval)timeoutInterval;
+- (instancetype) initWithURL: (NSURL *)URL
+                 cachePolicy: (NSURLRequestCachePolicy)cachePolicy
+             timeoutInterval: (NSTimeInterval)timeoutInterval;
 
 /**
  * Returns the main document URL for the receiver.<br />
diff --git a/Source/NSURLRequest.m b/Source/NSURLRequest.m
index 70868e140..7a4db342b 100644
--- a/Source/NSURLRequest.m
+++ b/Source/NSURLRequest.m
@@ -68,16 +68,16 @@ typedef struct {
   return o;
 }
 
-+ (id) requestWithURL: (NSURL *)URL
++ (instancetype) requestWithURL: (NSURL *)URL
 {
   return [self requestWithURL: URL
 		  cachePolicy: NSURLRequestUseProtocolCachePolicy
 	      timeoutInterval: 60.0];
 }
 
-+ (id) requestWithURL: (NSURL *)URL
-	  cachePolicy: (NSURLRequestCachePolicy)cachePolicy
-      timeoutInterval: (NSTimeInterval)timeoutInterval
++ (instancetype) requestWithURL: (NSURL *)URL
+                    cachePolicy: (NSURLRequestCachePolicy)cachePolicy
+                timeoutInterval: (NSTimeInterval)timeoutInterval
 {
   NSURLRequest	*o = [[self class] allocWithZone: NSDefaultMallocZone()];
 
@@ -177,16 +177,16 @@ typedef struct {
   return [self initWithURL: nil];
 }
 
-- (id) initWithURL: (NSURL *)URL
+- (instancetype) initWithURL: (NSURL *)URL
 {
   return [self initWithURL: URL
 	       cachePolicy: NSURLRequestUseProtocolCachePolicy
 	   timeoutInterval: 60.0];
 }
 
-- (id) initWithURL: (NSURL *)URL
-       cachePolicy: (NSURLRequestCachePolicy)cachePolicy
-   timeoutInterval: (NSTimeInterval)timeoutInterval
+- (instancetype) initWithURL: (NSURL *)URL
+                 cachePolicy: (NSURLRequestCachePolicy)cachePolicy
+             timeoutInterval: (NSTimeInterval)timeoutInterval
 {
   if ([URL isKindOfClass: [NSURL class]] == NO)
     {