From 3b9629fbbe654c63e8f41cabc9994f26ad5e6ff3 Mon Sep 17 00:00:00 2001
From: Joseph Heenan <joseph@emobix.co.uk>
Date: Tue, 7 Jun 2016 16:40:49 +0100
Subject: iOS: Use modern instancetype instead of id for init return type

---
 platform/ios/Classes/MuAnnotSelectView.h       | 2 +-
 platform/ios/Classes/MuAnnotSelectView.m       | 2 +-
 platform/ios/Classes/MuAnnotation.h            | 2 +-
 platform/ios/Classes/MuAnnotation.m            | 2 +-
 platform/ios/Classes/MuChoiceFieldController.h | 2 +-
 platform/ios/Classes/MuChoiceFieldController.m | 2 +-
 platform/ios/Classes/MuDocRef.h                | 2 +-
 platform/ios/Classes/MuDocRef.m                | 2 +-
 platform/ios/Classes/MuDocumentController.h    | 2 +-
 platform/ios/Classes/MuDocumentController.m    | 2 +-
 platform/ios/Classes/MuHitView.h               | 4 ++--
 platform/ios/Classes/MuHitView.m               | 4 ++--
 platform/ios/Classes/MuInkView.h               | 2 +-
 platform/ios/Classes/MuInkView.m               | 2 +-
 platform/ios/Classes/MuOutlineController.h     | 2 +-
 platform/ios/Classes/MuOutlineController.m     | 2 +-
 platform/ios/Classes/MuPageViewNormal.h        | 2 +-
 platform/ios/Classes/MuPageViewNormal.m        | 2 +-
 platform/ios/Classes/MuPageViewReflow.h        | 2 +-
 platform/ios/Classes/MuPageViewReflow.m        | 2 +-
 platform/ios/Classes/MuPrintPageRenderer.h     | 2 +-
 platform/ios/Classes/MuPrintPageRenderer.m     | 2 +-
 platform/ios/Classes/MuTapResult.h             | 8 ++++----
 platform/ios/Classes/MuTapResult.m             | 8 ++++----
 platform/ios/Classes/MuTextFieldController.h   | 2 +-
 platform/ios/Classes/MuTextFieldController.m   | 2 +-
 platform/ios/Classes/MuTextSelectView.h        | 2 +-
 platform/ios/Classes/MuTextSelectView.m        | 2 +-
 platform/ios/Classes/MuWord.m                  | 2 +-
 29 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/platform/ios/Classes/MuAnnotSelectView.h b/platform/ios/Classes/MuAnnotSelectView.h
index 5a3e6741..d8c5d966 100644
--- a/platform/ios/Classes/MuAnnotSelectView.h
+++ b/platform/ios/Classes/MuAnnotSelectView.h
@@ -2,5 +2,5 @@
 #import "MuAnnotation.h"
 
 @interface MuAnnotSelectView : UIView
-- (id) initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize;
+- (instancetype) initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize;
 @end
diff --git a/platform/ios/Classes/MuAnnotSelectView.m b/platform/ios/Classes/MuAnnotSelectView.m
index cb156272..a02adbf7 100644
--- a/platform/ios/Classes/MuAnnotSelectView.m
+++ b/platform/ios/Classes/MuAnnotSelectView.m
@@ -7,7 +7,7 @@
 	UIColor *color;
 }
 
