Revision: 13814
http://sourceforge.net/p/skim-app/code/13814
Author: hofman
Date: 2023-11-29 16:35:30 +0000 (Wed, 29 Nov 2023)
Log Message:
-----------
Use instancetype and use type for shared objects
Modified Paths:
--------------
trunk/NSBitmapImageRep_SKExtensions.h
trunk/NSBitmapImageRep_SKExtensions.m
trunk/NSData_SKExtensions.h
trunk/NSData_SKExtensions.m
trunk/NSDate_SKExtensions.m
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
trunk/NSImage_SKExtensions.m
trunk/NSInvocation_SKExtensions.h
trunk/NSInvocation_SKExtensions.m
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
trunk/NSPointerArray_SKExtensions.h
trunk/NSPointerArray_SKExtensions.m
trunk/NSURL_SKExtensions.m
trunk/NSValueTransformer_SKExtensions.m
trunk/PDFAnnotationMarkup_SKExtensions.h
trunk/PDFAnnotationMarkup_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/PDFSelection_SKExtensions.h
trunk/PDFSelection_SKExtensions.m
trunk/SKAlias.h
trunk/SKAlias.m
trunk/SKAnimatedBorderlessWindow.h
trunk/SKAnimatedBorderlessWindow.m
trunk/SKAnnotationTypeImageCell.m
trunk/SKAttachmentEmailer.m
trunk/SKBasePDFView.m
trunk/SKBookmark.h
trunk/SKBookmark.m
trunk/SKBookmarkController.h
trunk/SKBookmarkController.m
trunk/SKChainedUndoManager.h
trunk/SKChainedUndoManager.m
trunk/SKColorCell.m
trunk/SKColorMenuView.h
trunk/SKColorMenuView.m
trunk/SKColorPicker.m
trunk/SKColorSwatch.m
trunk/SKDisplayPrefs.h
trunk/SKDisplayPrefs.m
trunk/SKDocumentController.m
trunk/SKDownload.h
trunk/SKDownload.m
trunk/SKDownloadController.h
trunk/SKDownloadController.m
trunk/SKFileUpdateChecker.h
trunk/SKFileUpdateChecker.m
trunk/SKFontWell.m
trunk/SKFullScreenWindow.h
trunk/SKFullScreenWindow.m
trunk/SKGroupedSearchResult.h
trunk/SKGroupedSearchResult.m
trunk/SKImageToolTipWindow.h
trunk/SKImageToolTipWindow.m
trunk/SKInfoWindowController.h
trunk/SKInfoWindowController.m
trunk/SKLine.h
trunk/SKLine.m
trunk/SKLineInspector.h
trunk/SKLineInspector.m
trunk/SKLineWell.m
trunk/SKLoupeController.h
trunk/SKLoupeController.m
trunk/SKMainWindowController.m
trunk/SKNavigationWindow.h
trunk/SKNavigationWindow.m
trunk/SKNoteOutlineView.m
trunk/SKNotePrefs.h
trunk/SKNotePrefs.m
trunk/SKNoteText.h
trunk/SKNoteText.m
trunk/SKNoteTextView.m
trunk/SKNoteTypeSheetController.h
trunk/SKNoteTypeSheetController.m
trunk/SKNoteWindowController.h
trunk/SKNoteWindowController.m
trunk/SKNotesDocument.m
trunk/SKNotesPanelController.h
trunk/SKNotesPanelController.m
trunk/SKNumberArrayFormatter.m
trunk/SKPDFSyncRecord.h
trunk/SKPDFSyncRecord.m
trunk/SKPDFSynchronizer.m
trunk/SKPDFView.m
trunk/SKPreferenceController.h
trunk/SKPreferenceController.m
trunk/SKPresentationOptionsSheetController.h
trunk/SKPresentationOptionsSheetController.m
trunk/SKReadingBar.h
trunk/SKReadingBar.m
trunk/SKRecentDocumentInfo.h
trunk/SKRecentDocumentInfo.m
trunk/SKReleaseNotesController.h
trunk/SKReleaseNotesController.m
trunk/SKScriptMenu.m
trunk/SKSecondaryPDFView.m
trunk/SKShareMenuController.h
trunk/SKShareMenuController.m
trunk/SKSideWindow.h
trunk/SKSideWindow.m
trunk/SKSnapshotPDFView.m
trunk/SKSnapshotWindow.m
trunk/SKStatusBar.m
trunk/SKSyncDot.h
trunk/SKSyncDot.m
trunk/SKTemplateManager.h
trunk/SKTemplateManager.m
trunk/SKTemplateTag.h
trunk/SKTemplateTag.m
trunk/SKTemporaryData.m
trunk/SKTextNoteEditor.h
trunk/SKTextNoteEditor.m
trunk/SKThumbnail.h
trunk/SKThumbnail.m
trunk/SKThumbnailImageView.m
trunk/SKThumbnailItem.m
trunk/SKThumbnailView.m
trunk/SKTopBarView.m
trunk/SKTransitionController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
trunk/SKTypeSelectHelper.h
trunk/SKTypeSelectHelper.m
trunk/SKVersionNumber.h
trunk/SKVersionNumber.m
trunk/SKViewSettingsController.h
trunk/SKViewSettingsController.m
trunk/SkimNotes/SKNDocument.m
Modified: trunk/NSBitmapImageRep_SKExtensions.h
===================================================================
--- trunk/NSBitmapImageRep_SKExtensions.h 2023-11-26 00:16:38 UTC (rev
13813)
+++ trunk/NSBitmapImageRep_SKExtensions.h 2023-11-29 16:35:30 UTC (rev
13814)
@@ -44,6 +44,6 @@
- (void)clear;
-+ (id)imageRepWithSize:(NSSize)size scale:(CGFloat)scale drawingHandler:(void
(^)(NSRect dstRect))drawingHandler;
++ (instancetype)imageRepWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
@end
Modified: trunk/NSBitmapImageRep_SKExtensions.m
===================================================================
--- trunk/NSBitmapImageRep_SKExtensions.m 2023-11-26 00:16:38 UTC (rev
13813)
+++ trunk/NSBitmapImageRep_SKExtensions.m 2023-11-29 16:35:30 UTC (rev
13814)
@@ -230,7 +230,7 @@
bzero(bitmapData, [self bytesPerRow] * [self pixelsHigh]);
}
-+ (id)imageRepWithSize:(NSSize)size scale:(CGFloat)scale drawingHandler:(void
(^)(NSRect dstRect))drawingHandler {
++ (instancetype)imageRepWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler {
NSBitmapImageRep *bmpImageRep = [[[self alloc]
initWithBitmapDataPlanes:NULL
pixelsWide:(NSInteger)(size.width * scale)
pixelsHigh:(NSInteger)(size.height * scale)
bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSData_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -56,7 +56,7 @@
- (NSString *)md5String;
- (NSString *)xmlString;
-- (id)initWithHexString:(NSString *)hexString;
+- (instancetype)initWithHexString:(NSString *)hexString;
- (NSString *)hexString;
+ (NSData *)dataWithPointAsQDPoint:(NSPoint)point;
Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSData_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -81,7 +81,7 @@
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
};
-- (id)initWithHexString:(NSString *)hexString {
+- (instancetype)initWithHexString:(NSString *)hexString {
NSData *data = [hexString dataUsingEncoding:NSASCIIStringEncoding];
size_t length = [data length];
const unsigned char *inputBuffer = (const unsigned char *)[data bytes];
Modified: trunk/NSDate_SKExtensions.m
===================================================================
--- trunk/NSDate_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSDate_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -43,7 +43,7 @@
NSDateFormatter *formatter;
}
-- (id)initWithDate:(NSDate *)aDate;
+- (instancetype)initWithDate:(NSDate *)aDate;
@end
@@ -119,11 +119,11 @@
@implementation SKFormattedDate
-- (id)init {
+- (instancetype)init {
return [self initWithDate:[NSDate date]];
}
-- (id)initWithDate:(NSDate *)aDate {
+- (instancetype)initWithDate:(NSDate *)aDate {
if (aDate == nil) {
[self release];
return nil;
@@ -139,7 +139,7 @@
return self;
}
-- (id)initWithTimeIntervalSinceReferenceDate:(NSTimeInterval)timeInterval {
+-
(instancetype)initWithTimeIntervalSinceReferenceDate:(NSTimeInterval)timeInterval
{
return [self initWithDate:[[[NSDate alloc]
initWithTimeIntervalSinceReferenceDate:timeInterval
] autorelease]];
}
Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSError_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -50,12 +50,12 @@
@interface NSError (SKExtensions)
-+ (id)writeFileErrorWithLocalizedDescription:(NSString *)description;
-+ (id)readFileErrorWithLocalizedDescription:(NSString *)description;
-+ (id)readPasteboardErrorWithLocalizedDescription:(NSString *)description;
-+ (id)userCancelledErrorWithUnderlyingError:(NSError *)error;
-+ (id)printDocumentErrorWithLocalizedDescription:(NSString *)description;
-+ (id)failedToCommitErrorWithLocalizedDescription:(NSString *)description;
++ (instancetype)writeFileErrorWithLocalizedDescription:(NSString *)description;
++ (instancetype)readFileErrorWithLocalizedDescription:(NSString *)description;
++ (instancetype)readPasteboardErrorWithLocalizedDescription:(NSString
*)description;
++ (instancetype)userCancelledErrorWithUnderlyingError:(NSError *)error;
++ (instancetype)printDocumentErrorWithLocalizedDescription:(NSString
*)description;
++ (instancetype)failedToCommitErrorWithLocalizedDescription:(NSString
*)description;
+ (NSError *)combineErrors:(NSArray *)errors maximum:(NSUInteger)max;
Modified: trunk/NSError_SKExtensions.m
===================================================================
--- trunk/NSError_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSError_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,27 +44,27 @@
@implementation NSError (SKExtensions)
-+ (id)writeFileErrorWithLocalizedDescription:(NSString *)description {
++ (instancetype)writeFileErrorWithLocalizedDescription:(NSString *)description
{
return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
}
-+ (id)readFileErrorWithLocalizedDescription:(NSString *)description {
++ (instancetype)readFileErrorWithLocalizedDescription:(NSString *)description {
return [NSError errorWithDomain:SKDocumentErrorDomain code:SKReadFileError
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:description,
NSLocalizedDescriptionKey, nil]];
}
-+ (id)readPasteboardErrorWithLocalizedDescription:(NSString *)description {
++ (instancetype)readPasteboardErrorWithLocalizedDescription:(NSString
*)description {
return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadPasteboardError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
}
-+ (id)printDocumentErrorWithLocalizedDescription:(NSString *)description {
++ (instancetype)printDocumentErrorWithLocalizedDescription:(NSString
*)description {
return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKPrintDocumentError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
}
-+ (id)failedToCommitErrorWithLocalizedDescription:(NSString *)description {
++ (instancetype)failedToCommitErrorWithLocalizedDescription:(NSString
*)description {
return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKFailedToCommitError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
}
-+ (id)userCancelledErrorWithUnderlyingError:(NSError *)error {
++ (instancetype)userCancelledErrorWithUnderlyingError:(NSError *)error {
return [NSError errorWithDomain:NSCocoaErrorDomain
code:NSUserCancelledError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:error, NSUnderlyingErrorKey, nil]];
}
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSImage_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -271,7 +271,7 @@
return image;
}
-- (id)initPDFWithSize:(NSSize)size drawingHandler:(void (^)(NSRect
dstRect))drawingHandler {
+- (instancetype)initPDFWithSize:(NSSize)size drawingHandler:(void (^)(NSRect
dstRect))drawingHandler {
CFMutableDataRef pdfData = CFDataCreateMutable(NULL, 0);
CGDataConsumerRef consumer = CGDataConsumerCreateWithCFData(pdfData);
CGRect rect = CGRectMake(0.0, 0.0, size.width, size.height);
@@ -290,7 +290,7 @@
return self;
}
-- (id)initVectorWithSize:(NSSize)size drawingHandler:(void (^)(NSRect
dstRect))drawingHandler {
+- (instancetype)initVectorWithSize:(NSSize)size drawingHandler:(void
(^)(NSRect dstRect))drawingHandler {
return [self initPDFWithSize:size drawingHandler:drawingHandler];
}
Modified: trunk/NSInvocation_SKExtensions.h
===================================================================
--- trunk/NSInvocation_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSInvocation_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -40,5 +40,5 @@
@interface NSInvocation (SKExtensions)
-+ (id)invocationWithTarget:(id)target selector:(SEL)selector;
++ (instancetype)invocationWithTarget:(id)target selector:(SEL)selector;
@end
Modified: trunk/NSInvocation_SKExtensions.m
===================================================================
--- trunk/NSInvocation_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSInvocation_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -41,7 +41,7 @@
@implementation NSInvocation (SKExtensions)
-+ (id)invocationWithTarget:(id)target selector:(SEL)selector {
++ (instancetype)invocationWithTarget:(id)target selector:(SEL)selector {
NSMethodSignature *ms = [target methodSignatureForSelector:selector];
NSInvocation *invocation = [self invocationWithMethodSignature:ms];
[invocation setTarget:target];
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSMenu_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -64,10 +64,10 @@
+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
+ (NSMenuItem *)menuItemWithSubmenuAndTitle:(NSString *)aString;
-- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
-- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
-- (id)initWithTitle:(NSString *)aString imageNamed:(NSString *)anImageName
action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
-- (id)initWithSubmenuAndTitle:(NSString *)aString;
+- (instancetype)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
+- (instancetype)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
+- (instancetype)initWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
+- (instancetype)initWithSubmenuAndTitle:(NSString *)aString;
- (void)setImageAndSize:(NSImage *)image;
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSMenu_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -107,15 +107,15 @@
return [[[NSMenuItem alloc] initWithSubmenuAndTitle:aString] autorelease];
}
-- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
+- (instancetype)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:0];
}
-- (id)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag {
+- (instancetype)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag {
return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:aTag];
}
-- (id)initWithTitle:(NSString *)aString imageNamed:(NSString *)anImageName
action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
+- (instancetype)initWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
self = [self initWithTitle:aString action:aSelector keyEquivalent:@""];
if (self) {
if (anImageName)
@@ -126,7 +126,7 @@
return self;
}
-- (id)initWithSubmenuAndTitle:(NSString *)aString {
+- (instancetype)initWithSubmenuAndTitle:(NSString *)aString {
self = [self initWithTitle:aString action:NULL keyEquivalent:@""];
if (self) {
NSMenu *menu = [[NSMenu alloc] initWithTitle:aString];
Modified: trunk/NSPointerArray_SKExtensions.h
===================================================================
--- trunk/NSPointerArray_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSPointerArray_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -41,11 +41,11 @@
@interface NSPointerArray (SKExtensions)
-+ (id)rectPointerArray;
-+ (id)rangePointerArray;
-- (id)initForStructPointersWithSizeFunction:(NSUInteger (*)(const void
*))sizeFunction descriptionFunction:(NSString *(*)(const void
*))descriptionFunction;
-- (id)initForRectPointers;
-- (id)initForRangePointers;
++ (instancetype)rectPointerArray;
++ (instancetype)rangePointerArray;
+- (instancetype)initForStructPointersWithSizeFunction:(NSUInteger (*)(const
void *))sizeFunction descriptionFunction:(NSString *(*)(const void
*))descriptionFunction;
+- (instancetype)initForRectPointers;
+- (instancetype)initForRangePointers;
- (NSRect)rectAtIndex:(NSUInteger)anIndex;
- (NSRange)rangeAtIndex:(NSUInteger)anIndex;
Modified: trunk/NSPointerArray_SKExtensions.m
===================================================================
--- trunk/NSPointerArray_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSPointerArray_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -49,11 +49,11 @@
static NSString *rangeDescriptionFunction(const void *item) { return [NSString
stringWithFormat:@"(%lu, %lu)", (unsigned long)(((NSRange *)item)->location),
(unsigned long)(((NSRange *)item)->length)]; }
-+ (id)rectPointerArray { return [[[self alloc] initForRectPointers]
autorelease]; }
++ (instancetype)rectPointerArray { return [[[self alloc] initForRectPointers]
autorelease]; }
-+ (id)rangePointerArray { return [[[self alloc] initForRangePointers]
autorelease]; }
++ (instancetype)rangePointerArray { return [[[self alloc]
initForRangePointers] autorelease]; }
-- (id)initForStructPointersWithSizeFunction:(NSUInteger (*)(const void
*))sizeFunction descriptionFunction:(NSString *(*)(const void
*))descriptionFunction {
+- (instancetype)initForStructPointersWithSizeFunction:(NSUInteger (*)(const
void *))sizeFunction descriptionFunction:(NSString *(*)(const void
*))descriptionFunction {
NSPointerFunctions *pointerFunctions = [NSPointerFunctions
pointerFunctionsWithOptions:NSPointerFunctionsMallocMemory |
NSPointerFunctionsCopyIn | NSPointerFunctionsStructPersonality];
[pointerFunctions setSizeFunction:sizeFunction];
[pointerFunctions setDescriptionFunction:descriptionFunction];
@@ -60,11 +60,11 @@
return [self initWithPointerFunctions:pointerFunctions];
}
-- (id)initForRectPointers {
+- (instancetype)initForRectPointers {
return [self initForStructPointersWithSizeFunction:&rectSizeFunction
descriptionFunction:&rectDescriptionFunction];
}
-- (id)initForRangePointers {
+- (instancetype)initForRangePointers {
return [self initForStructPointersWithSizeFunction:&rangeSizeFunction
descriptionFunction:&rangeDescriptionFunction];
}
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/NSURL_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -322,7 +322,7 @@
return NSPasteboardReadingAsData;
}
-- (id)initWithPasteboardPropertyList:(id)propertyList ofType:(NSString *)type {
+- (instancetype)initWithPasteboardPropertyList:(id)propertyList
ofType:(NSString *)type {
[self release];
self = nil;
if ([propertyList isKindOfClass:[NSString class]]) {
Modified: trunk/NSValueTransformer_SKExtensions.m
===================================================================
--- trunk/NSValueTransformer_SKExtensions.m 2023-11-26 00:16:38 UTC (rev
13813)
+++ trunk/NSValueTransformer_SKExtensions.m 2023-11-29 16:35:30 UTC (rev
13814)
@@ -71,7 +71,7 @@
@interface SKRadioTransformer : NSValueTransformer {
NSInteger targetValue;
}
-- (id)initWithTargetValue:(NSInteger)value;
+- (instancetype)initWithTargetValue:(NSInteger)value;
@end
#pragma mark -
@@ -244,7 +244,7 @@
return [NSNumber class];
}
-- (id)initWithTargetValue:(NSInteger)value {
+- (instancetype)initWithTargetValue:(NSInteger)value {
self = [super init];
if (self) {
targetValue = value;
Modified: trunk/PDFAnnotationMarkup_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.h 2023-11-26 00:16:38 UTC (rev
13813)
+++ trunk/PDFAnnotationMarkup_SKExtensions.h 2023-11-29 16:35:30 UTC (rev
13814)
@@ -45,7 +45,7 @@
@interface PDFAnnotationMarkup (SKExtensions)
-- (id)initSkimNoteWithSelection:(PDFSelection *)selection forPage:(PDFPage
*)page forType:(NSString *)type;
+- (instancetype)initSkimNoteWithSelection:(PDFSelection *)selection
forPage:(PDFPage *)page forType:(NSString *)type;
- (PDFSelection *)selection;
Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m 2023-11-26 00:16:38 UTC (rev
13813)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m 2023-11-29 16:35:30 UTC (rev
13814)
@@ -99,7 +99,7 @@
[self setColor:[[NSUserDefaults standardUserDefaults] colorForKey:key]];
}
-- (id)initSkimNoteWithSelection:(PDFSelection *)selection forPage:(PDFPage
*)page forType:(NSString *)type {
+- (instancetype)initSkimNoteWithSelection:(PDFSelection *)selection
forPage:(PDFPage *)page forType:(NSString *)type {
if (page == nil)
page = [selection safeFirstPage];
NSRect bounds = NSZeroRect;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/PDFAnnotation_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -103,7 +103,7 @@
return [NSSet setWithObjects:SKNPDFAnnotationStringKey, nil];
}
-- (id)initWithPasteboardPropertyList:(id)propertyList ofType:(NSString *)type {
+- (instancetype)initWithPasteboardPropertyList:(id)propertyList
ofType:(NSString *)type {
if ([type isEqualToString:SKPasteboardTypeSkimNote] &&
[propertyList isKindOfClass:[NSData class]]) {
self = [self initSkimNoteWithProperties:[NSKeyedUnarchiver
unarchiveObjectWithData:propertyList]];
Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/PDFSelection_SKExtensions.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -59,8 +59,8 @@
- (CGFloat)boundsOrderForPage:(PDFPage *)page;
-+ (id)selectionWithSpecifier:(id)specifier;
-+ (id)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
++ (instancetype)selectionWithSpecifier:(id)specifier;
++ (instancetype)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
- (id)objectSpecifiers;
@end
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/PDFSelection_SKExtensions.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -486,11 +486,11 @@
return rangeDicts;
}
-+ (id)selectionWithSpecifier:(id)specifier {
++ (instancetype)selectionWithSpecifier:(id)specifier {
return [self selectionWithSpecifier:specifier onPage:nil];
}
-+ (id)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage {
++ (instancetype)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage {
if (specifier == nil || [specifier isEqual:[NSNull null]])
return nil;
if ([specifier isKindOfClass:[NSPropertySpecifier class]] &&
Modified: trunk/SKAlias.h
===================================================================
--- trunk/SKAlias.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAlias.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -49,8 +49,8 @@
@property (nonatomic, readonly) NSURL *fileURL;
@property (nonatomic, readonly) NSURL *fileURLNoUI;
-- (id)initWithAliasData:(NSData *)data;
-- (id)initWithBookmarkData:(NSData *)data;
-- (id)initWithURL:(NSURL *)fileURL;
+- (instancetype)initWithAliasData:(NSData *)data;
+- (instancetype)initWithBookmarkData:(NSData *)data;
+- (instancetype)initWithURL:(NSURL *)fileURL;
@end
Modified: trunk/SKAlias.m
===================================================================
--- trunk/SKAlias.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAlias.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -80,7 +80,7 @@
}
#pragma clang diagnostic pop
-- (id)initWithAliasData:(NSData *)aliasData {
+- (instancetype)initWithAliasData:(NSData *)aliasData {
if (aliasData == nil) {
[self release];
self = nil;
@@ -100,7 +100,7 @@
return self;
}
-- (id)initWithBookmarkData:(NSData *)bookmarkData {
+- (instancetype)initWithBookmarkData:(NSData *)bookmarkData {
if (bookmarkData == nil) {
[self release];
self = nil;
@@ -113,7 +113,7 @@
return self;
}
-- (id)initWithURL:(NSURL *)fileURL {
+- (instancetype)initWithURL:(NSURL *)fileURL {
return [self initWithBookmarkData:[fileURL bookmarkDataWithOptions:0
includingResourceValuesForKeys:nil relativeToURL:nil error:NULL]];
}
Modified: trunk/SKAnimatedBorderlessWindow.h
===================================================================
--- trunk/SKAnimatedBorderlessWindow.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAnimatedBorderlessWindow.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
NSTimeInterval autoHideTimeInterval;
}
-- (id)initWithContentRect:(NSRect)contentRect;
+- (instancetype)initWithContentRect:(NSRect)contentRect;
@property (nonatomic) CGFloat defaultAlphaValue;
@property (nonatomic) NSTimeInterval autoHideTimeInterval;
Modified: trunk/SKAnimatedBorderlessWindow.m
===================================================================
--- trunk/SKAnimatedBorderlessWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAnimatedBorderlessWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -51,7 +51,7 @@
@synthesize defaultAlphaValue, autoHideTimeInterval;
@dynamic fadeInDuration, fadeOutDuration, backgroundImage;
-- (id)initWithContentRect:(NSRect)contentRect {
+- (instancetype)initWithContentRect:(NSRect)contentRect {
self = [super initWithContentRect:contentRect
styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
if (self) {
defaultAlphaValue = ALPHA_VALUE;
Modified: trunk/SKAnnotationTypeImageCell.m
===================================================================
--- trunk/SKAnnotationTypeImageCell.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAnnotationTypeImageCell.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -53,13 +53,13 @@
activeImages = [[NSMutableDictionary alloc] init];
}
-- (id)copyWithZone:(NSZone *)aZone {
+- (instancetype)copyWithZone:(NSZone *)aZone {
SKAnnotationTypeImageCell *copy = [super copyWithZone:aZone];
copy->hasOutline = hasOutline;
return copy;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
hasOutline = [decoder decodeBoolForKey:@"hasOutline"];
Modified: trunk/SKAttachmentEmailer.m
===================================================================
--- trunk/SKAttachmentEmailer.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKAttachmentEmailer.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -48,7 +48,7 @@
@synthesize delegate, subject;
@dynamic title, image;
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
NSURL *appURL = [[NSWorkspace sharedWorkspace]
URLForApplicationToOpenURL:[NSURL URLWithString:@"mailto://";]];
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKBasePDFView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -97,7 +97,7 @@
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKeys:defaultKeysToObserve()
context:&SKBasePDFViewDefaultsObservationContext];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonBaseInitialization];
@@ -105,7 +105,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self commonBaseInitialization];
Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKBookmark.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -50,22 +50,22 @@
SKBookmark *parent;
}
-+ (id)bookmarkWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel;
-+ (id)bookmarkWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel;
-+ (id)bookmarkFolderWithLabel:(NSString *)aLabel;
-+ (id)bookmarkSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel;
-+ (id)bookmarkSeparator;
++ (instancetype)bookmarkWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel;
++ (instancetype)bookmarkWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel;
++ (instancetype)bookmarkFolderWithLabel:(NSString *)aLabel;
++ (instancetype)bookmarkSessionWithSetups:(NSArray *)aSetupDicts
label:(NSString *)aLabel;
++ (instancetype)bookmarkSeparator;
+ (NSArray *)bookmarksForURLs:(NSArray *)urls;
-- (id)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel;
-- (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel;
-- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel;
-- (id)initFolderWithLabel:(NSString *)aLabel;
-- (id)initRootWithChildrenProperties:(NSArray *)childrenProperties;
-- (id)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString *)aLabel;
-- (id)initSeparator;
-- (id)initWithProperties:(NSDictionary *)dictionary;
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel;
+- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel;
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel;
+- (instancetype)initFolderWithLabel:(NSString *)aLabel;
+- (instancetype)initRootWithChildrenProperties:(NSArray *)childrenProperties;
+- (instancetype)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel;
+- (instancetype)initSeparator;
+- (instancetype)initWithProperties:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *properties;
@property (nonatomic, readonly) SKBookmarkType bookmarkType;
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKBookmark.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -103,27 +103,27 @@
defaultPlaceholderBookmark = (SKPlaceholderBookmark
*)NSAllocateObject([SKPlaceholderBookmark class], 0, NSDefaultMallocZone());
}
-+ (id)allocWithZone:(NSZone *)aZone {
++ (instancetype)allocWithZone:(NSZone *)aZone {
return SKBookmarkClass == self ? defaultPlaceholderBookmark : [super
allocWithZone:aZone];
}
-+ (id)bookmarkWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
++ (instancetype)bookmarkWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
return [[[self alloc] initWithURL:aURL pageIndex:aPageIndex label:aLabel]
autorelease];
}
-+ (id)bookmarkWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
++ (instancetype)bookmarkWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel {
return [[[self alloc] initWithSetup:aSetupDict label:aLabel] autorelease];
}
-+ (id)bookmarkFolderWithLabel:(NSString *)aLabel {
++ (instancetype)bookmarkFolderWithLabel:(NSString *)aLabel {
return [[[self alloc] initFolderWithLabel:aLabel] autorelease];
}
-+ (id)bookmarkSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel {
++ (instancetype)bookmarkSessionWithSetups:(NSArray *)aSetupDicts
label:(NSString *)aLabel {
return [[[self alloc] initSessionWithSetups:aSetupDicts label:aLabel]
autorelease];
}
-+ (id)bookmarkSeparator {
++ (instancetype)bookmarkSeparator {
return [[[self alloc] initSeparator] autorelease];
}
@@ -155,47 +155,47 @@
return array;
}
-- (id)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
+- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel {
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initFolderWithLabel:(NSString *)aLabel {
+- (instancetype)initFolderWithLabel:(NSString *)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initRootWithChildrenProperties:(NSArray *)childrenProperties {
+- (instancetype)initRootWithChildrenProperties:(NSArray *)childrenProperties {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString *)aLabel {
+- (instancetype)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initSeparator {
+- (instancetype)initSeparator {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)initWithProperties:(NSDictionary *)dictionary {
+- (instancetype)initWithProperties:(NSDictionary *)dictionary {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
-- (id)copyWithZone:(NSZone *)aZone {
+- (instancetype)copyWithZone:(NSZone *)aZone {
return [[SKBookmark alloc] initWithProperties:[self properties]];
}
@@ -336,27 +336,27 @@
@implementation SKPlaceholderBookmark
-- (id)init {
+- (instancetype)init {
return nil;
}
-- (id)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
return (id)[[SKFileBookmark alloc] initWithURL:aURL pageIndex:aPageIndex
label:aLabel];
}
-- (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
+- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel {
return (id)[[SKFileBookmark alloc] initWithSetup:aSetupDict label:aLabel];
}
-- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel {
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel {
return (id)[[SKFolderBookmark alloc] initFolderWithChildren:aChildren
label:aLabel];
}
-- (id)initFolderWithLabel:(NSString *)aLabel {
+- (instancetype)initFolderWithLabel:(NSString *)aLabel {
return [self initFolderWithChildren:nil label:aLabel];
}
-- (id)initRootWithChildrenProperties:(NSArray *)childrenProperties {
+- (instancetype)initRootWithChildrenProperties:(NSArray *)childrenProperties {
NSMutableArray *aChildren = [NSMutableArray array];
SKBookmark *child;
for (NSDictionary *dict in childrenProperties) {
@@ -368,7 +368,7 @@
return (id)[[SKRootBookmark alloc] initFolderWithChildren:aChildren
label:NSLocalizedString(@"Bookmarks Menu", @"Menu item title")];
}
-- (id)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString *)aLabel {
+- (instancetype)initSessionWithSetups:(NSArray *)aSetupDicts label:(NSString
*)aLabel {
NSMutableArray *aChildren = [NSMutableArray array];
SKBookmark *child;
for (NSDictionary *setup in aSetupDicts) {
@@ -380,11 +380,11 @@
return (id)[[SKSessionBookmark alloc] initFolderWithChildren:aChildren
label:aLabel];
}
-- (id)initSeparator {
+- (instancetype)initSeparator {
return (id)[[SKSeparatorBookmark alloc] init];
}
-- (id)initWithProperties:(NSDictionary *)dictionary {
+- (instancetype)initWithProperties:(NSDictionary *)dictionary {
NSString *type = [dictionary objectForKey:TYPE_KEY];
if ([type isEqualToString:SEPARATOR_STRING]) {
return (id)[[SKSeparatorBookmark alloc] init];
@@ -474,7 +474,7 @@
return icon;
}
-- (id)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
self = [super init];
if (self) {
alias = [[SKAlias alloc] initWithURL:aURL];
@@ -490,7 +490,7 @@
return self;
}
-- (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
+- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel {
self = [super init];
if (self) {
NSData *data;
@@ -626,7 +626,7 @@
return keyPaths;
}
-- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel {
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel {
self = [super init];
if (self) {
label = [aLabel copy];
Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKBookmarkController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -62,7 +62,7 @@
BOOL needsBeginUpdates;
}
-@property (class, nonatomic, readonly) id sharedBookmarkController;
+@property (class, nonatomic, readonly) SKBookmarkController
*sharedBookmarkController;
@property (nonatomic, retain) IBOutlet SKOutlineView *outlineView;
@property (nonatomic, retain) IBOutlet SKStatusBar *statusBar;
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKBookmarkController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -135,17 +135,17 @@
[separatorImage
setAccessibilityDescription:NSLocalizedString(@"separator", @"Accessibility
description")];
}
-+ (id)sharedBookmarkController {
++ (SKBookmarkController *)sharedBookmarkController {
if (sharedBookmarkController == nil)
[[[self alloc] init] release];
return sharedBookmarkController;
}
-+ (id)allocWithZone:(NSZone *)zone {
++ (instancetype)allocWithZone:(NSZone *)zone {
return [sharedBookmarkController retain] ?: [super allocWithZone:zone];
}
-- (id)init {
+- (instancetype)init {
if (sharedBookmarkController == nil) {
self = [super initWithWindowNibName:@"BookmarksWindow"];
if (self) {
Modified: trunk/SKChainedUndoManager.h
===================================================================
--- trunk/SKChainedUndoManager.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKChainedUndoManager.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -42,5 +42,5 @@
@interface SKChainedUndoManager : NSUndoManager {
NSUndoManager *nextUndoManager;
}
-- (id)initWithNextUndoManager:(NSUndoManager *)undoManager;
+- (instancetype)initWithNextUndoManager:(NSUndoManager *)undoManager;
@end
Modified: trunk/SKChainedUndoManager.m
===================================================================
--- trunk/SKChainedUndoManager.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKChainedUndoManager.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -41,7 +41,7 @@
@implementation SKChainedUndoManager
-- (id)initWithNextUndoManager:(NSUndoManager *)undoManager {
+- (instancetype)initWithNextUndoManager:(NSUndoManager *)undoManager {
self = [super init];
if (self) {
nextUndoManager = [undoManager retain];
Modified: trunk/SKColorCell.m
===================================================================
--- trunk/SKColorCell.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKColorCell.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
@synthesize shouldFill;
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
color = [[decoder decodeObjectForKey:@"color"] retain];
@@ -59,7 +59,7 @@
[coder encodeBool:shouldFill forKey:@"shouldFill"];
}
-- (id)copyWithZone:(NSZone *)zone {
+- (instancetype)copyWithZone:(NSZone *)zone {
SKColorCell *copy = [super copyWithZone:zone];
copy->color = [color retain];
copy->shouldFill = shouldFill;
Modified: trunk/SKColorMenuView.h
===================================================================
--- trunk/SKColorMenuView.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKColorMenuView.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -47,6 +47,6 @@
NSUInteger hoveredIndex;
}
-- (id)initWithAnnotation:(PDFAnnotation *)anAnnotation;
+- (instancetype)initWithAnnotation:(PDFAnnotation *)anAnnotation;
@end
Modified: trunk/SKColorMenuView.m
===================================================================
--- trunk/SKColorMenuView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKColorMenuView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -52,7 +52,7 @@
@implementation SKColorMenuView
-- (id)initWithAnnotation:(PDFAnnotation *)anAnnotation {
+- (instancetype)initWithAnnotation:(PDFAnnotation *)anAnnotation {
NSArray *favoriteColors = [NSColor favoriteColors];
self = [super initWithFrame:NSMakeRect(0.0, 0.0, ([favoriteColors count] -
1) * OFFSET + ITEM_SIZE + MARGIN, ITEM_SIZE)];
if (self) {
Modified: trunk/SKColorPicker.m
===================================================================
--- trunk/SKColorPicker.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKColorPicker.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -51,7 +51,7 @@
@synthesize delegate;
@dynamic colors;
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
scrubber = [[NSScrubber alloc] initWithFrame:NSMakeRect(0.0, 0.0, 180,
22.0)];
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKColorSwatch.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -133,7 +133,7 @@
[self registerForDraggedTypes:[NSColor
readableTypesForPasteboard:[NSPasteboard
pasteboardWithName:NSPasteboardNameDrag]]];
}
-- (id)initWithFrame:(NSRect)frame {
+- (instancetype)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
colors = [[NSMutableArray alloc] initWithObjects:[NSColor whiteColor],
nil];
@@ -160,7 +160,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
colors = [[NSMutableArray alloc] initWithArray:[decoder
decodeObjectForKey:COLORS_KEY]];
@@ -883,7 +883,7 @@
return [super defaultAnimationForKey:key];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
NSSegmentedCell *cell = [[[NSSegmentedCell alloc] init] autorelease];
@@ -929,7 +929,7 @@
@synthesize color, highlighted, selected, dropLocation;
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
color = [[decoder decodeObjectForKey:COLOR_KEY] retain];
Modified: trunk/SKDisplayPrefs.h
===================================================================
--- trunk/SKDisplayPrefs.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDisplayPrefs.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -50,7 +50,7 @@
@property (nonatomic, retain) NSColor *whitePoint;
@property (nonatomic, getter=isInverted) BOOL inverted;
-- (id)initForFullScreen:(BOOL)isFullScreen;
-- (id)initWithName:(NSString *)name;
+- (instancetype)initForFullScreen:(BOOL)isFullScreen;
+- (instancetype)initWithName:(NSString *)name;
@end
Modified: trunk/SKDisplayPrefs.m
===================================================================
--- trunk/SKDisplayPrefs.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDisplayPrefs.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -46,7 +46,7 @@
@dynamic name, pdfViewSettings, backgroundColor, sepiaTone, whitePoint,
inverted;
-- (id)initForFullScreen:(BOOL)isFullScreen {
+- (instancetype)initForFullScreen:(BOOL)isFullScreen {
self = [super init];
if (self) {
fullScreen = isFullScreen;
@@ -54,7 +54,7 @@
return self;
}
-- (id)initWithName:(NSString *)name {
+- (instancetype)initWithName:(NSString *)name {
if ([name isEqualToString:@"Normal"] || [name isEqualToString:@"normal
mode"])
self = [self initForFullScreen:NO];
else if ([name isEqualToString:@"FullScreen"] || [name
isEqualToString:@"full screen mode"])
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDocumentController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -97,7 +97,7 @@
@synthesize openedFile;
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
[self setAutosavingDelay:[[NSUserDefaults standardUserDefaults]
doubleForKey:SKAutosaveIntervalKey]];
Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDownload.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -97,8 +97,8 @@
@property (class, nonatomic, readonly) NSImage *cancelImage;
@property (class, nonatomic, readonly) NSImage *resumeImage;
-- (id)initWithURL:(NSURL *)aURL;
-- (id)initWithProperties:(NSDictionary *)properties;
+- (instancetype)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithProperties:(NSDictionary *)properties;
- (void)start;
- (void)cancel;
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDownload.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -118,7 +118,7 @@
return resumeImage;
}
-- (id)initWithURL:(NSURL *)aURL {
+- (instancetype)initWithURL:(NSURL *)aURL {
self = [super init];
if (self) {
URL = [aURL retain];
@@ -136,7 +136,7 @@
return self;
}
-- (id)initWithProperties:(NSDictionary *)properties {
+- (instancetype)initWithProperties:(NSDictionary *)properties {
NSString *URLString = [properties objectForKey:@"URL"];
self = [self initWithURL:URLString ? [NSURL URLWithString:URLString] :
nil];
if (self) {
@@ -155,7 +155,7 @@
return self;
}
-- (id)init {
+- (instancetype)init {
return [self initWithURL:nil];
}
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDownloadController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -59,7 +59,7 @@
@property (nonatomic, retain) IBOutlet SKTableView *tableView;
@property (nonatomic, retain) IBOutlet NSButton *clearButton;
-@property (class, nonatomic, readonly) id sharedDownloadController;
+@property (class, nonatomic, readonly) SKDownloadController
*sharedDownloadController;
- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKDownloadController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -102,13 +102,13 @@
static SKDownloadController *sharedDownloadController = nil;
-+ (id)sharedDownloadController {
++ (SKDownloadController *)sharedDownloadController {
if (sharedDownloadController == nil)
sharedDownloadController = [[self alloc] init];
return sharedDownloadController;
}
-- (id)init {
+- (instancetype)init {
if (sharedDownloadController) NSLog(@"Attempt to allocate second instance
of %@", [self class]);
self = [super initWithWindowNibName:@"DownloadsWindow"];
if (self) {
Modified: trunk/SKFileUpdateChecker.h
===================================================================
--- trunk/SKFileUpdateChecker.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKFileUpdateChecker.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -60,7 +60,7 @@
@property (nonatomic, getter=isEnabled) BOOL enabled;
@property (nonatomic, readonly) BOOL fileChangedOnDisk, isUpdatingFile;
-- (id)initForDocument:(NSDocument *)aDocument;
+- (instancetype)initForDocument:(NSDocument *)aDocument;
- (void)terminate;
Modified: trunk/SKFileUpdateChecker.m
===================================================================
--- trunk/SKFileUpdateChecker.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKFileUpdateChecker.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -62,7 +62,7 @@
@dynamic enabled, fileChangedOnDisk, isUpdatingFile;
-- (id)initForDocument:(NSDocument *)aDocument {
+- (instancetype)initForDocument:(NSDocument *)aDocument {
self = [super init];
if (self) {
document = aDocument;
Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKFontWell.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -110,7 +110,7 @@
[self registerForDraggedTypes:@[SKNSFontPanelDescriptorsPboardType,
SKNSFontPanelFamiliesPboardType, NSPasteboardTypeColor]];
}
-- (id)initWithFrame:(NSRect)frame {
+- (instancetype)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self commonInit];
@@ -118,7 +118,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
NSButtonCell *oldCell = [self cell];
@@ -463,7 +463,7 @@
[self setState:NSOffState];
}
-- (id)initTextCell:(NSString *)aString {
+- (instancetype)initTextCell:(NSString *)aString {
self = [super initTextCell:aString];
if (self) {
[self commonInit];
@@ -471,7 +471,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self setTextColor:[decoder decodeObjectForKey:TEXTCOLOR_KEY]];
@@ -487,7 +487,7 @@
[coder encodeObject:textColor forKey:HASTEXTCOLOR_KEY];
}
-- (id)copyWithZone:(NSZone *)zone {
+- (instancetype)copyWithZone:(NSZone *)zone {
SKFontWellCell *copy = [super copyWithZone:zone];
copy->textColor = [textColor copyWithZone:zone];
copy->hasTextColor = hasTextColor;
Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKFullScreenWindow.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -42,7 +42,7 @@
@interface SKFullScreenWindow : SKMainWindow <NSAnimationDelegate>
-- (id)initWithScreen:(NSScreen *)screen;
+- (instancetype)initWithScreen:(NSScreen *)screen;
@end
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKFullScreenWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -40,7 +40,7 @@
@implementation SKFullScreenWindow
-- (id)initWithScreen:(NSScreen *)screen {
+- (instancetype)initWithScreen:(NSScreen *)screen {
NSRect screenFrame = [(screen ?: [NSScreen mainScreen]) frame];
self = [self initWithContentRect:screenFrame
styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
if (self) {
Modified: trunk/SKGroupedSearchResult.h
===================================================================
--- trunk/SKGroupedSearchResult.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKGroupedSearchResult.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -54,8 +54,8 @@
@property (nonatomic, readonly) NSString *label;
@property (nonatomic, readonly) NSArray *matches;
-+ (id)groupedSearchResultWithPage:(PDFPage *)aPage
maxCount:(NSUInteger)aMaxCount;
-- (id)initWithPage:(PDFPage *)aPage maxCount:(NSUInteger)aMaxCount;
++ (instancetype)groupedSearchResultWithPage:(PDFPage *)aPage
maxCount:(NSUInteger)aMaxCount;
+- (instancetype)initWithPage:(PDFPage *)aPage maxCount:(NSUInteger)aMaxCount;
- (void)addMatch:(PDFSelection *)match;
Modified: trunk/SKGroupedSearchResult.m
===================================================================
--- trunk/SKGroupedSearchResult.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKGroupedSearchResult.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -55,11 +55,11 @@
return keyPaths;
}
-+ (id)groupedSearchResultWithPage:(PDFPage *)aPage
maxCount:(NSUInteger)aMaxCount {
++ (instancetype)groupedSearchResultWithPage:(PDFPage *)aPage
maxCount:(NSUInteger)aMaxCount {
return [[[self alloc] initWithPage:aPage maxCount:aMaxCount] autorelease];
}
-- (id)initWithPage:(PDFPage *)aPage maxCount:(NSUInteger)aMaxCount {
+- (instancetype)initWithPage:(PDFPage *)aPage maxCount:(NSUInteger)aMaxCount {
self = [super init];
if (self) {
page = [aPage retain];
Modified: trunk/SKImageToolTipWindow.h
===================================================================
--- trunk/SKImageToolTipWindow.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKImageToolTipWindow.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -47,7 +47,7 @@
CGFloat scale;
}
-@property (class, nonatomic, readonly) id sharedToolTipWindow;
+@property (class, nonatomic, readonly) SKImageToolTipWindow
*sharedToolTipWindow;
// aContext can be a PDFAnnotation, PDFDestination, or PDFPage
- (void)showForImageContext:(id <SKImageToolTipContext>)aContext
scale:(CGFloat)aScale atPoint:(NSPoint)aPoint;
Modified: trunk/SKImageToolTipWindow.m
===================================================================
--- trunk/SKImageToolTipWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKImageToolTipWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -59,13 +59,13 @@
static SKImageToolTipWindow *sharedToolTipWindow = nil;
-+ (id)sharedToolTipWindow {
++ (SKImageToolTipWindow *)sharedToolTipWindow {
if (sharedToolTipWindow == nil)
sharedToolTipWindow = [[self alloc] init];
return sharedToolTipWindow;
}
-- (id)init {
+- (instancetype)init {
if (sharedToolTipWindow) NSLog(@"Attempt to allocate second instance of
%@", self);
self = [super initWithContentRect:NSZeroRect];
if (self) {
Modified: trunk/SKInfoWindowController.h
===================================================================
--- trunk/SKInfoWindowController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKInfoWindowController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -54,7 +54,7 @@
@property (nonatomic, copy) NSDictionary *info;
@property (nonatomic, readonly) NSArray *keys;
-@property (class, nonatomic, readonly) id sharedInstance;
+@property (class, nonatomic, readonly) SKInfoWindowController *sharedInstance;
- (NSDictionary *)infoForDocument:(NSDocument *)doc;
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKInfoWindowController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -80,13 +80,13 @@
static SKInfoWindowController *sharedInstance = nil;
-+ (id)sharedInstance {
++ (SKInfoWindowController *)sharedInstance {
if (sharedInstance == nil)
sharedInstance = [[self alloc] init];
return sharedInstance;
}
-- (id)init {
+- (instancetype)init {
if (sharedInstance) NSLog(@"Attempt to allocate second instance of %@",
[self class]);
self = [super initWithWindowNibName:@"InfoWindow"];
if (self){
Modified: trunk/SKLine.h
===================================================================
--- trunk/SKLine.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLine.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,7 +45,7 @@
NSInteger index;
}
-- (id)initWithPage:(PDFPage *)aPage index:(NSInteger)anIndex;
+- (instancetype)initWithPage:(PDFPage *)aPage index:(NSInteger)anIndex;
@property (nonatomic, readonly) PDFPage *page;
@property (nonatomic, readonly) NSInteger index;
Modified: trunk/SKLine.m
===================================================================
--- trunk/SKLine.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLine.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -48,7 +48,7 @@
@synthesize page, index;
@dynamic bounds, scriptingIndex, boundsAsQDRect, selectionSpecifier;
-- (id)initWithPage:(PDFPage *)aPage index:(NSInteger)anIndex {
+- (instancetype)initWithPage:(PDFPage *)aPage index:(NSInteger)anIndex {
self = [super init];
if (self) {
page = [aPage retain];
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLineInspector.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -72,7 +72,7 @@
@property (nonatomic) PDFLineStyle startLineStyle, endLineStyle;
@property (nonatomic, readonly) SKLineChangeAction currentLineChangeAction;
-@property (class, nonatomic, readonly) id sharedLineInspector;
+@property (class, nonatomic, readonly) SKLineInspector *sharedLineInspector;
@property (class, nonatomic, readonly) BOOL sharedLineInspectorExists;
- (void)setAnnotationStyle:(PDFAnnotation *)annotation;
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLineInspector.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -70,7 +70,7 @@
static SKLineInspector *sharedLineInspector = nil;
-+ (id)sharedLineInspector {
++ (SKLineInspector *)sharedLineInspector {
if (sharedLineInspector == nil)
sharedLineInspector = [[self alloc] init];
return sharedLineInspector;
@@ -80,7 +80,7 @@
return sharedLineInspector != nil;
}
-- (id)init {
+- (instancetype)init {
if (sharedLineInspector) NSLog(@"Attempt to allocate second instance of
%@", [self class]);
self = [super initWithWindowNibName:@"LineInspector"];
if (self) {
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLineWell.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -87,7 +87,7 @@
[self registerForDraggedTypes:@[SKPasteboardTypeLineStyle]];
}
-- (id)initWithFrame:(NSRect)frame {
+- (instancetype)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
lineWidth = 1.0;
@@ -108,7 +108,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
lineWidth = [decoder decodeDoubleForKey:SKLineWellLineWidthKey];
Modified: trunk/SKLoupeController.h
===================================================================
--- trunk/SKLoupeController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLoupeController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -48,7 +48,7 @@
NSInteger level;
}
-- (id)initWithPDFView:(PDFView *)aPdfView;
+- (instancetype)initWithPDFView:(PDFView *)aPdfView;
@property (nonatomic) CGFloat magnification;
@property (nonatomic) NSInteger level;
Modified: trunk/SKLoupeController.m
===================================================================
--- trunk/SKLoupeController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKLoupeController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -65,7 +65,7 @@
@synthesize magnification, level;
-- (id)initWithPDFView:(PDFView *)aPdfView {
+- (instancetype)initWithPDFView:(PDFView *)aPdfView {
self = [super init];
if (self) {
pdfView = aPdfView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKMainWindowController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -228,7 +228,7 @@
+ (BOOL)automaticallyNotifiesObserversOfPageLabel { return NO; }
-- (id)init {
+- (instancetype)init {
self = [super initWithWindowNibName:@"MainWindow"];
if (self) {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
Modified: trunk/SKNavigationWindow.h
===================================================================
--- trunk/SKNavigationWindow.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNavigationWindow.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -42,7 +42,7 @@
@class SKPDFView, SKNavigationToolTipView, SKNavigationButton;
@interface SKHUDWindow : SKAnimatedBorderlessWindow
-- (id)initWithPDFView:(SKPDFView *)pdfView;
+- (instancetype)initWithPDFView:(SKPDFView *)pdfView;
- (void)showForWindow:(NSWindow *)window;
- (void)handleParentWindowDidResizeNotification:(NSNotification *)notification;
@end
@@ -74,7 +74,7 @@
@interface SKNavigationToolTipWindow : NSPanel {
NSView *view;
}
-@property (class, nonatomic, readonly) id sharedToolTipWindow;
+@property (class, nonatomic, readonly) SKNavigationToolTipWindow
*sharedToolTipWindow;
- (void)showToolTip:(NSString *)toolTip forView:(NSView *)aView;
@property (nonatomic, readonly) NSView *view;
@end
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNavigationWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -74,7 +74,7 @@
@implementation SKHUDWindow
-- (id)initWithPDFView:(SKPDFView *)pdfView {
+- (instancetype)initWithPDFView:(SKPDFView *)pdfView {
NSScreen *screen = [[pdfView window] screen] ?: [NSScreen mainScreen];
CGFloat width = 5 * BUTTON_WIDTH + 3 * SEP_WIDTH + 2 * BUTTON_MARGIN;
NSRect contentRect = NSMakeRect(NSMidX([screen frame]) - 0.5 * width,
NSMinY([screen frame]) + WINDOW_OFFSET, width, BUTTON_HEIGHT + 2 *
BUTTON_MARGIN);
@@ -148,7 +148,7 @@
@implementation SKNavigationWindow
-- (id)initWithPDFView:(SKPDFView *)pdfView {
+- (instancetype)initWithPDFView:(SKPDFView *)pdfView {
self = [super initWithPDFView:pdfView];
if (self) {
@@ -262,7 +262,7 @@
@implementation SKCursorStyleWindow
-- (id)initWithPDFView:(SKPDFView *)pdfView {
+- (instancetype)initWithPDFView:(SKPDFView *)pdfView {
self = [super initWithPDFView:pdfView];
if (self) {
@@ -429,7 +429,7 @@
@synthesize view;
-+ (id)sharedToolTipWindow {
++ (SKNavigationToolTipWindow *)sharedToolTipWindow {
static SKNavigationToolTipWindow *sharedToolTipWindow = nil;
if (sharedToolTipWindow == nil)
sharedToolTipWindow = [[self alloc] init];
@@ -436,7 +436,7 @@
return sharedToolTipWindow;
}
-- (id)init {
+- (instancetype)init {
self = [super initWithContentRect:NSZeroRect
styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES];
if (self) {
[self setBackgroundColor:[NSColor clearColor]];
@@ -486,7 +486,7 @@
@synthesize stringValue;
@dynamic attributedStringValue;
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
stringValue = nil;
@@ -494,7 +494,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
stringValue = [[decoder decodeObjectForKey:@"stringValue"] retain];
@@ -593,7 +593,7 @@
@synthesize path, alternatePath, toolTip, alternateToolTip;
-- (id)initTextCell:(NSString *)aString {
+- (instancetype)initTextCell:(NSString *)aString {
self = [super initTextCell:@""];
if (self) {
[self setBezelStyle:NSShadowlessSquareBezelStyle]; // this is
mainly to make it selectable
@@ -603,7 +603,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
toolTip = [[decoder decodeObjectForKey:@"toolTip"] retain];
@@ -622,7 +622,7 @@
[coder encodeObject:alternatePath forKey:@"alternatePath"];
}
-- (id)copyWithZone:(NSZone *)zone {
+- (instancetype)copyWithZone:(NSZone *)zone {
SKNavigationButtonCell *copy = [super copyWithZone:zone];
copy->toolTip = [toolTip retain];
copy->alternateToolTip = [alternateToolTip retain];
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteOutlineView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -80,7 +80,7 @@
return nil;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
NSMenu *menu = [NSMenu menu];
Modified: trunk/SKNotePrefs.h
===================================================================
--- trunk/SKNotePrefs.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNotePrefs.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -60,6 +60,6 @@
@property (nonatomic, retain) NSString *scriptingUserName;
@property (nonatomic, retain) NSDictionary *scriptingProperties;
-- (id)initWithType:(NSString *)aType;
+- (instancetype)initWithType:(NSString *)aType;
@end
Modified: trunk/SKNotePrefs.m
===================================================================
--- trunk/SKNotePrefs.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNotePrefs.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -82,7 +82,7 @@
propertyKeys = [dict copy];
}
-- (id)initWithType:(NSString *)aType {
+- (instancetype)initWithType:(NSString *)aType {
if (aType && [propertyKeys objectForKey:aType] == nil)
aType = [alternateTypeNames objectForKey:aType];
if (aType == nil) {
Modified: trunk/SKNoteText.h
===================================================================
--- trunk/SKNoteText.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteText.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
PDFAnnotation *note;
}
-- (id)initWithNote:(PDFAnnotation *)aNote;
+- (instancetype)initWithNote:(PDFAnnotation *)aNote;
@property (nonatomic, readonly) PDFAnnotation *note;
Modified: trunk/SKNoteText.m
===================================================================
--- trunk/SKNoteText.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteText.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -53,7 +53,7 @@
return keyPaths;
}
-- (id)initWithNote:(id)aNote {
+- (instancetype)initWithNote:(id)aNote {
self = [super init];
if (self) {
note = aNote;
Modified: trunk/SKNoteTextView.m
===================================================================
--- trunk/SKNoteTextView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteTextView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -48,7 +48,7 @@
@synthesize usesDefaultFontSize;
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
@@ -58,7 +58,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)coder {
+- (instancetype)initWithCoder:(NSCoder *)coder {
self = [super initWithCoder:coder];
if (self) {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
Modified: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteTypeSheetController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,7 +45,7 @@
id <SKNoteTypeSheetControllerDelegate> delegate;
}
-- (id)initIncludingWidgets:(BOOL)includeWidgets;
+- (instancetype)initIncludingWidgets:(BOOL)includeWidgets;
@property (nonatomic, assign) id <SKNoteTypeSheetControllerDelegate> delegate;
@property (nonatomic, readonly) NSArray *noteTypes;
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteTypeSheetController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -55,7 +55,7 @@
@synthesize delegate, noteTypeMenu;
@dynamic noteTypes;
-- (id)initIncludingWidgets:(BOOL)includeWidgets {
+- (instancetype)initIncludingWidgets:(BOOL)includeWidgets {
self = [super initWithWindowNibName:@"NoteTypeSheet"];
if (self) {
noteTypeMenu = [[NSMenu alloc] init];
@@ -75,7 +75,7 @@
return self;
}
-- (id)init {
+- (instancetype)init {
return [self initIncludingWidgets:NO];
}
Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteWindowController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -77,7 +77,7 @@
@property (nonatomic, readonly) PDFAnnotation *note;
@property (nonatomic) BOOL keepOnTop, forceOnTop, isNoteType;
-- (id)initWithNote:(PDFAnnotation *)aNote;
+- (instancetype)initWithNote:(PDFAnnotation *)aNote;
- (void)statusBarClicked:(id)sender;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNoteWindowController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -139,11 +139,11 @@
return temporaryDirectoryURL;
}
-- (id)init {
+- (instancetype)init {
return [self initWithNote:nil];
}
-- (id)initWithNote:(PDFAnnotation *)aNote {
+- (instancetype)initWithNote:(PDFAnnotation *)aNote {
self = [super initWithWindowNibName:@"NoteWindow"];
if (self) {
note = [aNote retain];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNotesDocument.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -103,7 +103,7 @@
@synthesize outlineView, statusBar, arrayController, searchField, notes,
pdfDocument, sourceFileURL;
@dynamic window, interactionMode;
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
notes = [[NSArray alloc] init];
Modified: trunk/SKNotesPanelController.h
===================================================================
--- trunk/SKNotesPanelController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNotesPanelController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -40,7 +40,7 @@
@interface SKNotesPanelController : NSWindowController <NSWindowDelegate>
-@property (class, nonatomic, readonly) id sharedController;
+@property (class, nonatomic, readonly) SKNotesPanelController
*sharedController;
@property (class, nonatomic, readonly) BOOL sharedControllerExists;
- (IBAction)addNote:(id)sender;
@end
Modified: trunk/SKNotesPanelController.m
===================================================================
--- trunk/SKNotesPanelController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNotesPanelController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
static SKNotesPanelController *sharedController = nil;
-+ (id)sharedController {
++ (SKNotesPanelController *)sharedController {
if (sharedController == nil)
sharedController = [[self alloc] init];
return sharedController;
@@ -54,7 +54,7 @@
return sharedController != nil;
}
-- (id)init {
+- (instancetype)init {
if (sharedController) NSLog(@"Attempt to allocate second instance of %@",
self);
return [super initWithWindowNibName:@"NotesPanel"];
}
Modified: trunk/SKNumberArrayFormatter.m
===================================================================
--- trunk/SKNumberArrayFormatter.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKNumberArrayFormatter.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -49,7 +49,7 @@
[numberFormatter setMinimum:[NSNumber numberWithDouble:0.0]];
}
- - (id)init {
+ - (instancetype)init {
self = [super init];
if (self)
[self commonInit];
@@ -56,7 +56,7 @@
return self;
}
- - (id)initWithCoder:(NSCoder *)aCoder {
+ - (instancetype)initWithCoder:(NSCoder *)aCoder {
self = [super initWithCoder:aCoder];
if (self)
[self commonInit];
@@ -63,7 +63,7 @@
return self;
}
-- (id)copyWithZone:(NSZone *)zone {
+- (instancetype)copyWithZone:(NSZone *)zone {
SKNumberArrayFormatter *copy = [super copyWithZone:zone];
copy->numberFormatter = [numberFormatter copyWithZone:zone];
return copy;
Modified: trunk/SKPDFSyncRecord.h
===================================================================
--- trunk/SKPDFSyncRecord.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPDFSyncRecord.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -54,6 +54,6 @@
@property (nonatomic, retain) NSString *file;
@property (nonatomic) NSInteger line;
-- (id)initWithRecordIndex:(NSInteger)aRecordIndex;
+- (instancetype)initWithRecordIndex:(NSInteger)aRecordIndex;
@end
Modified: trunk/SKPDFSyncRecord.m
===================================================================
--- trunk/SKPDFSyncRecord.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPDFSyncRecord.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,7 +45,7 @@
@synthesize recordIndex, pageIndex, point, file, line;
@dynamic x, y;
-- (id)initWithRecordIndex:(NSInteger)aRecordIndex {
+- (instancetype)initWithRecordIndex:(NSInteger)aRecordIndex {
self = [super init];
if (self) {
recordIndex = aRecordIndex;
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPDFSynchronizer.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -66,7 +66,7 @@
SKPDFSynchronizerTexExtensions = [[NSArray alloc] initWithObjects:@"tex",
@"ltx", @"latex", @"ctx", @"lyx", @"rnw", nil];
}
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
queue = NULL;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPDFView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -337,7 +337,7 @@
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKeys:[[self class] defaultKeysToObserve]
context:&SKPDFViewDefaultsObservationContext];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonInitialization];
@@ -345,7 +345,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self commonInitialization];
Modified: trunk/SKPreferenceController.h
===================================================================
--- trunk/SKPreferenceController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPreferenceController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -53,7 +53,7 @@
@property (nonatomic, retain) IBOutlet NSButton *resetButton, *resetAllButton;
-@property (class, nonatomic, readonly) id sharedPrefenceController;
+@property (class, nonatomic, readonly) SKPreferenceController
*sharedPrefenceController;
- (IBAction)resetAll:(id)sender;
- (IBAction)resetCurrent:(id)sender;
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKPreferenceController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -73,17 +73,17 @@
static SKPreferenceController *sharedPrefenceController = nil;
-+ (id)sharedPrefenceController {
++ (SKPreferenceController *)sharedPrefenceController {
if (sharedPrefenceController == nil)
[[[self alloc] init] autorelease];
return sharedPrefenceController;
}
-+ (id)allocWithZone:(NSZone *)zone {
++ (instancetype)allocWithZone:(NSZone *)zone {
return [sharedPrefenceController retain] ?: [super allocWithZone:zone];
}
-- (id)init {
+- (instancetype)init {
if (sharedPrefenceController == nil) {
self = [super initWithWindowNibName:@"PreferenceWindow"];
if (self) {
Modified: trunk/SKPresentationOptionsSheetController.h
===================================================================
--- trunk/SKPresentationOptionsSheetController.h 2023-11-26 00:16:38 UTC
(rev 13813)
+++ trunk/SKPresentationOptionsSheetController.h 2023-11-29 16:35:30 UTC
(rev 13814)
@@ -75,7 +75,7 @@
@property (nonatomic, readonly) SKScroller *verticalScroller;
@property (nonatomic, readonly) NSUndoManager *undoManager;
-- (id)initForController:(SKMainWindowController *)aController;
+- (instancetype)initForController:(SKMainWindowController *)aController;
- (void)startObservingTransitions:(NSArray *)infos;
- (void)stopObservingTransitions:(NSArray *)infos;
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2023-11-26 00:16:38 UTC
(rev 13813)
+++ trunk/SKPresentationOptionsSheetController.m 2023-11-29 16:35:30 UTC
(rev 13814)
@@ -91,7 +91,7 @@
return keyPaths;
}
-- (id)initForController:(SKMainWindowController *)aController {
+- (instancetype)initForController:(SKMainWindowController *)aController {
self = [super init];
if (self) {
controller = aController;
Modified: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKReadingBar.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -59,7 +59,7 @@
@property (readonly) NSRect currentBounds;
@property (nonatomic, assign) id <SKReadingBarDelegate> delegate;
-- (id)initWithPage:(PDFPage *)aPage line:(NSInteger)line delegate:(id
<SKReadingBarDelegate>)aDelegate;
+- (instancetype)initWithPage:(PDFPage *)aPage line:(NSInteger)line
delegate:(id <SKReadingBarDelegate>)aDelegate;
- (BOOL)goToNextLine;
- (BOOL)goToPreviousLine;
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKReadingBar.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -61,7 +61,7 @@
@synthesize page, currentLine, numberOfLines, currentBounds, delegate;
@dynamic maxLine, boundsAsQDRect;
-- (id)initWithPage:(PDFPage *)aPage line:(NSInteger)line delegate:(id
<SKReadingBarDelegate>)aDelegate {
+- (instancetype)initWithPage:(PDFPage *)aPage line:(NSInteger)line
delegate:(id <SKReadingBarDelegate>)aDelegate {
self = [super init];
if (self) {
numberOfLines = MAX(1, [[NSUserDefaults standardUserDefaults]
integerForKey:SKReadingBarNumberOfLinesKey]);
@@ -110,7 +110,7 @@
return self;
}
-- (id)init {
+- (instancetype)init {
return [self initWithPage:nil line:-1 delegate:nil];
}
Modified: trunk/SKRecentDocumentInfo.h
===================================================================
--- trunk/SKRecentDocumentInfo.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKRecentDocumentInfo.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -46,8 +46,8 @@
NSArray *snapshots;
}
-- (id)initWithProperties:(NSDictionary *)properties;
-- (id)initWithURL:(NSURL *)fileURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots;
+- (instancetype)initWithProperties:(NSDictionary *)properties;
+- (instancetype)initWithURL:(NSURL *)fileURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots;
@property (nonatomic, readonly) NSURL *fileURL;
@property (nonatomic, readonly) NSUInteger pageIndex;
Modified: trunk/SKRecentDocumentInfo.m
===================================================================
--- trunk/SKRecentDocumentInfo.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKRecentDocumentInfo.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -49,7 +49,7 @@
@synthesize pageIndex, snapshots;
@dynamic fileURL, properties;
-- (id)initWithProperties:(NSDictionary *)properties {
+- (instancetype)initWithProperties:(NSDictionary *)properties {
self = [super init];
if (self) {
NSNumber *pageNumber = [properties objectForKey:PAGEINDEX_KEY];
@@ -64,7 +64,7 @@
return self;
}
-- (id)initWithURL:(NSURL *)fileURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots {
+- (instancetype)initWithURL:(NSURL *)fileURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots {
self = [super init];
if (self) {
alias = [[SKAlias alloc] initWithURL:fileURL];
Modified: trunk/SKReleaseNotesController.h
===================================================================
--- trunk/SKReleaseNotesController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKReleaseNotesController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,6 +44,6 @@
@property (nonatomic, retain) IBOutlet NSTextView *textView;
-@property (class, nonatomic, readonly) id sharedReleaseNotesController;
+@property (class, nonatomic, readonly) SKReleaseNotesController
*sharedReleaseNotesController;
@end
Modified: trunk/SKReleaseNotesController.m
===================================================================
--- trunk/SKReleaseNotesController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKReleaseNotesController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,13 +45,13 @@
static SKReleaseNotesController *sharedReleaseNotesController = nil;
-+ (id)sharedReleaseNotesController {
++ (SKReleaseNotesController *)sharedReleaseNotesController {
if (sharedReleaseNotesController == nil)
sharedReleaseNotesController = [[self alloc] init];
return sharedReleaseNotesController;
}
-- (id)init {
+- (instancetype)init {
if (sharedReleaseNotesController) NSLog(@"Attempt to allocate second
instance of %@", [self class]);
return [super initWithWindowNibName:@"ReleaseNotes"];
}
Modified: trunk/SKScriptMenu.m
===================================================================
--- trunk/SKScriptMenu.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKScriptMenu.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -58,7 +58,7 @@
@property (nonatomic, readonly) NSMenu *scriptMenu;
@property (nonatomic) BOOL menuNeedsUpdate;
-@property (class, nonatomic, readonly) id sharedController;
+@property (class, nonatomic, readonly) SKScriptMenuController
*sharedController;
- (void)handleApplicationWillTerminateNotification:(NSNotification
*)notification;
- (NSArray *)directoryContentsAtURL:(NSURL *)url
recursionDepth:(NSInteger)depth;
@@ -70,7 +70,7 @@
@synthesize scriptMenu, menuNeedsUpdate;
-+ (id)sharedController {
++ (SKScriptMenuController *)sharedController {
static SKScriptMenuController *sharedController = nil;
if (sharedController == nil)
sharedController = [[self alloc] init];
@@ -81,7 +81,7 @@
[(id)clientCallBackInfo setMenuNeedsUpdate:YES];
}
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSecondaryPDFView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -104,7 +104,7 @@
name:PDFViewScaleChangedNotification object:self];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonInitialization];
@@ -112,7 +112,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self commonInitialization];
Modified: trunk/SKShareMenuController.h
===================================================================
--- trunk/SKShareMenuController.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKShareMenuController.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -43,7 +43,7 @@
NSDocument *document;
}
-- (id)initForDocument:(NSDocument *)aDocument;
+- (instancetype)initForDocument:(NSDocument *)aDocument;
@property (nonatomic, assign) NSDocument *document;
Modified: trunk/SKShareMenuController.m
===================================================================
--- trunk/SKShareMenuController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKShareMenuController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -46,7 +46,7 @@
@synthesize document;
-- (id)initForDocument:(NSDocument *)aDocument {
+- (instancetype)initForDocument:(NSDocument *)aDocument {
self = [super init];
if (self) {
document = aDocument;
@@ -54,7 +54,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)coder {
+- (instancetype)initWithCoder:(NSCoder *)coder {
[self release];
return nil;
}
Modified: trunk/SKSideWindow.h
===================================================================
--- trunk/SKSideWindow.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSideWindow.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,7 +45,7 @@
BOOL resizing;
}
-- (id)initWithView:(NSView *)view;
+- (instancetype)initWithView:(NSView *)view;
- (void)attachToWindow:(NSWindow *)window;
- (void)remove;
- (void)resizeWithEvent:(NSEvent *)theEvent;
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSideWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -69,7 +69,7 @@
[contentView setMaskImage:mask];
}
-- (id)initWithView:(NSView *)view {
+- (instancetype)initWithView:(NSView *)view {
self = [super initWithContentRect:NSMakeRect(0.0, 0.0,
DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT)
styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
if (self) {
[self setBackgroundColor:[NSColor clearColor]];
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSnapshotPDFView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -109,7 +109,7 @@
name:PDFViewScaleChangedNotification object:self];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonInitialization];
@@ -117,7 +117,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self commonInitialization];
Modified: trunk/SKSnapshotWindow.m
===================================================================
--- trunk/SKSnapshotWindow.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSnapshotWindow.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -51,7 +51,7 @@
@synthesize windowControllerMiniaturizesWindow;
@dynamic windowImage;
-- (id)initWithContentRect:(NSRect)contentRect
styleMask:(NSWindowStyleMask)styleMask
backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation {
+- (instancetype)initWithContentRect:(NSRect)contentRect
styleMask:(NSWindowStyleMask)styleMask
backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation {
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:bufferingType defer:deferCreation];
if (self) {
windowControllerMiniaturizesWindow = YES;
Modified: trunk/SKStatusBar.m
===================================================================
--- trunk/SKStatusBar.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKStatusBar.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -65,7 +65,7 @@
@synthesize animating, leftField, rightField, progressIndicator;
@dynamic visible, icon, progressIndicatorStyle;
-- (id)initWithFrame:(NSRect)frame {
+- (instancetype)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
leftField = [[SKStatusTextField alloc] init];
@@ -109,7 +109,7 @@
[super dealloc];
}
-- (id)initWithCoder:(NSCoder *)decoder {
+- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
leftField = [[decoder decodeObjectForKey:@"leftField"] retain];
@@ -347,7 +347,7 @@
+ (Class)cellClass { return [SKStatusTextFieldCell class]; }
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect:[self
bounds] options:NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp |
NSTrackingInVisibleRect owner:self userInfo:nil];
Modified: trunk/SKSyncDot.h
===================================================================
--- trunk/SKSyncDot.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSyncDot.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -57,7 +57,7 @@
@property (nonatomic, readonly) NSRect bounds;
@property (nonatomic) BOOL shouldHideReadingBar;
-- (id)initWithPoint:(NSPoint)aPoint page:(PDFPage *)aPage
updateHandler:(SKSyncDotUpdateBlock)aHandler;
+- (instancetype)initWithPoint:(NSPoint)aPoint page:(PDFPage *)aPage
updateHandler:(SKSyncDotUpdateBlock)aHandler;
- (void)invalidate;
Modified: trunk/SKSyncDot.m
===================================================================
--- trunk/SKSyncDot.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKSyncDot.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -52,7 +52,7 @@
@synthesize point, page, shouldHideReadingBar;
@dynamic bounds;
-- (id)initWithPoint:(NSPoint)aPoint page:(PDFPage *)aPage
updateHandler:(SKSyncDotUpdateBlock)aHandler {
+- (instancetype)initWithPoint:(NSPoint)aPoint page:(PDFPage *)aPage
updateHandler:(SKSyncDotUpdateBlock)aHandler {
self = [super init];
if (self) {
point = aPoint;
Modified: trunk/SKTemplateManager.h
===================================================================
--- trunk/SKTemplateManager.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTemplateManager.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
NSMutableDictionary *templateFileNames;
}
-@property (class, nonatomic, readonly) id sharedManager;
+@property (class, nonatomic, readonly) SKTemplateManager *sharedManager;
@property (nonatomic, readonly) NSArray *customTemplateTypes;
Modified: trunk/SKTemplateManager.m
===================================================================
--- trunk/SKTemplateManager.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTemplateManager.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -48,7 +48,7 @@
@dynamic customTemplateTypes;
-+ (id)sharedManager {
++ (SKTemplateManager *)sharedManager {
static id sharedManager = nil;
if (sharedManager == nil)
sharedManager = [[self alloc] init];
@@ -55,7 +55,7 @@
return sharedManager;
}
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
templateFileNames = [[NSMutableDictionary alloc]
initWithObjectsAndKeys:@"notesTemplate.txt", SKNotesTextDocumentType,
@"notesTemplate.rtf", SKNotesRTFDocumentType, @"notesTemplate.rtfd",
SKNotesRTFDDocumentType, nil];
Modified: trunk/SKTemplateTag.h
===================================================================
--- trunk/SKTemplateTag.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTemplateTag.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -71,7 +71,7 @@
NSString *keyPath;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath;
@property (nonatomic, readonly) NSString *keyPath;
@@ -84,7 +84,7 @@
SKAttributeTemplate *linkTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes;
@property (nonatomic, readonly) NSDictionary *attributes;
@property (nonatomic, readonly) SKAttributeTemplate *linkTemplate;
@@ -100,7 +100,7 @@
NSArray *separatorTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath itemTemplateString:(NSString
*)anItemTemplateString separatorTemplateString:(NSString
*)aSeparatorTemplateString;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateString:(NSString *)anItemTemplateString
separatorTemplateString:(NSString *)aSeparatorTemplateString;
@property (nonatomic, readonly) NSArray *itemTemplate, *separatorTemplate;
@@ -115,7 +115,7 @@
NSArray *separatorTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString;
@property (nonatomic, readonly) NSArray *itemTemplate, *separatorTemplate;
@@ -129,7 +129,7 @@
NSArray *matchStrings;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath
matchType:(SKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
matchType:(SKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates;
@property (nonatomic, readonly) SKTemplateTagMatchType matchType;
@property (nonatomic, readonly) NSArray *matchStrings;
@@ -150,7 +150,7 @@
NSString *text;
}
-- (id)initWithText:(NSString *)aText;
+- (instancetype)initWithText:(NSString *)aText;
@property (nonatomic, retain) NSString *text;
@@ -165,7 +165,7 @@
NSArray *linkTemplates;
}
-- (id)initWithAttributedText:(NSAttributedString *)anAttributedText;
+- (instancetype)initWithAttributedText:(NSAttributedString *)anAttributedText;
@property (nonatomic, retain) NSAttributedString *attributedText;
@@ -183,7 +183,7 @@
Class attributeClass;
}
-- (id)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass;
+- (instancetype)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass;
@property (nonatomic, readonly) NSArray *template;
@property (nonatomic, readonly) NSRange range;
Modified: trunk/SKTemplateTag.m
===================================================================
--- trunk/SKTemplateTag.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTemplateTag.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -80,7 +80,7 @@
@synthesize keyPath;
-- (id)initWithKeyPath:(NSString *)aKeyPath {
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath {
self = [super init];
if (self) {
keyPath = [aKeyPath copy];
@@ -103,7 +103,7 @@
@synthesize attributes;
-- (id)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes {
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes {
self = [super initWithKeyPath:aKeyPath];
if (self) {
attributes = [anAttributes copy];
@@ -131,7 +131,7 @@
@dynamic itemTemplate, separatorTemplate;
-- (id)initWithKeyPath:(NSString *)aKeyPath itemTemplateString:(NSString
*)anItemTemplateString separatorTemplateString:(NSString
*)aSeparatorTemplateString {
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateString:(NSString *)anItemTemplateString
separatorTemplateString:(NSString *)aSeparatorTemplateString {
self = [super initWithKeyPath:aKeyPath];
if (self) {
itemTemplateString = [anItemTemplateString retain];
@@ -172,7 +172,7 @@
@dynamic itemTemplate, separatorTemplate;
-- (id)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString {
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString {
self = [super initWithKeyPath:aKeyPath];
if (self) {
itemTemplateAttributedString = [anItemTemplateAttributedString retain];
@@ -213,7 +213,7 @@
@synthesize matchType, matchStrings;
-- (id)initWithKeyPath:(NSString *)aKeyPath
matchType:(SKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates {
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
matchType:(SKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates {
self = [super initWithKeyPath:aKeyPath];
if (self) {
matchType = aMatchType;
@@ -267,7 +267,7 @@
@synthesize text;
-- (id)initWithText:(NSString *)aText {
+- (instancetype)initWithText:(NSString *)aText {
self = [super init];
if (self) {
text = [aText retain];
@@ -295,7 +295,7 @@
@synthesize attributedText;
@dynamic linkTemplates;
-- (id)initWithAttributedText:(NSAttributedString *)anAttributedText {
+- (instancetype)initWithAttributedText:(NSAttributedString *)anAttributedText {
self = [super init];
if (self) {
attributedText = [anAttributedText retain];
@@ -333,7 +333,7 @@
@synthesize range, template, attributeClass;
-- (id)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass {
+- (instancetype)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass {
self = [super init];
if (self) {
template = [aTemplate copy];
@@ -343,7 +343,7 @@
return self;
}
-- (id)init {
+- (instancetype)init {
return [self initWithTemplate:nil range:NSMakeRange(0, 0)
attributeClass:NULL];
}
Modified: trunk/SKTemporaryData.m
===================================================================
--- trunk/SKTemporaryData.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTemporaryData.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -43,7 +43,7 @@
@synthesize pdfDocument, noteDicts, presentationOptions, openMetaTags,
openMetaRating;
-- (id)init {
+- (instancetype)init {
self = [super init];
if (self) {
pdfDocument = nil;
Modified: trunk/SKTextNoteEditor.h
===================================================================
--- trunk/SKTextNoteEditor.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTextNoteEditor.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -47,7 +47,7 @@
NSUndoManager *undoManager;
}
-- (id)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation
*)anAnnotation;
+- (instancetype)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation
*)anAnnotation;
@property (nonatomic, readonly) NSString *currentString;
Modified: trunk/SKTextNoteEditor.m
===================================================================
--- trunk/SKTextNoteEditor.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTextNoteEditor.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -61,7 +61,7 @@
return @[SKNPDFAnnotationBoundsKey, SKNPDFAnnotationFontKey,
SKNPDFAnnotationFontColorKey, SKNPDFAnnotationAlignmentKey,
SKNPDFAnnotationColorKey, SKNPDFAnnotationBorderKey, SKNPDFAnnotationStringKey];
}
-- (id)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation
*)anAnnotation {
+- (instancetype)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation
*)anAnnotation {
self = [super initWithFrame:[annotation bounds]];
if (self) {
pdfView = aPDFView;
@@ -311,7 +311,7 @@
@implementation SKTextNoteTextView
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
Modified: trunk/SKThumbnail.h
===================================================================
--- trunk/SKThumbnail.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKThumbnail.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -60,7 +60,7 @@
@property (nonatomic, readonly) NSSize size;
@property (nonatomic, readonly) PDFPage *page;
-- (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel
pageIndex:(NSUInteger)anIndex;
+- (instancetype)initWithImage:(NSImage *)anImage label:(NSString *)aLabel
pageIndex:(NSUInteger)anIndex;
- (void)dirtyIfNeeded;
Modified: trunk/SKThumbnail.m
===================================================================
--- trunk/SKThumbnail.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKThumbnail.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -44,7 +44,7 @@
@synthesize delegate, dirty, image, label, pageIndex;
@dynamic size, page;
-- (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel
pageIndex:(NSUInteger)anIndex {
+- (instancetype)initWithImage:(NSImage *)anImage label:(NSString *)aLabel
pageIndex:(NSUInteger)anIndex {
self = [super init];
if (self) {
image = [anImage retain];
Modified: trunk/SKThumbnailImageView.m
===================================================================
--- trunk/SKThumbnailImageView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKThumbnailImageView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -58,7 +58,7 @@
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKeys:defaultKeysToObserve()
context:&SKThumbnailImageViewDefaultsObservationContext];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonInit];
@@ -66,7 +66,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)coder {
+- (instancetype)initWithCoder:(NSCoder *)coder {
self = [super initWithCoder:coder];
if (self) {
[self commonInit];
Modified: trunk/SKThumbnailItem.m
===================================================================
--- trunk/SKThumbnailItem.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKThumbnailItem.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -45,7 +45,7 @@
@synthesize backgroundStyle, highlightLevel, marked;
-- (id)copyWithZone:(NSZone *)zone {
+- (instancetype)copyWithZone:(NSZone *)zone {
SKThumbnailItem *copy = [super copyWithZone:zone];
[copy setBackgroundStyle:[self backgroundStyle]];
[copy setHighlightLevel:[self highlightLevel]];
Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKThumbnailView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -95,7 +95,7 @@
[self addSubview:labelView];
}
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self) {
[self commonInit];
@@ -103,7 +103,7 @@
return self;
}
-- (id)initWithCoder:(NSCoder *)coder {
+- (instancetype)initWithCoder:(NSCoder *)coder {
self = [super initWithCoder:coder];
if (self) {
[[[[self subviews] copy] autorelease]
makeObjectsPerformSelector:@selector(removeFromSuperview)];
Modified: trunk/SKTopBarView.m
===================================================================
--- trunk/SKTopBarView.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTopBarView.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -57,7 +57,7 @@
@synthesize style, drawsBackground;
-- (id)initWithFrame:(NSRect)frame {
+- (instancetype)initWithFrame:(NSRect)frame {
wantsSubviews = YES;
self = [super initWithFrame:frame];
if (self) {
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTransitionController.m 2023-11-29 16:35:30 UTC (rev 13814)
@@ -595,7 +595,7 @@
@synthesize image, extent, filter;
@dynamic progress;
-- (id)initWithFrame:(NSRect)frameRect {
+- (instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if (self && [MTKView class]) {
id<MTLDevice> device = MTLCreateSystemDefaultDevice();
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2023-11-26 00:16:38 UTC (rev 13813)
+++ trunk/SKTransitionInfo.h 2023-11-29 16:35:30 UTC (rev 13814)
@@ -51,7 +51,7 @@
BOOL shouldRestrict;
}
-- (id)initWithProperties:(NSDictionary *)properies;
+- (instancetype)initWithProperties:(NSDictionary *)properies;
@property (nonatomic, copy) NSDictionary *properties;
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
