Skip to content

Commit 683260a

Browse files
eskrocheskroch
committed
Changed the return type of all initialization methods to "instancetype" for better compile-time type checking.
1 parent 3b21e26 commit 683260a

98 files changed

Lines changed: 460 additions & 460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎framework/MacOnly/CPTGraphHostingView.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ @implementation CPTGraphHostingView
6464

6565
/// @cond
6666

67-
-(id)initWithFrame:(NSRect)frame
67+
-(instancetype)initWithFrame:(NSRect)frame
6868
{
6969
if ( (self = [super initWithFrame:frame]) ) {
7070
hostedGraph = nil;
@@ -110,7 +110,7 @@ -(void)encodeWithCoder:(NSCoder *)coder
110110
[coder encodeObject:self.openHandCursor forKey:@"CPTLayerHostingView.openHandCursor"];
111111
}
112112

113-
-(id)initWithCoder:(NSCoder *)coder
113+
-(instancetype)initWithCoder:(NSCoder *)coder
114114
{
115115
if ( (self = [super initWithCoder:coder]) ) {
116116
CPTLayer *mainLayer = [(CPTLayer *)[CPTLayer alloc] initWithFrame : NSRectToCGRect(self.frame)];

‎framework/MacOnly/CPTTextStylePlatformSpecific.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ @implementation CPTTextStyle(CPTPlatformSpecificTextStyleExtensions)
3232
* @param attributes A dictionary of standard text attributes.
3333
* @return A new CPTTextStyle instance.
3434
**/
35-
+(id)textStyleWithAttributes:(NSDictionary *)attributes
35+
+(instancetype)textStyleWithAttributes:(NSDictionary *)attributes
3636
{
3737
CPTMutableTextStyle *newStyle = [CPTMutableTextStyle textStyle];
3838

@@ -105,7 +105,7 @@ @implementation CPTMutableTextStyle(CPTPlatformSpecificMutableTextStyleExtension
105105

106106
/// @cond
107107

108-
+(id)textStyleWithAttributes:(NSDictionary *)attributes
108+
+(instancetype)textStyleWithAttributes:(NSDictionary *)attributes
109109
{
110110
CPTMutableTextStyle *newStyle = [CPTMutableTextStyle textStyle];
111111

‎framework/Source/CPTAnimation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ typedef NS_ENUM (NSInteger, CPTAnimationCurve) {
9494

9595
/// @name Animation Controller Instance
9696
/// @{
97-
+(CPTAnimation *)sharedInstance;
97+
+(instancetype)sharedInstance;
9898
/// @}
9999

100100
/// @name Property Animation

‎framework/Source/CPTAnimation.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ @implementation CPTAnimation
9191
*
9292
* @return The initialized object.
9393
**/
94-
-(id)init
94+
-(instancetype)init
9595
{
9696
if ( (self = [super init]) ) {
9797
animationOperations = [[NSMutableArray alloc] init];
@@ -137,7 +137,7 @@ -(void)dealloc
137137
/** @brief A shared CPTAnimation instance responsible for scheduling and executing animations.
138138
* @return The shared CPTAnimation instance.
139139
**/
140-
+(CPTAnimation *)sharedInstance
140+
+(instancetype)sharedInstance
141141
{
142142
static dispatch_once_t once;
143143
static CPTAnimation *shared;

‎framework/Source/CPTAnimationOperation.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ @implementation CPTAnimationOperation
5757
*
5858
* @return The initialized object.
5959
**/
60-
-(id)init
60+
-(instancetype)init
6161
{
6262
if ( (self = [super init]) ) {
6363
period = nil;

‎framework/Source/CPTAnimationPeriod.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616

1717
/// @name Factory Methods
1818
/// @{
19-
+(id)periodWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
20-
+(id)periodWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
21-
+(id)periodWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
22-
+(id)periodWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
23-
+(id)periodWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
24-
+(id)periodWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
19+
+(instancetype)periodWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
20+
+(instancetype)periodWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
21+
+(instancetype)periodWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
22+
+(instancetype)periodWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
23+
+(instancetype)periodWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
24+
+(instancetype)periodWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
2525
/// @}
2626

2727
/// @name Initialization
2828
/// @{
29-
-(id)initWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
30-
-(id)initWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
31-
-(id)initWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
32-
-(id)initWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
33-
-(id)initWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
34-
-(id)initWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
29+
-(instancetype)initWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
30+
-(instancetype)initWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
31+
-(instancetype)initWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
32+
-(instancetype)initWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
33+
-(instancetype)initWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
34+
-(instancetype)initWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
3535
/// @}
3636

3737
@end

‎framework/Source/CPTAnimationPeriod.m‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
/// @cond
1313
@interface CPTAnimationPeriod()
1414

15-
+(id)periodWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
15+
+(instancetype)periodWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
1616

17-
-(id)initWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
17+
-(instancetype)initWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay;
1818

1919
@property (nonatomic, readwrite) CGFloat startOffset;
2020

@@ -75,7 +75,7 @@ @implementation CPTAnimationPeriod
7575
* @param aDelay The starting delay in seconds.
7676
* @return The initialized object.
7777
**/
78-
+(id)periodWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
78+
+(instancetype)periodWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
7979
{
8080
return [[self alloc] initWithStartValue:aStartValue endValue:anEndValue duration:aDuration withDelay:aDelay];
8181
}
@@ -90,7 +90,7 @@ +(id)periodWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue
9090
* @param aDelay The starting delay in seconds.
9191
* @return The initialized object.
9292
**/
93-
+(id)periodWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
93+
+(instancetype)periodWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
9494
{
9595
return [_CPTAnimationCGFloatPeriod periodWithStartValue:@(aStart)
9696
endValue:@(anEnd)
@@ -106,7 +106,7 @@ +(id)periodWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDurat
106106
* @param aDelay The starting delay in seconds.
107107
* @return The initialized object.
108108
**/
109-
+(id)periodWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
109+
+(instancetype)periodWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
110110
{
111111
return [_CPTAnimationCGPointPeriod periodWithStartValue:[NSValue valueWithBytes:&aStartPoint objCType:@encode(CGPoint)]
112112
endValue:[NSValue valueWithBytes:&anEndPoint objCType:@encode(CGPoint)] duration:aDuration
@@ -121,7 +121,7 @@ +(id)periodWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint dura
121121
* @param aDelay The starting delay in seconds.
122122
* @return The initialized object.
123123
**/
124-
+(id)periodWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
124+
+(instancetype)periodWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
125125
{
126126
return [_CPTAnimationCGSizePeriod periodWithStartValue:[NSValue valueWithBytes:&aStartSize objCType:@encode(CGSize)]
127127
endValue:[NSValue valueWithBytes:&anEndSize objCType:@encode(CGSize)] duration:aDuration
@@ -136,7 +136,7 @@ +(id)periodWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(
136136
* @param aDelay The starting delay in seconds.
137137
* @return The initialized object.
138138
**/
139-
+(id)periodWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
139+
+(instancetype)periodWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
140140
{
141141
return [_CPTAnimationCGRectPeriod periodWithStartValue:[NSValue valueWithBytes:&aStartRect objCType:@encode(CGRect)]
142142
endValue:[NSValue valueWithBytes:&anEndRect objCType:@encode(CGRect)] duration:aDuration
@@ -151,7 +151,7 @@ +(id)periodWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(
151151
* @param aDelay The starting delay in seconds.
152152
* @return The initialized object.
153153
**/
154-
+(id)periodWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
154+
+(instancetype)periodWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
155155
{
156156
return [_CPTAnimationNSDecimalPeriod periodWithStartValue:[NSValue valueWithBytes:&aStartDecimal objCType:@encode(NSDecimal)]
157157
endValue:[NSValue valueWithBytes:&anEndDecimal objCType:@encode(NSDecimal)] duration:aDuration
@@ -166,7 +166,7 @@ +(id)periodWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEnd
166166
* @param aDelay The starting delay in seconds.
167167
* @return The initialized object.
168168
**/
169-
+(id)periodWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
169+
+(instancetype)periodWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
170170
{
171171
return [_CPTAnimationPlotRangePeriod periodWithStartValue:(NSValue *)aStartPlotRange
172172
endValue:(NSValue *)anEndPlotRange
@@ -192,7 +192,7 @@ +(id)periodWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTP
192192
* @param aDelay The starting delay in seconds.
193193
* @return The initialized object.
194194
**/
195-
-(id)initWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
195+
-(instancetype)initWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
196196
{
197197
if ( (self = [super init]) ) {
198198
startValue = [aStartValue copy];
@@ -215,7 +215,7 @@ -(id)initWithStartValue:(NSValue *)aStartValue endValue:(NSValue *)anEndValue du
215215
* @param aDelay The starting delay in seconds.
216216
* @return The initialized object.
217217
**/
218-
-(id)initWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
218+
-(instancetype)initWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
219219
{
220220
self = [(_CPTAnimationCGFloatPeriod *)[_CPTAnimationCGFloatPeriod alloc] initWithStartValue : @(aStart)
221221
endValue : @(anEnd)
@@ -233,7 +233,7 @@ -(id)initWithStart:(CGFloat)aStart end:(CGFloat)anEnd duration:(CGFloat)aDuratio
233233
* @param aDelay The starting delay in seconds.
234234
* @return The initialized object.
235235
**/
236-
-(id)initWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
236+
-(instancetype)initWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
237237
{
238238
self = [(_CPTAnimationCGPointPeriod *)[_CPTAnimationCGPointPeriod alloc] initWithStartValue :[NSValue valueWithBytes:&aStartPoint objCType:@encode(CGPoint)]
239239
endValue :[NSValue valueWithBytes:&anEndPoint objCType:@encode(CGPoint)]
@@ -251,7 +251,7 @@ -(id)initWithStartPoint:(CGPoint)aStartPoint endPoint:(CGPoint)anEndPoint durati
251251
* @param aDelay The starting delay in seconds.
252252
* @return The initialized object.
253253
**/
254-
-(id)initWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
254+
-(instancetype)initWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
255255
{
256256
self = [(_CPTAnimationCGSizePeriod *)[_CPTAnimationCGSizePeriod alloc] initWithStartValue :[NSValue valueWithBytes:&aStartSize objCType:@encode(CGSize)]
257257
endValue :[NSValue valueWithBytes:&anEndSize objCType:@encode(CGSize)]
@@ -269,7 +269,7 @@ -(id)initWithStartSize:(CGSize)aStartSize endSize:(CGSize)anEndSize duration:(CG
269269
* @param aDelay The starting delay in seconds.
270270
* @return The initialized object.
271271
**/
272-
-(id)initWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
272+
-(instancetype)initWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
273273
{
274274
self = [(_CPTAnimationCGRectPeriod *)[_CPTAnimationCGRectPeriod alloc] initWithStartValue :[NSValue valueWithBytes:&aStartRect objCType:@encode(CGRect)]
275275
endValue :[NSValue valueWithBytes:&anEndRect objCType:@encode(CGRect)]
@@ -287,7 +287,7 @@ -(id)initWithStartRect:(CGRect)aStartRect endRect:(CGRect)anEndRect duration:(CG
287287
* @param aDelay The starting delay in seconds.
288288
* @return The initialized object.
289289
**/
290-
-(id)initWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
290+
-(instancetype)initWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDecimal duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
291291
{
292292
self = [(_CPTAnimationNSDecimalPeriod *)[_CPTAnimationNSDecimalPeriod alloc] initWithStartValue :[NSValue valueWithBytes:&aStartDecimal objCType:@encode(NSDecimal)]
293293
endValue :[NSValue valueWithBytes:&anEndDecimal objCType:@encode(NSDecimal)]
@@ -305,7 +305,7 @@ -(id)initWithStartDecimal:(NSDecimal)aStartDecimal endDecimal:(NSDecimal)anEndDe
305305
* @param aDelay The starting delay in seconds.
306306
* @return The initialized object.
307307
**/
308-
-(id)initWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
308+
-(instancetype)initWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlotRange *)anEndPlotRange duration:(CGFloat)aDuration withDelay:(CGFloat)aDelay
309309
{
310310
self = [(_CPTAnimationPlotRangePeriod *)[_CPTAnimationPlotRangePeriod alloc] initWithStartValue : (NSValue *)aStartPlotRange
311311
endValue : (NSValue *)anEndPlotRange
@@ -320,7 +320,7 @@ -(id)initWithStartPlotRange:(CPTPlotRange *)aStartPlotRange endPlotRange:(CPTPlo
320320
/** @brief Initializes a newly allocated CPTAnimationPeriod object with no start or end values and a @par{duration} and @par{delay} of zero (@num{0}).
321321
* @return The initialized object.
322322
**/
323-
-(id)init
323+
-(instancetype)init
324324
{
325325
return [self initWithStartValue:nil endValue:nil duration:0.0 withDelay:0.0];
326326
}

‎framework/Source/CPTAnnotation.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ @implementation CPTAnnotation
5353
*
5454
* @return The initialized object.
5555
**/
56-
-(id)init
56+
-(instancetype)init
5757
{
5858
if ( (self = [super init]) ) {
5959
annotationHostLayer = nil;
@@ -81,7 +81,7 @@ -(void)encodeWithCoder:(NSCoder *)coder
8181
[coder encodeCGFloat:self.rotation forKey:@"CPTAnnotation.rotation"];
8282
}
8383

84-
-(id)initWithCoder:(NSCoder *)coder
84+
-(instancetype)initWithCoder:(NSCoder *)coder
8585
{
8686
if ( (self = [super init]) ) {
8787
annotationHostLayer = [coder decodeObjectForKey:@"CPTAnnotation.annotationHostLayer"];

‎framework/Source/CPTAnnotationHostLayer.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ @implementation CPTAnnotationHostLayer
4242
* @param newFrame The frame rectangle.
4343
* @return The initialized CPTAnnotationHostLayer object.
4444
**/
45-
-(id)initWithFrame:(CGRect)newFrame
45+
-(instancetype)initWithFrame:(CGRect)newFrame
4646
{
4747
if ( (self = [super initWithFrame:newFrame]) ) {
4848
mutableAnnotations = [[NSMutableArray alloc] init];
@@ -54,7 +54,7 @@ -(id)initWithFrame:(CGRect)newFrame
5454

5555
/// @cond
5656

57-
-(id)initWithLayer:(id)layer
57+
-(instancetype)initWithLayer:(id)layer
5858
{
5959
if ( (self = [super initWithLayer:layer]) ) {
6060
CPTAnnotationHostLayer *theLayer = (CPTAnnotationHostLayer *)layer;
@@ -78,7 +78,7 @@ -(void)encodeWithCoder:(NSCoder *)coder
7878
[coder encodeObject:self.mutableAnnotations forKey:@"CPTAnnotationHostLayer.mutableAnnotations"];
7979
}
8080

81-
-(id)initWithCoder:(NSCoder *)coder
81+
-(instancetype)initWithCoder:(NSCoder *)coder
8282
{
8383
if ( (self = [super initWithCoder:coder]) ) {
8484
mutableAnnotations = [[coder decodeObjectForKey:@"CPTAnnotationHostLayer.mutableAnnotations"] mutableCopy];

‎framework/Source/CPTAxis.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ @implementation CPTAxis
506506
* @param newFrame The frame rectangle.
507507
* @return The initialized CPTAxis object.
508508
**/
509-
-(id)initWithFrame:(CGRect)newFrame
509+
-(instancetype)initWithFrame:(CGRect)newFrame
510510
{
511511
if ( (self = [super initWithFrame:newFrame]) ) {
512512
plotSpace = nil;
@@ -582,7 +582,7 @@ -(id)initWithFrame:(CGRect)newFrame
582582

583583
/// @cond
584584

585-
-(id)initWithLayer:(id)layer
585+
-(instancetype)initWithLayer:(id)layer
586586
{
587587
if ( (self = [super initWithLayer:layer]) ) {
588588
CPTAxis *theLayer = (CPTAxis *)layer;
@@ -729,7 +729,7 @@ -(void)encodeWithCoder:(NSCoder *)coder
729729
// labelsUpdated
730730
}
731731

732-
-(id)initWithCoder:(NSCoder *)coder
732+
-(instancetype)initWithCoder:(NSCoder *)coder
733733
{
734734
if ( (self = [super initWithCoder:coder]) ) {
735735
coordinate = (CPTCoordinate)[coder decodeIntegerForKey : @"CPTAxis.coordinate"];

0 commit comments

Comments
 (0)