-- (id)initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize
+- (instancetype)initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize
 {
 	self = [super initWithFrame:CGRectMake(0.0, 0.0, 100.0, 100.0)];
 	if (self)
diff --git a/platform/ios/Classes/MuAnnotation.h b/platform/ios/Classes/MuAnnotation.h
index a113b93f..6f8e9da3 100644
--- a/platform/ios/Classes/MuAnnotation.h
+++ b/platform/ios/Classes/MuAnnotation.h
@@ -3,7 +3,7 @@
 #import <Foundation/Foundation.h>
 
 @interface MuAnnotation : NSObject
--(id) initFromAnnot:(fz_annot *)annot;
+-(instancetype) initFromAnnot:(fz_annot *)annot;
 @property(readonly) int type;
 @property(readonly) CGRect rect;
 +(MuAnnotation *) annotFromAnnot:(fz_annot *)annot;
diff --git a/platform/ios/Classes/MuAnnotation.m b/platform/ios/Classes/MuAnnotation.m
index f13dedd7..57fd7ea6 100644
--- a/platform/ios/Classes/MuAnnotation.m
+++ b/platform/ios/Classes/MuAnnotation.m
@@ -8,7 +8,7 @@
 
 @synthesize type, rect;
 
--(id) initFromAnnot:(fz_annot *)annot;
+-(instancetype) initFromAnnot:(fz_annot *)annot;
 {
 	self = [super init];
 	if (self)
diff --git a/platform/ios/Classes/MuChoiceFieldController.h b/platform/ios/Classes/MuChoiceFieldController.h
index d1bd1c02..4f9a9961 100644
--- a/platform/ios/Classes/MuChoiceFieldController.h
+++ b/platform/ios/Classes/MuChoiceFieldController.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
 
 @interface MuChoiceFieldController : UIViewController<UIPickerViewDataSource, UIPickerViewDelegate>
-- (id)initWithChoices:(NSArray *)choices okayAction:(void (^)(NSArray *))block;
+- (instancetype)initWithChoices:(NSArray *)choices okayAction:(void (^)(NSArray *))block;
 @end
diff --git a/platform/ios/Classes/MuChoiceFieldController.m b/platform/ios/Classes/MuChoiceFieldController.m
index 7b165350..e30ff000 100644
--- a/platform/ios/Classes/MuChoiceFieldController.m
+++ b/platform/ios/Classes/MuChoiceFieldController.m
@@ -13,7 +13,7 @@
 	NSInteger selected;
 }
 
-- (id)initWithChoices:(NSArray *)_choices okayAction:(void (^)(NSArray *))block
+- (instancetype)initWithChoices:(NSArray *)_choices okayAction:(void (^)(NSArray *))block
 {
 	self = [super initWithNibName:@"MuChoiceFieldController" bundle:nil];
 	if (self)
diff --git a/platform/ios/Classes/MuDocRef.h b/platform/ios/Classes/MuDocRef.h
index 98800bf9..a0933e8a 100644
--- a/platform/ios/Classes/MuDocRef.h
+++ b/platform/ios/Classes/MuDocRef.h
@@ -8,5 +8,5 @@
 	fz_document *doc;
 	bool interactive;
 }
--(id) initWithFilename:(NSString *)aFilename;
+-(instancetype) initWithFilename:(NSString *)aFilename;
 @end
diff --git a/platform/ios/Classes/MuDocRef.m b/platform/ios/Classes/MuDocRef.m
index c5a22633..5a61dffa 100644
--- a/platform/ios/Classes/MuDocRef.m
+++ b/platform/ios/Classes/MuDocRef.m
@@ -4,7 +4,7 @@
 
 @implementation MuDocRef
 
--(id) initWithFilename:(NSString *)aFilename;
+-(instancetype) initWithFilename:(NSString *)aFilename;
 {
 	self = [super init];
 	if (self)
diff --git a/platform/ios/Classes/MuDocumentController.h b/platform/ios/Classes/MuDocumentController.h
index 887c248e..c7c1fcdb 100644
--- a/platform/ios/Classes/MuDocumentController.h
+++ b/platform/ios/Classes/MuDocumentController.h
@@ -25,7 +25,7 @@ enum
 };
 
 @interface MuDocumentController : UIViewController <UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate, MuDialogCreator, MuUpdater>
-- (id) initWithFilename: (NSString*)nsfilename path:(NSString *)path document:(MuDocRef *)aDoc;
+- (instancetype) initWithFilename: (NSString*)nsfilename path:(NSString *)path document:(MuDocRef *)aDoc;
 - (void) createPageView: (int)number;
 - (void) gotoPage: (int)number animated: (BOOL)animated;
 - (void) onShowOutline: (id)sender;
diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m
index dfc5823f..2471249a 100644
--- a/platform/ios/Classes/MuDocumentController.m
+++ b/platform/ios/Classes/MuDocumentController.m
@@ -158,7 +158,7 @@ static void saveDoc(const char *current_path, fz_document *doc)
 	BOOL _isRotating;
 }
 
