[#97] Remove inheritance from NSObject in CRConnectionDelegate pr…

…otocol
thecatalinstan · Sep 14, 2022 · 47e7c22 · 47e7c22
1 parent 9d0b2cb
commit 47e7c22
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/Criollo/Public Headers/Criollo/CRConnection.h b/Criollo/Public Headers/Criollo/CRConnection.h
@@ -6,15 +6,13 @@
 //  Copyright © 2015 Cătălin Stan. All rights reserved.
 //
 
-#import <Criollo/CRTypes.h>
 #import <Foundation/Foundation.h>
 
-@class CRConnection, GCDAsyncSocket, CRServer, CRRequest, CRResponse;
+@class CRConnection, CRRequest, CRResponse;
 
 NS_ASSUME_NONNULL_BEGIN
 
-// TODO: Remove inheritance from NSObject
-@protocol CRConnectionDelegate <NSObject>
+@protocol CRConnectionDelegate
 
 - (void)connection:(CRConnection *)connection didReceiveRequest:(CRRequest *)request response:(CRResponse *)response;
 - (void)connection:(CRConnection *)connection didFinishRequest:(CRRequest *)request response:(CRResponse *)response;

diff --git a/Criollo/Sources/CRConnection.m b/Criollo/Sources/CRConnection.m
@@ -6,17 +6,12 @@
 //  Copyright © 2015 Cătălin Stan. All rights reserved.
 //
 
-#import <Criollo/CRConnection.h>
+#import "CRConnection_Internal.h"
 
-#import <Criollo/CRApplication.h>
-#import <Criollo/CRRequest.h>
-#import <Criollo/CRResponse.h>
-#import <Criollo/CRServer.h>
 #import <sys/sysctl.h>
 #import <sys/types.h>
 
 #import "CocoaAsyncSocket.h"
-#import "CRConnection_Internal.h"
 #import "CRRequest_Internal.h"
 #import "CRResponse_Internal.h"
 #import "CRServer_Internal.h"

diff --git a/Criollo/Sources/CRConnection_Internal.h b/Criollo/Sources/CRConnection_Internal.h
@@ -7,8 +7,9 @@
 //
 
 #import <Criollo/CRConnection.h>
+#import <Criollo/CRTypes.h>
 
-@import CocoaAsyncSocket;
+#import "CocoaAsyncSocket.h"
 
 @class CRServer, CRRequest;