-- (id) initWithFilename: (NSString*)filename path:(NSString *)cstr document: (MuDocRef *)aDoc
+- (instancetype) initWithFilename: (NSString*)filename path:(NSString *)cstr document: (MuDocRef *)aDoc
 {
 	self = [super initWithNibName:nil bundle:nil];
 	if (!self)
diff --git a/platform/ios/Classes/MuHitView.h b/platform/ios/Classes/MuHitView.h
index d0823c8b..c976c321 100644
--- a/platform/ios/Classes/MuHitView.h
+++ b/platform/ios/Classes/MuHitView.h
@@ -8,8 +8,8 @@
 #include "mupdf/fitz.h"
 
 @interface MuHitView : UIView
-- (id) initWithSearchResults: (int)n forDocument: (fz_document *)doc;
-- (id) initWithLinks: (fz_link*)links forDocument: (fz_document *)doc;
+- (instancetype) initWithSearchResults: (int)n forDocument: (fz_document *)doc;
+- (instancetype) initWithLinks: (fz_link*)links forDocument: (fz_document *)doc;
 - (void) setPageSize: (CGSize)s;
 - (MuTapResult *) handleTap:(CGPoint)pt;
 @end
diff --git a/platform/ios/Classes/MuHitView.m b/platform/ios/Classes/MuHitView.m
index f3827570..2709f829 100644
--- a/platform/ios/Classes/MuHitView.m
+++ b/platform/ios/Classes/MuHitView.m
@@ -11,7 +11,7 @@
 	UIColor *color;
 }
 
-- (id) initWithSearchResults: (int)n forDocument: (fz_document *)doc
+- (instancetype) initWithSearchResults: (int)n forDocument: (fz_document *)doc
 {
 	self = [super initWithFrame: CGRectMake(0,0,100,100)];
 	if (self) {
@@ -33,7 +33,7 @@
 	return self;
 }
 
-- (id) initWithLinks: (fz_link*)link forDocument: (fz_document *)doc
+- (instancetype) initWithLinks: (fz_link*)link forDocument: (fz_document *)doc
 {
 	self = [super initWithFrame: CGRectMake(0,0,100,100)];
 	if (self) {
diff --git a/platform/ios/Classes/MuInkView.h b/platform/ios/Classes/MuInkView.h
index a4d7aa90..8dd607f3 100644
--- a/platform/ios/Classes/MuInkView.h
+++ b/platform/ios/Classes/MuInkView.h
@@ -4,6 +4,6 @@
 
 @property(readonly) NSArray *curves;
 
-- (id) initWithPageSize:(CGSize)pageSize;
+- (instancetype) initWithPageSize:(CGSize)pageSize;
 
 @end
diff --git a/platform/ios/Classes/MuInkView.m b/platform/ios/Classes/MuInkView.m
index 709489dd..78bc73df 100644
--- a/platform/ios/Classes/MuInkView.m
+++ b/platform/ios/Classes/MuInkView.m
@@ -8,7 +8,7 @@
 	UIColor *color;
 }
 
-- (id) initWithPageSize:(CGSize)_pageSize
+- (instancetype) initWithPageSize:(CGSize)_pageSize
 {
 	self = [super initWithFrame:CGRectMake(0, 0, 100, 100)];
 	if (self) {
diff --git a/platform/ios/Classes/MuOutlineController.h b/platform/ios/Classes/MuOutlineController.h
index 63661bfc..4065645e 100644
--- a/platform/ios/Classes/MuOutlineController.h
+++ b/platform/ios/Classes/MuOutlineController.h
@@ -3,5 +3,5 @@
 @class MuDocumentController;
 
 @interface MuOutlineController : UITableViewController
-- (id) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages;
+- (instancetype) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages;
 @end
diff --git a/platform/ios/Classes/MuOutlineController.m b/platform/ios/Classes/MuOutlineController.m
index 91db5dd8..edddbd8f 100644
--- a/platform/ios/Classes/MuOutlineController.m
+++ b/platform/ios/Classes/MuOutlineController.m
@@ -8,7 +8,7 @@
 	NSMutableArray *pages;
 }
 
-- (id) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages
+- (instancetype) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages
 {
 	self = [super initWithStyle: UITableViewStylePlain];
 	if (self) {
diff --git a/platform/ios/Classes/MuPageViewNormal.h b/platform/ios/Classes/MuPageViewNormal.h
index bf9d3865..25b0c3ca 100644
--- a/platform/ios/Classes/MuPageViewNormal.h
+++ b/platform/ios/Classes/MuPageViewNormal.h
@@ -16,7 +16,7 @@
 #import "MuUpdater.h"
 
 @interface MuPageViewNormal : UIScrollView <UIScrollViewDelegate,MuPageView>
-- (id) initWithFrame: (CGRect)frame dialogCreator:(id<MuDialogCreator>)dia updater:(id<MuUpdater>)upd document: (MuDocRef *)aDoc page: (int)aNumber;
+- (instancetype) initWithFrame: (CGRect)frame dialogCreator:(id<MuDialogCreator>)dia updater:(id<MuUpdater>)upd document: (MuDocRef *)aDoc page: (int)aNumber;
 - (void) displayImage: (UIImage*)image;
 - (void) resizeImage;
 - (void) loadPage;
diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m
index 5b536718..d40ef0e1 100644
--- a/platform/ios/Classes/MuPageViewNormal.m
+++ b/platform/ios/Classes/MuPageViewNormal.m
@@ -641,7 +641,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
 		annot_list = create_annot_list(doc, page);
 }
 
--(id) initWithFrame:(CGRect)frame dialogCreator:(id<MuDialogCreator>)dia updater:(id<MuUpdater>)upd document:(MuDocRef *)aDoc page:(int)aNumber
+-(instancetype) initWithFrame:(CGRect)frame dialogCreator:(id<MuDialogCreator>)dia updater:(id<MuUpdater>)upd document:(MuDocRef *)aDoc page:(int)aNumber
 {
 	self = [super initWithFrame: frame];
 	if (self) {
diff --git a/platform/ios/Classes/MuPageViewReflow.h b/platform/ios/Classes/MuPageViewReflow.h
index da9d556a..f6140e81 100644
--- a/platform/ios/Classes/MuPageViewReflow.h
+++ b/platform/ios/Classes/MuPageViewReflow.h
@@ -4,6 +4,6 @@
 
 @interface MuPageViewReflow : UIWebView <UIWebViewDelegate,MuPageView>
 
--(id) initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber;
+-(instancetype) initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber;
 
 @end
diff --git a/platform/ios/Classes/MuPageViewReflow.m b/platform/ios/Classes/MuPageViewReflow.m
index 2c093fd9..554a8f30 100644
--- a/platform/ios/Classes/MuPageViewReflow.m
+++ b/platform/ios/Classes/MuPageViewReflow.m
@@ -78,7 +78,7 @@ NSString *textAsHtml(fz_document *doc, int pageNum)
 	float scale;
 }
 
-- (id)initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber
+- (instancetype)initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber
 {
 	self = [super initWithFrame:frame];
 	if (self) {
diff --git a/platform/ios/Classes/MuPrintPageRenderer.h b/platform/ios/Classes/MuPrintPageRenderer.h
index 8a48c6e3..ffda7025 100644
--- a/platform/ios/Classes/MuPrintPageRenderer.h
+++ b/platform/ios/Classes/MuPrintPageRenderer.h
@@ -4,6 +4,6 @@
 
 @interface MuPrintPageRenderer : UIPrintPageRenderer
 
--(id) initWithDocRef:(MuDocRef *) docRef;
+-(instancetype) initWithDocRef:(MuDocRef *) docRef;
 
 @end
diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m
index b92b99c0..e2420a78 100644
--- a/platform/ios/Classes/MuPrintPageRenderer.m
+++ b/platform/ios/Classes/MuPrintPageRenderer.m
@@ -8,7 +8,7 @@ const int MaxStripPixels = 1024*1024;
 	MuDocRef *docRef;
 }
 
--(id) initWithDocRef:(MuDocRef *)aDocRef
+-(instancetype) initWithDocRef:(MuDocRef *)aDocRef
 {
 	self = [super init];
 	if (self)
diff --git a/platform/ios/Classes/MuTapResult.h b/platform/ios/Classes/MuTapResult.h
index 4ea77f81..78063117 100644
--- a/platform/ios/Classes/MuTapResult.h
+++ b/platform/ios/Classes/MuTapResult.h
@@ -17,19 +17,19 @@
 
 @interface MuTapResultInternalLink : MuTapResult
 @property(readonly) int pageNumber;
--(id)initWithPageNumber:(int)aNumber;
+-(instancetype)initWithPageNumber:(int)aNumber;
 @end
 
 @interface MuTapResultExternalLink : MuTapResult
 @property(readonly) NSString *url;
--(id)initWithUrl:(NSString *)aString;
+-(instancetype)initWithUrl:(NSString *)aString;
 @end
 
 @interface MuTapResultRemoteLink : MuTapResult
 @property(readonly) NSString *fileSpec;
 @property(readonly) int pageNumber;
 @property(readonly) BOOL newWindow;
--(id)initWithFileSpec:(NSString *)aString pageNumber:(int)aNumber newWindow:(BOOL)aBool;
+-(instancetype)initWithFileSpec:(NSString *)aString pageNumber:(int)aNumber newWindow:(BOOL)aBool;
 @end
 
 @interface MuTapResultWidget : MuTapResult
@@ -37,5 +37,5 @@
 
 @interface MuTapResultAnnotation : MuTapResult
 @property(readonly) MuAnnotation *annot;
--(id)initWithAnnotation:(MuAnnotation *)aAnnot;
+-(instancetype)initWithAnnotation:(MuAnnotation *)aAnnot;
 @end
diff --git a/platform/ios/Classes/MuTapResult.m b/platform/ios/Classes/MuTapResult.m
index 951fd45f..f6ec06f1 100644
--- a/platform/ios/Classes/MuTapResult.m
+++ b/platform/ios/Classes/MuTapResult.m
@@ -11,7 +11,7 @@
 
 @synthesize pageNumber;
 
--(id) initWithPageNumber:(int)aNumber
+-(instancetype) initWithPageNumber:(int)aNumber
 {
 	self = [super init];
 	if (self)
@@ -35,7 +35,7 @@
 
 @synthesize url;
 
--(id) initWithUrl:(NSString *)aString
+-(instancetype) initWithUrl:(NSString *)aString
 {
 	self = [super init];
 	if (self)
@@ -67,7 +67,7 @@
 
 @synthesize fileSpec, pageNumber, newWindow;
 
--(id) initWithFileSpec:(NSString *)aString pageNumber:(int)aNumber newWindow:(BOOL)aBool
+-(instancetype) initWithFileSpec:(NSString *)aString pageNumber:(int)aNumber newWindow:(BOOL)aBool
 {
 	self = [super init];
 	if (self)
@@ -108,7 +108,7 @@
 
 @synthesize annot;
 
--(id) initWithAnnotation:(MuAnnotation *)aAnnot
+-(instancetype) initWithAnnotation:(MuAnnotation *)aAnnot
 {
 	self = [super init];
 	if (self)
diff --git a/platform/ios/Classes/MuTextFieldController.h b/platform/ios/Classes/MuTextFieldController.h
index 943af83a..4cdf1c62 100644
--- a/platform/ios/Classes/MuTextFieldController.h
+++ b/platform/ios/Classes/MuTextFieldController.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
 
 @interface MuTextFieldController : UIViewController
-- (id)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block;
+- (instancetype)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block;
 @end
diff --git a/platform/ios/Classes/MuTextFieldController.m b/platform/ios/Classes/MuTextFieldController.m
index 9c7c301c..78546293 100644
--- a/platform/ios/Classes/MuTextFieldController.m
+++ b/platform/ios/Classes/MuTextFieldController.m
@@ -14,7 +14,7 @@
 	NSString *initialText;
 }
 
--(id)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block
+-(instancetype)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block
 {
 	self = [super initWithNibName:@"MuTextFieldController" bundle:nil];
 	if (self)
diff --git a/platform/ios/Classes/MuTextSelectView.h b/platform/ios/Classes/MuTextSelectView.h
index 0f886174..44d86333 100644
--- a/platform/ios/Classes/MuTextSelectView.h
+++ b/platform/ios/Classes/MuTextSelectView.h
@@ -1,7 +1,7 @@
 #include "common.h"
 
 @interface MuTextSelectView : UIView
-- (id) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize;
+- (instancetype) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize;
 - (NSArray *) selectionRects;
 - (NSString *) selectedText;
 @end
diff --git a/platform/ios/Classes/MuTextSelectView.m b/platform/ios/Classes/MuTextSelectView.m
index 02a196bb..fdf1b0f2 100644
--- a/platform/ios/Classes/MuTextSelectView.m
+++ b/platform/ios/Classes/MuTextSelectView.m
@@ -11,7 +11,7 @@
 	CGPoint end;
 }
 
-- (id) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize
+- (instancetype) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize
 {
 	self = [super initWithFrame:CGRectMake(0,0,100,100)];
 	if (self)
diff --git a/platform/ios/Classes/MuWord.m b/platform/ios/Classes/MuWord.m
index 64fb561d..4adae1d7 100644
--- a/platform/ios/Classes/MuWord.m
+++ b/platform/ios/Classes/MuWord.m
@@ -8,7 +8,7 @@
 
 @synthesize string, rect;
 
-- (id) init
+- (instancetype) init
 {
 	self = [super init];
 	if (self)
-- 
cgit v1.2.3