Revision: 13909
http://sourceforge.net/p/skim-app/code/13909
Author: hofman
Date: 2023-12-17 14:38:46 +0000 (Sun, 17 Dec 2023)
Log Message:
-----------
Add nullability qualifiers to headers
Modified Paths:
--------------
trunk/NSArray_SKExtensions.h
trunk/NSAttributedString_SKExtensions.h
trunk/NSBezierPath_SKExtensions.h
trunk/NSBitmapImageRep_SKExtensions.h
trunk/NSCharacterSet_SKExtensions.h
trunk/NSColor_SKExtensions.h
trunk/NSCursor_SKExtensions.h
trunk/NSData_SKExtensions.h
trunk/NSDate_SKExtensions.h
trunk/NSDocument_SKExtensions.h
trunk/NSError_SKExtensions.h
trunk/NSEvent_SKExtensions.h
trunk/NSFileManager_SKExtensions.h
trunk/NSFont_SKExtensions.h
trunk/NSGeometry_SKExtensions.h
trunk/NSGraphics_SKExtensions.h
trunk/NSImage_SKExtensions.h
trunk/NSInvocation_SKExtensions.h
trunk/NSMenu_SKExtensions.h
trunk/NSNumber_SKExtensions.h
trunk/NSObject_SKExtensions.h
trunk/NSParagraphStyle_SKExtensions.h
trunk/NSPasteboard_SKExtensions.h
trunk/NSPointerArray_SKExtensions.h
trunk/NSPointerFunctions_SKExtensions.h
trunk/NSResponder_SKExtensions.h
trunk/NSScanner_SKExtensions.h
trunk/NSScreen_SKExtensions.h
trunk/NSScriptCommand_SKExtensions.h
trunk/NSScroller_SKExtensions.h
trunk/NSSegmentedControl_SKExtensions.h
trunk/NSShadow_SKExtensions.h
trunk/NSString_SKExtensions.h
trunk/NSURL_SKExtensions.h
trunk/NSUserDefaults_SKExtensions.h
trunk/NSValueTransformer_SKExtensions.h
trunk/NSValue_SKExtensions.h
trunk/NSView_SKExtensions.h
trunk/NSWindowController_SKExtensions.h
trunk/NSWindow_SKExtensions.h
trunk/PDFAnnotationButtonWidget_SKExtensions.h
trunk/PDFAnnotationChoiceWidget_SKExtensions.h
trunk/PDFAnnotationCircle_SKExtensions.h
trunk/PDFAnnotationFreeText_SKExtensions.h
trunk/PDFAnnotationInk_SKExtensions.h
trunk/PDFAnnotationLine_SKExtensions.h
trunk/PDFAnnotationLink_SKExtensions.h
trunk/PDFAnnotationMarkup_SKExtensions.h
trunk/PDFAnnotationSquare_SKExtensions.h
trunk/PDFAnnotationTextWidget_SKExtensions.h
trunk/PDFAnnotationText_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFDestination_SKExtensions.h
trunk/PDFDocumentView_SKExtensions.h
trunk/PDFDocument_SKExtensions.h
trunk/PDFOutline_SKExtensions.h
trunk/PDFPage_SKExtensions.h
trunk/PDFSelection_SKExtensions.h
trunk/SKAlias.h
trunk/SKAnimatedBorderlessWindow.h
trunk/SKAnnotationTypeImageCell.h
trunk/SKAnnotationTypeImageView.h
trunk/SKApplication.h
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKAttachmentEmailer.h
trunk/SKBasePDFView.h
trunk/SKBookmark.h
trunk/SKBookmarkController.h
trunk/SKBookmarkSheetController.h
trunk/SKChainedUndoManager.h
trunk/SKColorCell.h
trunk/SKColorList.h
trunk/SKColorMenuView.h
trunk/SKColorPicker.h
trunk/SKColorSwatch.h
trunk/SKControlTableCellView.h
trunk/SKConversionProgressController.h
trunk/SKDisplayPreferences.h
trunk/SKDisplayPrefs.h
trunk/SKDocumentController.h
trunk/SKDownload.h
trunk/SKDownloadController.h
trunk/SKDownloadPreferenceController.h
trunk/SKDragImageView.h
trunk/SKExportAccessoryController.h
trunk/SKFDFParser.h
trunk/SKFileShare.h
trunk/SKFileUpdateChecker.h
trunk/SKFindController.h
trunk/SKFontWell.h
trunk/SKFullScreenWindow.h
trunk/SKGeneralPreferences.h
trunk/SKGroupedSearchResult.h
trunk/SKHighlightingTableRowView.h
trunk/SKImageToolTipContext.h
trunk/SKImageToolTipWindow.h
trunk/SKInfoWindowController.h
trunk/SKKeychain.h
trunk/SKLeftSideViewController.h
trunk/SKLine.h
trunk/SKLineInspector.h
trunk/SKLineWell.h
trunk/SKLoupeController.h
trunk/SKMainDocument.h
trunk/SKMainToolbarController.h
trunk/SKMainTouchBarController.h
trunk/SKMainWindow.h
trunk/SKMainWindowController.h
trunk/SKMainWindowController_Actions.h
trunk/SKMainWindowController_FullScreen.h
trunk/SKMainWindowController_UI.h
trunk/SKNPDFAnnotationNote_SKExtensions.h
trunk/SKNavigationWindow.h
trunk/SKNoteOutlineView.h
trunk/SKNotePrefs.h
trunk/SKNoteText.h
trunk/SKNoteTextView.h
trunk/SKNoteTypeSheetController.h
trunk/SKNoteWindowController.h
trunk/SKNotesDocument.h
trunk/SKNotesPanelController.h
trunk/SKNotesPreferences.h
trunk/SKOutlineView.h
trunk/SKOverviewView.h
trunk/SKPDFDocument.h
trunk/SKPDFSyncRecord.h
trunk/SKPDFSynchronizer.h
trunk/SKPDFView.h
trunk/SKPreferenceController.h
trunk/SKPresentationOptionsSheetController.h
trunk/SKPrintAccessoryController.h
trunk/SKProgressController.h
trunk/SKProgressTableCellView.h
trunk/SKReadingBar.h
trunk/SKRecentDocumentInfo.h
trunk/SKReleaseNotesController.h
trunk/SKRightSideViewController.h
trunk/SKRuntime.h
trunk/SKScriptMenu.h
trunk/SKScrollView.h
trunk/SKSecondaryPDFView.h
trunk/SKShareMenuController.h
trunk/SKSideViewController.h
trunk/SKSideWindow.h
trunk/SKSnapshotPDFView.h
trunk/SKSnapshotWindow.h
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
trunk/SKSplitView.h
trunk/SKStatusBar.h
trunk/SKStringConstants.h
trunk/SKSyncDot.h
trunk/SKSyncPreferences.h
trunk/SKTableView.h
trunk/SKTemplateManager.h
trunk/SKTemplateParser.h
trunk/SKTemplateTag.h
trunk/SKTemporaryData.h
trunk/SKTextFieldSheetController.h
trunk/SKTextNoteEditor.h
trunk/SKThumbnail.h
trunk/SKThumbnailItem.h
trunk/SKThumbnailView.h
trunk/SKToolbarItem.h
trunk/SKTopBarView.h
trunk/SKTransitionController.h
trunk/SKTransitionInfo.h
trunk/SKTypeSelectHelper.h
trunk/SKVersionNumber.h
trunk/SKViewSettingsController.h
Modified: trunk/NSArray_SKExtensions.h
===================================================================
--- trunk/NSArray_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSArray_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSArray (SKExtensions)
@@ -53,3 +54,5 @@
@property (nonatomic, readonly) NSArray *arraySortedByModificationDate;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSAttributedString_SKExtensions.h
===================================================================
--- trunk/NSAttributedString_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSAttributedString_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSAttributedString (SKExtensions)
@@ -73,3 +74,5 @@
@property (nonatomic, copy) id scriptingRTF;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSBezierPath_SKExtensions.h
===================================================================
--- trunk/NSBezierPath_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSBezierPath_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -37,10 +37,11 @@
*/
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSBezierPath (SKExtensions)
-@property (nonatomic, copy) NSArray *dashPattern;
+@property (nonatomic, nullable, copy) NSArray *dashPattern;
@property (nonatomic, readonly) NSRect nonEmptyBounds;
@@ -51,3 +52,5 @@
- (void)halfEllipseFromPoint:(NSPoint)halfwayPoint toPoint:(NSPoint)endPoint;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSBitmapImageRep_SKExtensions.h
===================================================================
--- trunk/NSBitmapImageRep_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSBitmapImageRep_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface NSBitmapImageRep (SKExtensions)
@property (nonatomic, readonly) NSRect foregroundRect;
@@ -47,3 +49,5 @@
+ (instancetype)imageRepWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSCharacterSet_SKExtensions.h
===================================================================
--- trunk/NSCharacterSet_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSCharacterSet_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSCharacterSet (SKExtensions)
@property (class, nonatomic, readonly) NSCharacterSet
*nonWhitespaceAndNewlineCharacterSet;
@@ -44,3 +45,5 @@
@property (class, nonatomic, readonly) NSCharacterSet
*URLBookmarkNameAllowedCharacterSet;
@property (class, nonatomic, readonly) NSCharacterSet
*URLGenericAllowedCharacterSet;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSColor_SKExtensions.h
===================================================================
--- trunk/NSColor_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSColor_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
enum {
SKScriptingColorRed = 'Red ',
SKScriptingColorGreen = 'Gren',
@@ -89,11 +91,13 @@
@property (nonatomic, readonly) NSColor *opaqueColor;
-+ (instancetype)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
++ (nullable
instancetype)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
@property (nonatomic, readonly) NSAppleEventDescriptor
*scriptingRgbaColorDescriptor;
-@property (nonatomic, readonly) NSString *accessibilityValue;
+@property (nonatomic, nullable, readonly) NSString *accessibilityValue;
-@property (nonatomic, readonly) NSString *hexString;
+@property (nonatomic, nullable, readonly) NSString *hexString;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSCursor_SKExtensions.h
===================================================================
--- trunk/NSCursor_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSCursor_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSCursor (SKExtensions)
@@ -63,3 +64,5 @@
+ (NSCursor *)safeLaserPointerCursorWithColor:(NSInteger)color;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSData_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -50,6 +50,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSData (SKExtensions)
@@ -73,3 +74,5 @@
@property (nonatomic, readonly) NSAppleEventDescriptor *scriptingRtfDescriptor;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSDate_SKExtensions.h
===================================================================
--- trunk/NSDate_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSDate_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface NSDate (SKExtensions)
@property (nonatomic, readonly) NSDate *fullDateFormat, *longDateFormat,
*mediumDateFormat, *shortDateFormat, *fullTimeFormat, *longTimeFormat,
*mediumTimeFormat, *shortTimeFormat;
@@ -44,3 +46,5 @@
@property (nonatomic, readonly) NSString *standardDescription, *PDFDescription;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSDocument_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKDocumentFileURLDidChangeNotification;
typedef NS_ENUM(NSInteger, SKInteractionMode) {
@@ -53,11 +55,11 @@
@property (nonatomic, readonly) SKInteractionMode systemInteractionMode;
-@property (nonatomic, readonly) NSWindow *mainWindow;
+@property (nonatomic, nullable, readonly) NSWindow *mainWindow;
-- (IBAction)copyURL:(id)sender;
+- (IBAction)copyURL:(nullable id)sender;
-@property (nonatomic, readonly) NSMenu *notesMenu;
+@property (nonatomic, nullable, readonly) NSMenu *notesMenu;
#pragma mark Document Setup
@@ -64,36 +66,36 @@
- (void)saveRecentDocumentInfo;
- (void)applySetup:(NSDictionary *)setup;
- (void)applyOptions:(NSDictionary *)options;
-@property (nonatomic, readonly) NSDictionary *currentDocumentSetup;
+@property (nonatomic, nullable, readonly) NSDictionary *currentDocumentSetup;
#pragma mark PDF Document
-@property (nonatomic, readonly) PDFDocument *pdfDocument;
-@property (nonatomic, readonly) PDFDocument *placeholderPdfDocument;
+@property (nonatomic, nullable, readonly) PDFDocument *pdfDocument;
+@property (nonatomic, nullable, readonly) PDFDocument *placeholderPdfDocument;
#pragma mark Bookmark Actions
-- (IBAction)addBookmark:(id)sender;
-- (IBAction)share:(id)sender;
+- (IBAction)addBookmark:(nullable id)sender;
+- (IBAction)share:(nullable id)sender;
#pragma mark Notes
- (BOOL)hasNotes;
-@property (nonatomic, readonly) NSArray *notes;
+@property (nonatomic, nullable, readonly) NSArray *notes;
-@property (nonatomic, readonly) NSArray *SkimNoteProperties;
+@property (nonatomic, nullable, readonly) NSArray *SkimNoteProperties;
-@property (nonatomic, readonly) NSData *notesData;
+@property (nonatomic, nullable, readonly) NSData *notesData;
-- (NSString *)notesStringForTemplateType:(NSString *)typeName;
-- (NSData *)notesDataForTemplateType:(NSString *)typeName;
-- (NSFileWrapper *)notesFileWrapperForTemplateType:(NSString *)typeName;
+- (nullable NSString *)notesStringForTemplateType:(NSString *)typeName;
+- (nullable NSData *)notesDataForTemplateType:(NSString *)typeName;
+- (nullable NSFileWrapper *)notesFileWrapperForTemplateType:(NSString
*)typeName;
@property (nonatomic, readonly) NSString *notesString;
@property (nonatomic, readonly) NSData *notesRTFData;
-- (NSData *)notesFDFDataForFile:(NSString *)filename fileIDStrings:(NSArray
*)fileIDStrings;
+- (nullable NSData *)notesFDFDataForFile:(NSString *)filename
fileIDStrings:(nullable NSArray *)fileIDStrings;
#pragma mark Outlines
@@ -102,7 +104,7 @@
#pragma mark Scripting
-- (NSArray *)pages;
+- (nullable NSArray *)pages;
- (NSUInteger)countOfPages;
- (PDFPage *)objectInPagesAtIndex:(NSUInteger)theIndex;
@@ -109,29 +111,31 @@
- (NSUInteger)countOfOutlines;
- (PDFOutline *)objectInOutlinesAtIndex:(NSUInteger)idx;
-@property (nonatomic, strong) PDFPage *currentPage;
-@property (nonatomic, readonly) NSData *currentQDPoint;
-@property (nonatomic, readonly) PDFAnnotation *activeNote;
-@property (nonatomic, readonly) NSTextStorage *richText;
-@property (nonatomic, readonly) id selectionSpecifier;
-@property (nonatomic, readonly) NSData *selectionQDRect;
-@property (nonatomic, readonly) id selectionPage;
-@property (nonatomic, strong) NSArray *noteSelection;
-@property (nonatomic, readonly) NSDictionary *pdfViewSettings;
-@property (nonatomic, readonly) NSDictionary *documentAttributes;
+@property (nonatomic, nullable, strong) PDFPage *currentPage;
+@property (nonatomic, nullable, readonly) NSData *currentQDPoint;
+@property (nonatomic, nullable, readonly) PDFAnnotation *activeNote;
+@property (nonatomic, nullable, readonly) NSTextStorage *richText;
+@property (nonatomic, nullable, readonly) id selectionSpecifier;
+@property (nonatomic, nullable, readonly) NSData *selectionQDRect;
+@property (nonatomic, nullable, readonly) id selectionPage;
+@property (nonatomic, nullable, strong) NSArray *noteSelection;
+@property (nonatomic, nullable, readonly) NSDictionary *pdfViewSettings;
+@property (nonatomic, nullable, readonly) NSDictionary *documentAttributes;
@property (nonatomic, readonly, getter=isPDFDocument) BOOL PDFDocument;
@property (nonatomic, readonly) NSInteger toolMode;
@property (nonatomic, readonly) NSInteger scriptingInteractionMode;
-@property (nonatomic, readonly) NSDocument *presentationNotesDocument;
+@property (nonatomic, nullable, readonly) NSDocument
*presentationNotesDocument;
@property (nonatomic, readonly) NSInteger presentationNotesOffset;
-@property (nonatomic, readonly) id readingBar;
+@property (nonatomic, nullable, readonly) id readingBar;
@property (nonatomic, readonly) BOOL hasReadingBar;
- (void)handleRevertScriptCommand:(NSScriptCommand *)command;
- (void)handleGoToScriptCommand:(NSScriptCommand *)command;
-- (id)handleFindScriptCommand:(NSScriptCommand *)command;
+- (nullable id)handleFindScriptCommand:(NSScriptCommand *)command;
- (void)handleShowTeXScriptCommand:(NSScriptCommand *)command;
- (void)handleConvertNotesScriptCommand:(NSScriptCommand *)command;
- (void)handleReadNotesScriptCommand:(NSScriptCommand *)command;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSError_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKDocumentErrorDomain;
enum {
@@ -50,15 +52,17 @@
@interface NSError (SKExtensions)
-+ (instancetype)writeFileErrorWithLocalizedDescription:(NSString *)description;
-+ (instancetype)readFileErrorWithLocalizedDescription:(NSString *)description;
-+ (instancetype)readPasteboardErrorWithLocalizedDescription:(NSString
*)description;
-+ (instancetype)userCancelledErrorWithUnderlyingError:(NSError *)error;
-+ (instancetype)printDocumentErrorWithLocalizedDescription:(NSString
*)description;
-+ (instancetype)failedToCommitErrorWithLocalizedDescription:(NSString
*)description;
++ (instancetype)writeFileErrorWithLocalizedDescription:(nullable NSString
*)description;
++ (instancetype)readFileErrorWithLocalizedDescription:(nullable NSString
*)description;
++ (instancetype)readPasteboardErrorWithLocalizedDescription:(nullable NSString
*)description;
++ (instancetype)userCancelledErrorWithUnderlyingError:(nullable NSError
*)error;
++ (instancetype)printDocumentErrorWithLocalizedDescription:(nullable NSString
*)description;
++ (instancetype)failedToCommitErrorWithLocalizedDescription:(nullable NSString
*)description;
-+ (NSError *)combineErrors:(NSArray *)errors maximum:(NSUInteger)max;
++ (nullable NSError *)combineErrors:(NSArray *)errors maximum:(NSUInteger)max;
- (BOOL)isUserCancelledError;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSEvent_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
enum {
SKSpaceCharacter = 0x0020,
SKEscapeCharacter = 0x001b
@@ -57,3 +59,5 @@
@property (nonatomic, readonly) NSPoint locationOnScreen;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSFileManager_SKExtensions.h
===================================================================
--- trunk/NSFileManager_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSFileManager_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSFileManager (SKExtensions)
@@ -46,3 +47,5 @@
@property (nonatomic, readonly) NSURL *uniqueChewableItemsDirectoryURL;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSFont_SKExtensions.h
===================================================================
--- trunk/NSFont_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSFont_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,7 +38,10 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSFont (SKExtensions)
@property (nonatomic, readonly) CGFloat defaultViewLineHeight;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSGeometry_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
typedef NS_OPTIONS(NSUInteger, SKRectEdges) {
SKNoEdgeMask = 0,
SKMinXEdgeMask = 1 << NSMinXEdge,
@@ -203,3 +205,5 @@
nsPoint.y = (CGFloat)qdPoint.v;
return nsPoint;
}
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSGraphics_SKExtensions.h
===================================================================
--- trunk/NSGraphics_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSGraphics_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,9 +38,11 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern BOOL SKHasDarkAppearance(void);
-extern void SKRunWithAppearance(id object, void (^code)(void));
+extern void SKRunWithAppearance(id _Nullable object, void (^ _Nullable
code)(void));
#pragma mark -
@@ -54,3 +56,5 @@
#pragma mark -
extern NSArray *SKColorEffectFilters(void);
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSImage_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKImageNameTextNote;
extern NSString *SKImageNameAnchoredNote;
extern NSString *SKImageNameCircleNote;
@@ -223,3 +225,5 @@
+ (void)makeImages;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSInvocation_SKExtensions.h
===================================================================
--- trunk/NSInvocation_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSInvocation_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,7 +38,10 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSInvocation (SKExtensions)
+ (instancetype)invocationWithTarget:(id)target selector:(SEL)selector;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSMenu_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,19 +38,20 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSMenu (SKExtensions)
@property (class, nonatomic, readonly) NSMenu *menu;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget atIndex:(NSInteger)anIndex;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget atIndex:(NSInteger)anIndex;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag atIndex:(NSInteger)anIndex;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag;
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag atIndex:(NSInteger)anIndex;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
- (NSMenuItem *)insertItemWithSubmenuAndTitle:(NSString *)aString
atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithSubmenuAndTitle:(NSString *)aString;
@@ -60,15 +61,17 @@
@interface NSMenuItem (SKExtensions)
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget;
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag;
++ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
++ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
+ (NSMenuItem *)menuItemWithSubmenuAndTitle:(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)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
+- (instancetype)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
+- (instancetype)initWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
- (instancetype)initWithSubmenuAndTitle:(NSString *)aString;
- (void)setImageAndSize:(NSImage *)image;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSNumber_SKExtensions.h
===================================================================
--- trunk/NSNumber_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSNumber_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSNumber (SKExtensions)
@@ -49,3 +50,5 @@
@property (nonatomic, readonly) NSString *greekCounterValue;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSObject_SKExtensions.h
===================================================================
--- trunk/NSObject_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSObject_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSObject (SKExtensions)
@@ -47,6 +48,8 @@
- (NSUInteger)countOfTexLines;
- (id)objectInTexLinesAtIndex:(NSUInteger)idx;
-- (id)handleFormatScriptCommand:(NSScriptCommand *)command;
+- (nullable id)handleFormatScriptCommand:(NSScriptCommand *)command;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSParagraphStyle_SKExtensions.h
===================================================================
--- trunk/NSParagraphStyle_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSParagraphStyle_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,8 +38,11 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSParagraphStyle (SKExtensions)
@property (class, nonatomic, readonly) NSParagraphStyle
*defaultClippingParagraphStyle;
@property (class, nonatomic, readonly) NSParagraphStyle
*defaultTruncatingTailParagraphStyle;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSPasteboard_SKExtensions.h
===================================================================
--- trunk/NSPasteboard_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSPasteboard_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,9 +38,12 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSPasteboard (SKExtensions)
-- (BOOL)writeURLs:(NSArray *)URLs names:(NSArray *)names;
+- (BOOL)writeURLs:(NSArray *)URLs names:(nullable NSArray *)names;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSPointerArray_SKExtensions.h
===================================================================
--- trunk/NSPointerArray_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSPointerArray_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSPointerArray (SKExtensions)
@@ -51,3 +52,5 @@
- (NSRange)rangeAtIndex:(NSUInteger)anIndex;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSPointerFunctions_SKExtensions.h
===================================================================
--- trunk/NSPointerFunctions_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSPointerFunctions_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSPointerFunctions (SKExtensions)
@@ -49,3 +50,5 @@
@property (class, nonatomic, readonly) NSPointerFunctions
*caseInsensitiveStringPointerFunctions;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSResponder_SKExtensions.h
===================================================================
--- trunk/NSResponder_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSResponder_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSResponder (SKExtensions)
- (BOOL)isDescendantOf:(NSView *)aView;
@@ -48,3 +49,5 @@
- (void)magnifyWheel:(NSEvent *)theEvent;
- (void)remoteButtonPressed:(NSEvent *)theEvent;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSScanner_SKExtensions.h
===================================================================
--- trunk/NSScanner_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSScanner_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,10 +38,13 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSScanner (SKExtensions)
-- (BOOL)scanCharacter:(unichar *)ch;
-- (BOOL)peekCharacter:(unichar *)ch;
+- (BOOL)scanCharacter:(unichar * _Nullable)ch;
+- (BOOL)peekCharacter:(unichar * _Nullable)ch;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSScreen_SKExtensions.h
===================================================================
--- trunk/NSScreen_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSScreen_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSScreen (SKExtensions)
@@ -50,3 +51,5 @@
@property (nonatomic, readonly) NSScreen *primaryScreen;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSScriptCommand_SKExtensions.h
===================================================================
--- trunk/NSScriptCommand_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSScriptCommand_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,12 +38,13 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSScriptCommand (SKExtensions)
-@property (nonatomic, readonly) NSScriptObjectSpecifier *subjectSpecifier;
-@property (nonatomic, readonly) id evaluatedSubjects;
+@property (nonatomic, nullable, readonly) NSScriptObjectSpecifier
*subjectSpecifier;
+@property (nonatomic, nullable, readonly) id evaluatedSubjects;
@end
-
+NS_ASSUME_NONNULL_END
Modified: trunk/NSScroller_SKExtensions.h
===================================================================
--- trunk/NSScroller_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSScroller_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,10 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface NSScroller (SKExtensions)
@property (class, nonatomic, readonly) CGFloat effectiveScrollerWidth;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSSegmentedControl_SKExtensions.h
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSSegmentedControl_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSSegmentedControl (SKExtensions)
@@ -46,3 +47,5 @@
- (void)setHelp:(NSString *)toolTip forSegment:(NSInteger)segment;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSShadow_SKExtensions.h
===================================================================
--- trunk/NSShadow_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSShadow_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSShadow (SKExtensions)
@@ -45,3 +46,5 @@
+ (void)setShadowWithWhite:(CGFloat)white alpha:(CGFloat)alpha
blurRadius:(CGFloat)blurRadius yOffset:(CGFloat)yOffset;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSString_SKExtensions.h
===================================================================
--- trunk/NSString_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSString_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSString (SKExtensions)
@@ -88,12 +89,14 @@
@property (nonatomic, readonly) NSString
*stringByPrependingFullStopAndSpaceIfNotEmpty;
@property (nonatomic, readonly) NSString *parenthesizedStringIfNotEmpty;
-@property (nonatomic, readonly) NSURL *url;
-@property (nonatomic, readonly) NSAttributedString *icon;
-@property (nonatomic, readonly) NSAttributedString *smallIcon;
+@property (nonatomic, nullable, readonly) NSURL *url;
+@property (nonatomic, nullable, readonly) NSAttributedString *icon;
+@property (nonatomic, nullable, readonly) NSAttributedString *smallIcon;
-@property (nonatomic, readonly) NSAttributedString *typeIcon;
+@property (nonatomic, nullable, readonly) NSAttributedString *typeIcon;
@property (nonatomic, readonly) NSString *xmlString;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSURL_SKExtensions.h
===================================================================
--- trunk/NSURL_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSURL_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,13 +38,14 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSURL (SKExtensions)
+ (BOOL)canReadURLFromPasteboard:(NSPasteboard *)pboard;
-+ (NSArray *)readURLsFromPasteboard:(NSPasteboard *)pboard;
++ (nullable NSArray *)readURLsFromPasteboard:(NSPasteboard *)pboard;
+ (BOOL)canReadFileURLFromPasteboard:(NSPasteboard *)pboard;
-+ (NSArray *)readFileURLsFromPasteboard:(NSPasteboard *)pboard;
++ (nullable NSArray *)readFileURLsFromPasteboard:(NSPasteboard *)pboard;
- (NSURL *)URLReplacingPathExtension:(NSString *)ext;
- (NSString *)lastPathComponentReplacingPathExtension:(NSString *)ext;
@@ -56,13 +57,15 @@
@property (nonatomic, readonly, getter=isSkimURL) BOOL skimURL;
@property (nonatomic, readonly, getter=isSkimFileURL) BOOL skimFileURL;
@property (nonatomic, readonly, getter=isSkimBookmarkURL) BOOL skimBookmarkURL;
-@property (nonatomic, readonly) NSURL *associatedFileURL;
+@property (nonatomic, nullable, readonly) NSURL *associatedFileURL;
-@property (nonatomic, readonly) NSAttributedString *icon;
-@property (nonatomic, readonly) NSAttributedString *smallIcon;
-@property (nonatomic, readonly) NSAttributedString *linkedIcon;
-@property (nonatomic, readonly) NSAttributedString *linkedSmallIcon;
-@property (nonatomic, readonly) NSAttributedString *linkedText;
-@property (nonatomic, readonly) NSAttributedString *linkedFileName;
+@property (nonatomic, nullable, readonly) NSAttributedString *icon;
+@property (nonatomic, nullable, readonly) NSAttributedString *smallIcon;
+@property (nonatomic, nullable, readonly) NSAttributedString *linkedIcon;
+@property (nonatomic, nullable, readonly) NSAttributedString *linkedSmallIcon;
+@property (nonatomic, nullable, readonly) NSAttributedString *linkedText;
+@property (nonatomic, nullable, readonly) NSAttributedString *linkedFileName;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSUserDefaults_SKExtensions.h
===================================================================
--- trunk/NSUserDefaults_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSUserDefaults_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,12 +38,14 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSUserDefaults (SKExtensions)
-- (NSColor *)colorForKey:(NSString *)key;
+- (nullable NSColor *)colorForKey:(NSString *)key;
- (void)setColor:(NSColor *)color forKey:(NSString *)key;
-- (NSFont *)fontForNameKey:(NSString *)nameKey sizeKey:(NSString *)sizeKey;
+- (nullable NSFont *)fontForNameKey:(NSString *)nameKey sizeKey:(NSString
*)sizeKey;
@end
+NS_ASSUME_NONNULL_END
Modified: trunk/NSValueTransformer_SKExtensions.h
===================================================================
--- trunk/NSValueTransformer_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSValueTransformer_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKUnarchiveColorTransformerName;
extern NSString *SKUnarchiveColorArrayTransformerName;
extern NSString *SKTypeImageTransformerName;
@@ -49,3 +51,5 @@
@interface NSValueTransformer (SKExtensions)
+ (void)registerCustomTransformers;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSValue_SKExtensions.h
===================================================================
--- trunk/NSValue_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSValue_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,14 +38,15 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSValue (SKExtensions)
-@property (nonatomic, readonly) NSString *rectString;
-@property (nonatomic, readonly) NSString *pointString;
-@property (nonatomic, readonly) NSString *originString;
-@property (nonatomic, readonly) NSString *sizeString;
-@property (nonatomic, readonly) NSString *midPointString;
+@property (nonatomic, nullable, readonly) NSString *rectString;
+@property (nonatomic, nullable, readonly) NSString *pointString;
+@property (nonatomic, nullable, readonly) NSString *originString;
+@property (nonatomic, nullable, readonly) NSString *sizeString;
+@property (nonatomic, nullable, readonly) NSString *midPointString;
@property (nonatomic, readonly) CGFloat rectX;
@property (nonatomic, readonly) CGFloat rectY;
@property (nonatomic, readonly) CGFloat rectWidth;
@@ -54,3 +55,5 @@
@property (nonatomic, readonly) CGFloat pointY;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSView_SKExtensions.h
===================================================================
--- trunk/NSView_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSView_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class SKFontWell;
@interface NSView (SKExtensions)
@@ -47,7 +49,7 @@
- (void)deactivateWellSubcontrols;
- (void)deactivateColorWellSubcontrols;
-@property (nonatomic, readonly) SKFontWell *activeFontWell;
+@property (nonatomic, nullable, readonly) SKFontWell *activeFontWell;
- (NSRect)convertRectToScreen:(NSRect)rect;
- (NSRect)convertRectFromScreen:(NSRect)rect;
@@ -58,10 +60,12 @@
- (void)activateConstraintsToSuperview;
-- (NSLayoutConstraint *)constraintWithFirstItem:(id)item
firstAttribute:(NSLayoutAttribute)attribute;
-- (NSLayoutConstraint *)constraintWithSecondItem:(id)item
secondAttribute:(NSLayoutAttribute)attribute;
+- (nullable NSLayoutConstraint *)constraintWithFirstItem:(id)item
firstAttribute:(NSLayoutAttribute)attribute;
+- (nullable NSLayoutConstraint *)constraintWithSecondItem:(id)item
secondAttribute:(NSLayoutAttribute)attribute;
@property (class, nonatomic, readonly) BOOL shouldShowSlideAnimation;
@property (class, nonatomic, readonly) BOOL shouldShowFadeAnimation;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSWindowController_SKExtensions.h
===================================================================
--- trunk/NSWindowController_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/NSWindowController_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSWindowController (SKExtensions)
@@ -45,8 +46,10 @@
@property (nonatomic, readonly, getter=isNoteWindowController) BOOL
noteWindowController;
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSModalResponse result))handler;
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void (^
_Nullable)(NSModalResponse result))handler;
-- (IBAction)dismissSheet:(id)sender;
+- (IBAction)dismissSheet:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/NSWindow_SKExtensions.h
===================================================================
--- trunk/NSWindow_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/NSWindow_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,12 +38,15 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface NSWindow (SKExtensions)
+ (void)addTabs:(NSArray *)tabInfos forWindows:(NSArray *)windows;
-- (NSString *)tabIndexesInWindows:(NSArray *)windows;
+- (nullable NSString *)tabIndexesInWindows:(NSArray *)windows;
- (void)handleRevertScriptCommand:(NSScriptCommand *)command;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationButtonWidget_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationButtonWidget_SKExtensions.h 2023-12-16 15:25:09 UTC
(rev 13908)
+++ trunk/PDFAnnotationButtonWidget_SKExtensions.h 2023-12-17 14:38:46 UTC
(rev 13909)
@@ -39,7 +39,9 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationButtonWidget(SKExtensions)
+@end
-@end
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationChoiceWidget_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationChoiceWidget_SKExtensions.h 2023-12-16 15:25:09 UTC
(rev 13908)
+++ trunk/PDFAnnotationChoiceWidget_SKExtensions.h 2023-12-17 14:38:46 UTC
(rev 13909)
@@ -39,7 +39,9 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationChoiceWidget (SKExtensions)
+@end
-@end
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationCircle_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationCircle_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationCircle_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,7 +39,10 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationCircle (SKExtensions)
-@property (nonatomic, copy) NSColor *scriptingInteriorColor;
+@property (nonatomic, nullable, copy) NSColor *scriptingInteriorColor;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationFreeText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationFreeText_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,16 +39,18 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
extern NSString *SKPDFAnnotationScriptingFontColorKey;
extern NSString *SKPDFAnnotationScriptingAlignmentKey;
-
@interface PDFAnnotationFreeText (SKExtensions)
-@property (nonatomic, copy) NSFont *fontName;
+@property (nonatomic, nullable, copy) NSFont *fontName;
@property (nonatomic) CGFloat fontSize;
-@property (nonatomic, copy) NSColor *scriptingFontColor;
+@property (nonatomic, nullable, copy) NSColor *scriptingFontColor;
@property (nonatomic) NSInteger scriptingAlignment;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationInk_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationInk_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,9 +39,12 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPDFAnnotationBezierPathsKey;
extern NSString *SKPDFAnnotationScriptingPointListsKey;
@interface PDFAnnotationInk (SKExtensions)
+@end
-@end
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationLine_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationLine_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPDFAnnotationObservedStartPointKey;
extern NSString *SKPDFAnnotationObservedEndPointKey;
@@ -47,13 +49,14 @@
extern NSString *SKPDFAnnotationScriptingStartLineStyleKey;
extern NSString *SKPDFAnnotationScriptingEndLineStyleKey;
-
@interface PDFAnnotationLine (SKExtensions)
-@property (nonatomic, copy) NSData *startPointAsQDPoint;
-@property (nonatomic, copy) NSData *endPointAsQDPoint;
+@property (nonatomic, nullable, copy) NSData *startPointAsQDPoint;
+@property (nonatomic, nullable, copy) NSData *endPointAsQDPoint;
@property (nonatomic) PDFLineStyle scriptingStartLineStyle;
@property (nonatomic) PDFLineStyle scriptingEndLineStyle;
-@property (nonatomic, copy) NSColor *scriptingInteriorColor;
+@property (nonatomic, nullable, copy) NSColor *scriptingInteriorColor;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationLink_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationLink_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationLink_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,6 +39,9 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationLink (SKExtension)
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationMarkup_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationMarkup_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,14 +39,16 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
extern NSString *SKPDFAnnotationSelectionSpecifierKey;
-
@interface PDFAnnotationMarkup (SKExtensions)
-- (instancetype)initSkimNoteWithSelection:(PDFSelection *)selection
forPage:(PDFPage *)page forType:(NSString *)type;
+- (nullable instancetype)initSkimNoteWithSelection:(PDFSelection *)selection
forPage:(nullable PDFPage *)page forType:(NSString *)type;
-@property (nonatomic, readonly) PDFSelection *selection;
+@property (nonatomic, nullable, readonly) PDFSelection *selection;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationSquare_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationSquare_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationSquare_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,7 +39,10 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationSquare (SKExtensions)
-@property (nonatomic, copy) NSColor *scriptingInteriorColor;
+@property (nonatomic, nullable, copy) NSColor *scriptingInteriorColor;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationTextWidget_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationTextWidget_SKExtensions.h 2023-12-16 15:25:09 UTC
(rev 13908)
+++ trunk/PDFAnnotationTextWidget_SKExtensions.h 2023-12-17 14:38:46 UTC
(rev 13909)
@@ -39,7 +39,9 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFAnnotationTextWidget (SKExtensions)
+@end
-@end
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotationText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationText_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFAnnotationText_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,10 +39,12 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
extern NSString *SKPDFAnnotationScriptingIconTypeKey;
-
@interface PDFAnnotationText (SKExtensions)
@property (nonatomic) PDFTextAnnotationIconType scriptingIconType;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFAnnotation_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -41,6 +41,7 @@
#import <SkimNotes/SkimNotes.h>
#import "NSGeometry_SKExtensions.h"
+NS_ASSUME_NONNULL_BEGIN
extern NSString *SKPDFAnnotationScriptingColorKey;
extern NSString *SKPDFAnnotationScriptingModificationDateKey;
@@ -56,25 +57,25 @@
@interface PDFAnnotation (SKExtensions) <NSPasteboardReading,
NSPasteboardWriting>
-+ (PDFAnnotation *)newSkimNoteWithBounds:(NSRect)bounds forType:(NSString
*)type;
++ (nullable PDFAnnotation *)newSkimNoteWithBounds:(NSRect)bounds
forType:(NSString *)type;
-+ (PDFAnnotation *)newSkimNoteWithProperties:(NSDictionary *)dict;
++ (nullable PDFAnnotation *)newSkimNoteWithProperties:(NSDictionary *)dict;
-+ (PDFAnnotation *)newSkimNoteWithPaths:(NSArray *)paths;
++ (nullable PDFAnnotation *)newSkimNoteWithPaths:(NSArray *)paths;
-+ (PDFAnnotation *)newSkimNoteWithSelection:(PDFSelection *)selection
forType:(NSString *)type;
++ (nullable PDFAnnotation *)newSkimNoteWithSelection:(PDFSelection *)selection
forType:(NSString *)type;
-+ (NSArray *)SkimNotesAndPagesWithSelection:(PDFSelection *)selection
forType:(NSString *)type;
++ (nullable NSArray *)SkimNotesAndPagesWithSelection:(PDFSelection *)selection
forType:(NSString *)type;
+ (NSDictionary *)textToNoteSkimNoteProperties:(NSDictionary *)properties;
-@property (nonatomic, readonly) NSString *fdfString;
+@property (nonatomic, nullable, readonly) NSString *fdfString;
@property (nonatomic, readonly) NSUInteger pageIndex;
@property (nonatomic) PDFBorderStyle borderStyle;
@property (nonatomic) CGFloat lineWidth;
-@property (nonatomic, copy) NSArray *dashPattern;
+@property (nonatomic, nullable, copy) NSArray *dashPattern;
@property (nonatomic) NSPoint observedStartPoint;
@property (nonatomic) NSPoint observedEndPoint;
@@ -81,23 +82,23 @@
@property (nonatomic, readonly) CGFloat pathInset;
-@property (nonatomic, copy) NSArray *bezierPaths;
+@property (nonatomic, nullable, copy) NSArray *bezierPaths;
-@property (nonatomic, readonly) NSArray *pagePaths;
+@property (nonatomic, nullable, readonly) NSArray *pagePaths;
-@property (nonatomic, readonly) NSImage *image;
-@property (nonatomic, readonly) NSAttributedString *text;
+@property (nonatomic, nullable, readonly) NSImage *image;
+@property (nonatomic, nullable, readonly) NSAttributedString *text;
@property (nonatomic, readonly) BOOL hasNoteText;
-@property (nonatomic, readonly) SKNoteText *noteText;
+@property (nonatomic, nullable, readonly) SKNoteText *noteText;
-@property (nonatomic, readonly) PDFSelection *selection;
+@property (nonatomic, nullable, readonly) PDFSelection *selection;
-@property (nonatomic, strong) id objectValue;
+@property (nonatomic, nullable, strong) id objectValue;
@property (nonatomic, readonly) SKNPDFWidgetType widgetType;
-@property (nonatomic, readonly) NSString *textString;
+@property (nonatomic, nullable, readonly) NSString *textString;
- (BOOL)isMarkup;
- (BOOL)isNote;
@@ -133,31 +134,31 @@
- (void)setColor:(NSColor *)color alternate:(BOOL)alternate
updateDefaults:(BOOL)update;
-@property (nonatomic, readonly) NSURL *skimURL;
+@property (nonatomic, nullable, readonly) NSURL *skimURL;
@property (nonatomic, readonly) NSSet *keysForValuesToObserveForUndo;
@property (class, nonatomic, readonly) NSSet *customScriptingKeys;
@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
-@property (nonatomic, copy) NSColor *scriptingColor;
-@property (nonatomic, readonly) PDFPage *scriptingPage;
-@property (nonatomic, copy) NSDate *scriptingModificationDate;
-@property (nonatomic, copy) NSString *scriptingUserName;
+@property (nonatomic, nullable, copy) NSColor *scriptingColor;
+@property (nonatomic, nullable, readonly) PDFPage *scriptingPage;
+@property (nonatomic, nullable, copy) NSDate *scriptingModificationDate;
+@property (nonatomic, nullable, copy) NSString *scriptingUserName;
@property (nonatomic, readonly) PDFTextAnnotationIconType scriptingIconType;
-@property (nonatomic, copy) id textContents;
-@property (nonatomic, readonly) id richText;
+@property (nonatomic, nullable, copy) id textContents;
+@property (nonatomic, nullable, readonly) id richText;
@property (nonatomic, copy) NSData *boundsAsQDRect;
@property (nonatomic, readonly) NSInteger scriptingAlignment;
-@property (nonatomic, readonly) NSString *fontName;
+@property (nonatomic, nullable, readonly) NSString *fontName;
@property (nonatomic, readonly) CGFloat fontSize;
-@property (nonatomic, readonly) NSColor *scriptingFontColor;
-@property (nonatomic, readonly) NSColor *scriptingInteriorColor;
-@property (nonatomic, readonly) NSData *startPointAsQDPoint;
-@property (nonatomic, readonly) NSData *endPointAsQDPoint;
+@property (nonatomic, nullable, readonly) NSColor *scriptingFontColor;
+@property (nonatomic, nullable, readonly) NSColor *scriptingInteriorColor;
+@property (nonatomic, nullable, readonly) NSData *startPointAsQDPoint;
+@property (nonatomic, nullable, readonly) NSData *endPointAsQDPoint;
@property (nonatomic, readonly) PDFLineStyle scriptingStartLineStyle;
@property (nonatomic, readonly) PDFLineStyle scriptingEndLineStyle;
-@property (nonatomic, readonly) id selectionSpecifier;
-@property (nonatomic, readonly) NSArray *scriptingPointLists;
+@property (nonatomic, nullable, readonly) id selectionSpecifier;
+@property (nonatomic, nullable, readonly) NSArray *scriptingPointLists;
- (void)handleEditScriptCommand:(NSScriptCommand *)command;
@@ -164,6 +165,8 @@
@end
@interface PDFAnnotation (SKDefaultExtensions)
-@property (nonatomic, readonly) NSColor *interiorColor;
-@property (nonatomic, readonly) NSString *fieldName;
+@property (nonatomic, nullable, readonly) NSColor *interiorColor;
+@property (nonatomic, nullable, readonly) NSString *fieldName;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFDestination_SKExtensions.h
===================================================================
--- trunk/PDFDestination_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFDestination_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,8 +39,12 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface PDFDestination (SKExtensions)
-- (PDFDestination *)effectiveDestinationForView:(PDFView *)pdfView;
+- (PDFDestination *)effectiveDestinationForView:(nullable PDFView *)pdfView;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFDocumentView_SKExtensions.h
===================================================================
--- trunk/PDFDocumentView_SKExtensions.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/PDFDocumentView_SKExtensions.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -39,5 +39,9 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern void SKSwizzlePDFDocumentViewMethods();
extern void SKSwizzlePDFAccessibilityNodeAnnotationMethods();
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFDocument_SKExtensions.h
===================================================================
--- trunk/PDFDocument_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFDocument_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPDFDocumentDidAddAnnotationNotification;
extern NSString *SKPDFDocumentWillRemoveAnnotationNotification;
extern NSString *SKPDFDocumentDidRemoveAnnotationNotification;
@@ -55,15 +57,17 @@
} SKLanguageDirectionAngles;
@interface PDFDocument (SKExtensions) <NSFastEnumeration>
-@property (nonatomic, readonly) NSArray *pageLabels;
-@property (nonatomic, readonly) NSArray *fileIDStrings;
-@property (nonatomic, readonly) NSDictionary *initialSettings;
+@property (nonatomic, nullable, readonly) NSArray *pageLabels;
+@property (nonatomic, nullable, readonly) NSArray *fileIDStrings;
+@property (nonatomic, nullable, readonly) NSDictionary *initialSettings;
@property (nonatomic, readonly) SKLanguageDirectionAngles
languageDirectionAngles;
@property (nonatomic, readonly) BOOL allowsNotes;
@property (nonatomic, readonly) BOOL realAllowsCommenting;
-@property (nonatomic, readonly) NSArray *detectedWidgets;
-@property (nonatomic, weak) NSDocument *containingDocument;
+@property (nonatomic, nullable, readonly) NSArray *detectedWidgets;
+@property (nonatomic, nullable, weak) NSDocument *containingDocument;
- (void)addAnnotation:(PDFAnnotation *)annotation toPage:(PDFPage *)page;
- (void)removeAnnotation:(PDFAnnotation *)annotation;
- (void)moveAnnotation:(PDFAnnotation *)annotation toPage:(PDFPage *)page;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFOutline_SKExtensions.h
===================================================================
--- trunk/PDFOutline_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFOutline_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,25 +39,28 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFOutline (SKExtensions)
-@property (nonatomic, readonly) PDFPage *page;
-@property (nonatomic, readonly) NSString *pageLabel;
+@property (nonatomic, nullable, readonly) PDFPage *page;
+@property (nonatomic, nullable, readonly) NSString *pageLabel;
-@property (nonatomic, readonly) NSString *cleanedLabel;
+@property (nonatomic, nullable, readonly) NSString *cleanedLabel;
@property (nonatomic, readonly) NSInteger deepestLevel;
- (void)pageLabelDidUpdate;
-@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
-@property (nonatomic, readonly) PDFOutline *scriptingParent;
+@property (nonatomic, nullable, readonly) NSScriptObjectSpecifier
*objectSpecifier;
+@property (nonatomic, nullable, readonly) PDFOutline *scriptingParent;
@property (nonatomic, readonly) NSArray *entireContents;
- (NSUInteger)countOfOutlines;
- (PDFOutline *)objectInOutlinesAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSString *scriptingURL;
-@property (nonatomic, readonly) NSURL *scriptingFile;
+@property (nonatomic, nullable, readonly) NSString *scriptingURL;
+@property (nonatomic, nullable, readonly) NSURL *scriptingFile;
@property (nonatomic, getter=isExpanded) BOOL expanded;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFPage_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -40,6 +40,8 @@
#import <Quartz/Quartz.h>
#import "NSValue_SKExtensions.h"
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPDFPageBoundsDidChangeNotification;
extern NSString *SKPDFPagePageKey;
@@ -59,8 +61,8 @@
@property (nonatomic, readonly) NSRect boundingBox;
- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box;
-- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
readingBar:(SKReadingBar *)readingBar;
-- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
shadowBlurRadius:(CGFloat)shadowBlurRadius highlights:(NSArray *)highlights;
+- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
readingBar:(nullable SKReadingBar *)readingBar;
+- (NSImage *)thumbnailWithSize:(CGFloat)size forBox:(PDFDisplayBox)box
shadowBlurRadius:(CGFloat)shadowBlurRadius highlights:(nullable NSArray
*)highlights;
- (NSAttributedString *)thumbnailAttachmentWithSize:(CGFloat)size;
@property (nonatomic, readonly) NSAttributedString *thumbnailAttachment;
@@ -70,15 +72,15 @@
@property (nonatomic, readonly) NSAttributedString *thumbnail64Attachment;
@property (nonatomic, readonly) NSAttributedString *thumbnail32Attachment;
-- (NSData *)PDFDataForRect:(NSRect)rect;
-- (NSData *)TIFFDataForRect:(NSRect)rect;
+- (nullable NSData *)PDFDataForRect:(NSRect)rect;
+- (nullable NSData *)TIFFDataForRect:(NSRect)rect;
-- (id<NSPasteboardWriting>)filePromiseForPageIndexes:(NSIndexSet *)pageIndexes;
-- (void)writeToClipboardForPageIndexes:(NSIndexSet *)pageIndexes;
+- (nullable id<NSPasteboardWriting>)filePromiseForPageIndexes:(nullable
NSIndexSet *)pageIndexes;
+- (void)writeToClipboardForPageIndexes:(nullable NSIndexSet *)pageIndexes;
-@property (nonatomic, readonly) NSURL *skimURL;
+@property (nonatomic, nullable, readonly) NSURL *skimURL;
-@property (nonatomic, readonly) NSPointerArray *lineRects;
+@property (nonatomic, nullable, readonly) NSPointerArray *lineRects;
- (NSInteger)indexOfLineRectAtPoint:(NSPoint)point lower:(BOOL)lower;
@property (nonatomic, readonly) NSUInteger pageIndex;
@@ -95,22 +97,24 @@
- (CGFloat)sortOrderForBounds:(NSRect)bounds;
-@property (nonatomic, readonly) NSScriptObjectSpecifier *objectSpecifier;
-@property (nonatomic, readonly) NSDocument *containingDocument;
+@property (nonatomic, nullable, readonly) NSScriptObjectSpecifier
*objectSpecifier;
+@property (nonatomic, nullable, readonly) NSDocument *containingDocument;
@property (nonatomic, readonly) NSUInteger index;
@property (nonatomic) NSInteger rotationAngle;
-@property (nonatomic, copy) NSData *boundsAsQDRect;
-@property (nonatomic, copy) NSData *mediaBoundsAsQDRect;
-@property (nonatomic, readonly) NSData *contentBoundsAsQDRect;
-@property (nonatomic, readonly) NSArray *lineBoundsAsQDRects;
+@property (nonatomic, nullable, copy) NSData *boundsAsQDRect;
+@property (nonatomic, nullable, copy) NSData *mediaBoundsAsQDRect;
+@property (nonatomic, nullable, readonly) NSData *contentBoundsAsQDRect;
+@property (nonatomic, nullable, readonly) NSArray *lineBoundsAsQDRects;
- (NSUInteger)countOfLines;
- (SKLine *)objectInLinesAtIndex:(NSUInteger)anIndex;
-@property (nonatomic, readonly) NSTextStorage *richText;
-@property (nonatomic, readonly) NSArray *notes;
-- (id)valueInNotesWithUniqueID:(NSString *)aUniqueID;
+@property (nonatomic, nullable, readonly) NSTextStorage *richText;
+@property (nonatomic, nullable, readonly) NSArray *notes;
+- (nullable id)valueInNotesWithUniqueID:(NSString *)aUniqueID;
- (void)insertObject:(id)newNote inNotesAtIndex:(NSUInteger)index;
- (void)removeObjectFromNotesAtIndex:(NSUInteger)index;
-- (id)handleGrabScriptCommand:(NSScriptCommand *)command;
+- (nullable id)handleGrabScriptCommand:(NSScriptCommand *)command;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/PDFSelection_SKExtensions.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface PDFSelection (SKExtensions)
@@ -45,22 +46,24 @@
+ (PDFSelection *)selectionByAddingSelections:(NSArray *)selections;
// the search table columns bind to these methods for display
-@property (nonatomic, readonly) NSString *cleanedString;
-@property (nonatomic, readonly) NSAttributedString *contextString;
+@property (nonatomic, nullable, readonly) NSString *cleanedString;
+@property (nonatomic, nullable, readonly) NSAttributedString *contextString;
-@property (nonatomic, readonly) PDFDestination *destination;
+@property (nonatomic, nullable, readonly) PDFDestination *destination;
- (NSUInteger)safeIndexOfFirstCharacterOnPage:(PDFPage *)page;
- (NSUInteger)safeIndexOfLastCharacterOnPage:(PDFPage *)page;
-@property (nonatomic, readonly) PDFPage *safeFirstPage;
-@property (nonatomic, readonly) PDFPage *safeLastPage;
+@property (nonatomic, nullable, readonly) PDFPage *safeFirstPage;
+@property (nonatomic, nullable, readonly) PDFPage *safeLastPage;
- (BOOL)hasCharacters;
- (CGFloat)boundsOrderForPage:(PDFPage *)page;
-+ (instancetype)selectionWithSpecifier:(id)specifier;
-+ (instancetype)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
-@property (nonatomic, readonly) id objectSpecifiers;
++ (nullable instancetype)selectionWithSpecifier:(nullable id)specifier;
++ (nullable instancetype)selectionWithSpecifier:(nullable id)specifier
onPage:(nullable PDFPage *)aPage;
+@property (nonatomic, nullable, readonly) id objectSpecifiers;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKAlias.h
===================================================================
--- trunk/SKAlias.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKAlias.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKAlias : NSObject {
NSData *data;
@@ -46,11 +47,13 @@
@property (nonatomic, readonly) NSData *data;
@property (nonatomic, readonly, getter=isBookmark) BOOL bookmark;
-@property (nonatomic, readonly) NSURL *fileURL;
-@property (nonatomic, readonly) NSURL *fileURLNoUI;
+@property (nonatomic, nullable, readonly) NSURL *fileURL;
+@property (nonatomic, nullable, readonly) NSURL *fileURLNoUI;
-- (instancetype)initWithAliasData:(NSData *)data;
-- (instancetype)initWithBookmarkData:(NSData *)data;
-- (instancetype)initWithURL:(NSURL *)fileURL;
+- (nullable instancetype)initWithAliasData:(NSData *)data;
+- (nullable instancetype)initWithBookmarkData:(NSData *)data;
+- (nullable instancetype)initWithURL:(NSURL *)fileURL;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKAnimatedBorderlessWindow.h
===================================================================
--- trunk/SKAnimatedBorderlessWindow.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKAnimatedBorderlessWindow.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKAnimatedBorderlessWindow : NSPanel {
CGFloat defaultAlphaValue;
@@ -49,7 +50,7 @@
@property (nonatomic) CGFloat defaultAlphaValue;
@property (nonatomic) NSTimeInterval autoHideTimeInterval;
@property (nonatomic, readonly) NSTimeInterval fadeInDuration, fadeOutDuration;
-@property (nonatomic, strong) NSImage *backgroundImage;
+@property (nonatomic, nullable, strong) NSImage *backgroundImage;
- (void)fadeIn;
- (void)fadeOut;
@@ -56,10 +57,12 @@
- (void)remove;
-- (void)orderOut:(id)sender;
-- (void)orderFront:(id)sender;
+- (void)orderOut:(nullable id)sender;
+- (void)orderFront:(nullable id)sender;
- (void)orderFrontRegardless;
- (void)stopAnimation;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKAnnotationTypeImageCell.h
===================================================================
--- trunk/SKAnnotationTypeImageCell.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKAnnotationTypeImageCell.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,8 +38,12 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface SKAnnotationTypeImageCell : NSImageCell {
BOOL hasOutline;
}
@property (nonatomic) BOOL hasOutline;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKAnnotationTypeImageView.h
===================================================================
--- trunk/SKAnnotationTypeImageView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKAnnotationTypeImageView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKAnnotationTypeImageView : NSImageView
@@ -44,3 +45,5 @@
@property (nonatomic) BOOL hasOutline;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKApplication.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKApplicationStartsTerminatingNotification;
@protocol SKApplicationDelegate;
@@ -49,7 +51,7 @@
SPUStandardUpdaterController *updaterController;
}
-@property (nonatomic, strong) IBOutlet SPUStandardUpdaterController
*updaterController;
+@property (nonatomic, nullable, strong) IBOutlet SPUStandardUpdaterController
*updaterController;
@property (nonatomic, getter=isUserAttentionDisabled) BOOL
userAttentionDisabled;
@@ -57,8 +59,8 @@
- (BOOL)willDragMouse;
-- (id <SKApplicationDelegate>)delegate;
-- (void)setDelegate:(id <SKApplicationDelegate>)newDelegate;
+- (nullable id <SKApplicationDelegate>)delegate;
+- (void)setDelegate:(nullable id <SKApplicationDelegate>)newDelegate;
@end
@@ -72,3 +74,5 @@
enum {
SKRemoteButtonEvent = 1
};
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKApplicationController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -40,6 +40,8 @@
#import "SKApplication.h"
#import "HIDRemote.h"
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPageLabelsChangedNotification;
@class SKBookmark, SKDownload;
@@ -53,19 +55,17 @@
id activity;
}
-- (IBAction)orderFrontLineInspector:(id)sender;
-- (IBAction)orderFrontNotesPanel:(id)sender;
+- (IBAction)orderFrontLineInspector:(nullable id)sender;
+- (IBAction)orderFrontNotesPanel:(nullable id)sender;
-- (IBAction)visitWebSite:(id)sender;
-- (IBAction)visitWiki:(id)sender;
-- (IBAction)showPreferencePanel:(id)sender;
-- (IBAction)showReleaseNotes:(id)sender;
-- (IBAction)showDownloads:(id)sender;
+- (IBAction)visitWebSite:(nullable id)sender;
+- (IBAction)visitWiki:(nullable id)sender;
+- (IBAction)showPreferencePanel:(nullable id)sender;
+- (IBAction)showReleaseNotes:(nullable id)sender;
+- (IBAction)showDownloads:(nullable id)sender;
-@property (nonatomic, strong) IBOutlet NSMenu *noteColumnsMenu, *noteTypeMenu;
+@property (nonatomic, nullable, strong) IBOutlet NSMenu *noteColumnsMenu,
*noteTypeMenu;
-@property (weak, nonatomic, readonly) NSColorList *colorList;
-
@property (nonatomic, copy) NSArray *favoriteColors;
@property (nonatomic) PDFLineStyle defaultStartLineStyle, defaultEndLineStyle;
@property (nonatomic) NSTextAlignment defaultAlignment;
@@ -80,3 +80,5 @@
- (void)removeObjectFromDownloadsAtIndex:(NSUInteger)anIndex;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKApplicationController.m 2023-12-17 14:38:46 UTC (rev 13909)
@@ -117,7 +117,7 @@
@implementation SKApplicationController
-@synthesize noteColumnsMenu, noteTypeMenu, colorList;
+@synthesize noteColumnsMenu, noteTypeMenu;
@dynamic favoriteColors;
+ (void)initialize{
Modified: trunk/SKAttachmentEmailer.h
===================================================================
--- trunk/SKAttachmentEmailer.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKAttachmentEmailer.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol SKAttachmentEmailerDelegate;
@interface SKAttachmentEmailer : NSObject {
@@ -50,9 +52,9 @@
@property (nonatomic, readonly) NSString *title;
@property (nonatomic, readonly) NSImage *image;
-@property (nonatomic, weak) id<SKAttachmentEmailerDelegate> delegate;
+@property (nonatomic, nullable, weak) id<SKAttachmentEmailerDelegate> delegate;
-@property (nonatomic, strong) NSString *subject;
+@property (nonatomic, nullable, strong) NSString *subject;
- (BOOL)canPerformWithItems:(NSArray *)items;
- (void)performWithItems:(NSArray *)items;
@@ -69,3 +71,5 @@
- (void)sharingService:(id)sharingService didFailToShareItems:(NSArray *)items
error:(NSError *)error;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKBasePDFView.h
===================================================================
--- trunk/SKBasePDFView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKBasePDFView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKBasePDFView : PDFView
@@ -47,3 +48,5 @@
- (void)drawPagesInRect:(NSRect)rect toContext:(CGContextRef)context;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKBookmark.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
typedef NS_ENUM(NSInteger, SKBookmarkType) {
SKBookmarkTypeBookmark,
SKBookmarkTypeFolder,
@@ -50,36 +52,36 @@
__weak SKBookmark *parent;
}
-+ (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;
++ (nullable instancetype)bookmarkWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex label:(NSString *)aLabel;
++ (nullable instancetype)bookmarkWithSetup:(NSDictionary *)aSetupDict
label:(NSString *)aLabel;
++ (nullable instancetype)bookmarkFolderWithLabel:(NSString *)aLabel;
++ (nullable instancetype)bookmarkSessionWithSetups:(NSArray *)aSetupDicts
label:(NSString *)aLabel;
+ (instancetype)bookmarkSeparator;
+ (NSArray *)bookmarksForURLs:(NSArray *)urls;
-- (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;
+- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex label:(NSString *)aLabel;
+- (nullable instancetype)initWithSetup:(NSDictionary *)aSetupDict
label:(NSString *)aLabel;
+- (nullable instancetype)initFolderWithChildren:(nullable NSArray *)aChildren
label:(NSString *)aLabel;
+- (nullable instancetype)initFolderWithLabel:(NSString *)aLabel;
+- (nullable instancetype)initRootWithChildrenProperties:(nullable NSArray
*)childrenProperties;
+- (nullable instancetype)initSessionWithSetups:(NSArray *)aSetupDicts
label:(NSString *)aLabel;
+- (nullable instancetype)initSeparator;
+- (nullable instancetype)initWithProperties:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *properties;
@property (nonatomic, readonly) SKBookmarkType bookmarkType;
-@property (nonatomic, strong) NSString *label;
-@property (nonatomic, readonly) NSImage *icon, *alternateIcon;
-@property (nonatomic, copy) NSURL *fileURL;
-@property (nonatomic, readonly) NSURL *fileURLToOpen;
-@property (nonatomic, readonly) NSString *fileDescription;
-@property (nonatomic, readonly) NSString *toolTip;
+@property (nonatomic, nullable, strong) NSString *label;
+@property (nonatomic, nullable, readonly) NSImage *icon, *alternateIcon;
+@property (nonatomic, nullable, copy) NSURL *fileURL;
+@property (nonatomic, nullable, readonly) NSURL *fileURLToOpen;
+@property (nonatomic, nullable, readonly) NSString *fileDescription;
+@property (nonatomic, nullable, readonly) NSString *toolTip;
@property (nonatomic) NSUInteger pageIndex;
-@property (nonatomic, strong) NSNumber *pageNumber;
+@property (nonatomic, nullable, strong) NSNumber *pageNumber;
@property (nonatomic, readonly) BOOL hasSetup;
-@property (nonatomic, readonly) NSString *tabs;
-@property (nonatomic, weak) SKBookmark *parent;
+@property (nonatomic, nullable, readonly) NSString *tabs;
+@property (nonatomic, nullable, weak) SKBookmark *parent;
@property (nonatomic, readonly) NSArray *containingBookmarks;
- (NSArray *)children;
@@ -91,8 +93,8 @@
- (void)removeObjectFromChildrenAtIndex:(NSUInteger)anIndex;
- (void)removeChildrenAtIndexes:(NSIndexSet *)indexes;
-@property (nonatomic, readonly) SKBookmark *scriptingParent;
-@property (nonatomic, readonly) NSArray *entireContents;
+@property (nonatomic, nullable, readonly) SKBookmark *scriptingParent;
+@property (nonatomic, nullable, readonly) NSArray *entireContents;
- (NSArray *)bookmarks;
- (void)insertObject:(SKBookmark *)bookmark
inBookmarksAtIndex:(NSUInteger)anIndex;
@@ -103,6 +105,8 @@
- (BOOL)isDescendantOf:(SKBookmark *)bookmark;
- (BOOL)isDescendantOfArray:(NSArray *)bookmarks;
-@property (nonatomic, readonly) NSURL * skimURL;
+@property (nonatomic, nullable, readonly) NSURL * skimURL;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKBookmarkController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -40,6 +40,8 @@
#import <Quartz/Quartz.h>
#import "SKOutlineView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class SKBookmark, SKStatusBar;
@interface SKBookmarkController : NSWindowController <NSWindowDelegate,
NSToolbarDelegate, NSMenuDelegate, SKOutlineViewDelegate,
NSOutlineViewDataSource, QLPreviewPanelDataSource, QLPreviewPanelDelegate,
NSTouchBarDelegate> {
@@ -64,32 +66,32 @@
@property (class, nonatomic, readonly) SKBookmarkController
*sharedBookmarkController;
-@property (nonatomic, strong) IBOutlet SKOutlineView *outlineView;
-@property (nonatomic, strong) IBOutlet SKStatusBar *statusBar;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*folderSegmentedControl;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*separatorSegmentedControl;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*deleteSegmentedControl;
+@property (nonatomic, nullable, strong) IBOutlet SKOutlineView *outlineView;
+@property (nonatomic, nullable, strong) IBOutlet SKStatusBar *statusBar;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*folderSegmentedControl;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*separatorSegmentedControl;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*deleteSegmentedControl;
@property (nonatomic, readonly) SKBookmark *bookmarkRoot;
-@property (nonatomic, readonly) SKBookmark *previousSession;
+@property (nonatomic, nullable, readonly) SKBookmark *previousSession;
- (IBAction)openBookmark:(id)sender;
-- (IBAction)doubleClickBookmark:(id)sender;
-- (IBAction)insertBookmarkFolder:(id)sender;
-- (IBAction)insertBookmarkSeparator:(id)sender;
-- (IBAction)addBookmark:(id)sender;
-- (IBAction)deleteBookmark:(id)sender;
-- (IBAction)toggleStatusBar:(id)sender;
+- (IBAction)doubleClickBookmark:(nullable id)sender;
+- (IBAction)insertBookmarkFolder:(nullable id)sender;
+- (IBAction)insertBookmarkSeparator:(nullable id)sender;
+- (IBAction)addBookmark:(nullable id)sender;
+- (IBAction)deleteBookmark:(nullable id)sender;
+- (IBAction)toggleStatusBar:(nullable id)sender;
-- (IBAction)copyURL:(id)sender;
+- (IBAction)copyURL:(nullable id)sender;
-- (SKBookmark *)bookmarkForURL:(NSURL *)bookmarkURL;
+- (nullable SKBookmark *)bookmarkForURL:(NSURL *)bookmarkURL;
- (void)insertBookmark:(SKBookmark *)bookmark atIndex:(NSUInteger)anIndex
ofBookmark:(SKBookmark *)parent animate:(BOOL)animate;
- (void)removeBookmarkAtIndex:(NSUInteger)anIndex ofBookmark:(SKBookmark
*)parent animate:(BOOL)animate;
- (void)replaceBookmarkAtIndex:(NSUInteger)anIndex ofBookmark:(SKBookmark
*)parent withBookmark:(SKBookmark *)bookmark animate:(BOOL)animate;
-- (void)addRecentDocumentForURL:(NSURL *)fileURL
pageIndex:(NSUInteger)pageIndex snapshots:(NSArray *)setups;
+- (void)addRecentDocumentForURL:(NSURL *)fileURL
pageIndex:(NSUInteger)pageIndex snapshots:(nullable NSArray *)setups;
- (NSUInteger)pageIndexForRecentDocumentAtURL:(NSURL *)fileURL;
- (NSArray *)snapshotsForRecentDocumentAtURL:(NSURL *)fileURL;
@@ -97,3 +99,5 @@
- (void)setExpanded:(BOOL)flag forBookmark:(SKBookmark *)bookmark;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKBookmarkSheetController.h
===================================================================
--- trunk/SKBookmarkSheetController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKBookmarkSheetController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "SKTextFieldSheetController.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class SKBookmark;
@interface SKBookmarkSheetController : SKTextFieldSheetController {
@@ -45,7 +47,9 @@
NSPopUpButton *folderPopUp;
}
-@property (nonatomic, strong) IBOutlet NSPopUpButton *folderPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *folderPopUp;
@property (nonatomic, readonly) SKBookmark *selectedFolder;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKChainedUndoManager.h
===================================================================
--- trunk/SKChainedUndoManager.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKChainedUndoManager.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKChainedUndoManager : NSUndoManager {
NSUndoManager *nextUndoManager;
@@ -44,3 +45,5 @@
}
- (instancetype)initWithNextUndoManager:(NSUndoManager *)undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKColorCell.h
===================================================================
--- trunk/SKColorCell.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKColorCell.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKColorCell : NSImageCell {
NSColor *color;
@@ -50,3 +51,5 @@
@interface SKColorView : NSImageView
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKColorList.h
===================================================================
--- trunk/SKColorList.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKColorList.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKColorList : NSColorList {
BOOL editable;
@@ -48,3 +49,5 @@
@property (class, nonatomic, readonly) NSColorList *favoriteColorList;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKColorMenuView.h
===================================================================
--- trunk/SKColorMenuView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKColorMenuView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "SKGroupView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class PDFAnnotation;
@interface SKColorMenuView : SKGroupView {
@@ -50,3 +52,5 @@
- (instancetype)initWithAnnotation:(PDFAnnotation *)anAnnotation;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKColorPicker.h
===================================================================
--- trunk/SKColorPicker.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKColorPicker.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol SKColorPickerDelegate;
@interface SKColorPicker : NSViewController <NSScrubberDataSource,
NSScrubberDelegate> {
@@ -48,7 +50,7 @@
@property (nonatomic, readonly) NSArray *colors;
-@property (nonatomic, weak) id <SKColorPickerDelegate> delegate;
+@property (nonatomic, nullable, weak) id <SKColorPickerDelegate> delegate;
@end
@@ -56,3 +58,5 @@
@protocol SKColorPickerDelegate <NSObject>
- (void)colorPickerDidSelectColor:(NSColor *)color;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKColorSwatch.h
===================================================================
--- trunk/SKColorSwatch.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKColorSwatch.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKColorSwatchColorsChangedNotification;
@class SKColorSwatchBackgroundView;
@@ -64,7 +66,7 @@
@property (nonatomic, copy) NSArray *colors;
@property (nonatomic, readonly) NSInteger clickedColorIndex;
@property (nonatomic, readonly) NSInteger selectedColorIndex;
-@property (nonatomic, readonly) NSColor *color;
+@property (nonatomic, nullable, readonly) NSColor *color;
@property (nonatomic) BOOL autoResizes;
@property (nonatomic) BOOL selects;
@property (nonatomic, getter=isAlternate) BOOL alternate;
@@ -79,3 +81,5 @@
- (void)moveColorAtIndex:(NSInteger)fromIdx toIndex:(NSInteger)toIdx;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKControlTableCellView.h
===================================================================
--- trunk/SKControlTableCellView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKControlTableCellView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,11 +38,14 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKControlTableCellView : NSTableCellView {
__weak NSControl *control;
}
-@property (nonatomic, weak) IBOutlet NSControl *control;
+@property (nonatomic, nullable, weak) IBOutlet NSControl *control;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKConversionProgressController.h
===================================================================
--- trunk/SKConversionProgressController.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/SKConversionProgressController.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKConversionProgressController : NSWindowController
<NSTouchBarDelegate> {
NSButton *cancelButton;
@@ -51,16 +52,18 @@
BOOL cancelled;
}
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressBar;
-@property (nonatomic, strong) IBOutlet NSTextField *textField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressBar;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *textField;
-+ (NSData *)newPDFDataFromURL:(NSURL *)aURL ofType:(NSString *)aFileType
error:(NSError **)outError;
-+ (NSData *)newPDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
++ (nullable NSData *)newPDFDataFromURL:(NSURL *)aURL ofType:(NSString
*)aFileType error:(NSError **)outError;
++ (nullable NSData *)newPDFDataWithPostScriptData:(NSData *)psData
error:(NSError **)outError;
-+ (NSString *)toolPathForType:(NSString *)aFileType;
++ (nullable NSString *)toolPathForType:(NSString *)aFileType;
-- (IBAction)cancel:(id)sender;
-- (IBAction)close:(id)sender;
+- (IBAction)cancel:(nullable id)sender;
+- (IBAction)close:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDisplayPreferences.h
===================================================================
--- trunk/SKDisplayPreferences.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDisplayPreferences.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "SKPreferenceController.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class SKColorSwatch;
@interface SKDisplayPreferences : NSViewController <SKPreferencePane> {
@@ -49,10 +51,10 @@
BOOL changingColors;
}
-@property (nonatomic, strong) IBOutlet NSColorWell *normalColorWell;
-@property (nonatomic, strong) IBOutlet NSColorWell *fullScreenColorWell;
-@property (nonatomic, strong) IBOutlet SKColorSwatch *colorSwatch;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*addRemoveColorButton;
+@property (nonatomic, nullable, strong) IBOutlet NSColorWell *normalColorWell;
+@property (nonatomic, nullable, strong) IBOutlet NSColorWell
*fullScreenColorWell;
+@property (nonatomic, nullable, strong) IBOutlet SKColorSwatch *colorSwatch;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveColorButton;
@property (nonatomic, readonly) BOOL allowsDarkMode;
@@ -59,9 +61,11 @@
- (NSUInteger)countOfSizes;
- (NSNumber *)objectInSizesAtIndex:(NSUInteger)anIndex;
-- (IBAction)changeBackgroundColor:(id)sender;
-- (IBAction)changeFullScreenBackgroundColor:(id)sender;
+- (IBAction)changeBackgroundColor:(nullable id)sender;
+- (IBAction)changeFullScreenBackgroundColor:(nullable id)sender;
-- (IBAction)addRemoveColor:(id)sender;
+- (IBAction)addRemoveColor:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDisplayPrefs.h
===================================================================
--- trunk/SKDisplayPrefs.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDisplayPrefs.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKDisplayPrefs : NSObject {
BOOL fullScreen;
@@ -45,9 +46,9 @@
@property (nonatomic, readonly) NSString *name;
@property (nonatomic, strong) NSDictionary *pdfViewSettings;
-@property (nonatomic, strong) NSColor *backgroundColor;
+@property (nonatomic, nullable, strong) NSColor *backgroundColor;
@property (nonatomic) CGFloat sepiaTone;
-@property (nonatomic, strong) NSColor *whitePoint;
+@property (nonatomic, nullable, strong) NSColor *whitePoint;
@property (nonatomic, getter=isInverted) BOOL inverted;
- (instancetype)initForFullScreen:(BOOL)isFullScreen;
@@ -54,3 +55,5 @@
- (instancetype)initWithName:(NSString *)name;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDocumentController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKPDFDocumentType;
extern NSString *SKPDFBundleDocumentType;
extern NSString *SKNotesDocumentType;
@@ -71,17 +73,19 @@
Class openDocumentClass;
}
-- (IBAction)newDocumentFromClipboard:(id)sender;
+- (IBAction)newDocumentFromClipboard:(nullable id)sender;
-- (void)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
completionHandler:(void (^)(NSDocument *document, BOOL documentWasAlreadyOpen,
NSError *error))completionHandler;
+- (void)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
completionHandler:(void (^)(NSDocument * _Nullable document, BOOL
documentWasAlreadyOpen, NSError * _Nullable error))completionHandler;
// this method may return an SKDownload instance
-- (void)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes completionHandler:(void (^)(NSDocument *document,
BOOL documentWasAlreadyOpen, NSError *error))completionHandler;
+- (void)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes completionHandler:(void (^)(NSDocument * _Nullable
document, BOOL documentWasAlreadyOpen, NSError * _Nullable
error))completionHandler;
-- (void)openDocumentWithBookmark:(SKBookmark *)bookmark
completionHandler:(void (^)(NSDocument *document, BOOL documentWasAlreadyOpen,
NSError *error))completionHandler;
-- (void)openDocumentWithBookmarks:(NSArray *)bookmarks completionHandler:(void
(^)(NSDocument *document, BOOL documentWasAlreadyOpen, NSError
*error))completionHandler;
+- (void)openDocumentWithBookmark:(SKBookmark *)bookmark
completionHandler:(void (^)(NSDocument * _Nullable document, BOOL
documentWasAlreadyOpen, NSError * _Nullable error))completionHandler;
+- (void)openDocumentWithBookmarks:(NSArray *)bookmarks completionHandler:(void
(^)(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError *
_Nullable error))completionHandler;
-- (Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
+- (nullable Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
@property (nonatomic, readonly) BOOL openedFile;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDownload.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
// these are the keys used for the info
extern NSString *SKDownloadFileNameKey;
extern NSString *SKDownloadFileURLKey;
@@ -68,13 +70,13 @@
@property (nonatomic, readonly) SKDownloadStatus status;
-@property (nonatomic, readonly) NSURL *URL;
+@property (nonatomic, nullable, readonly) NSURL *URL;
-@property (nonatomic, strong) NSData *resumeData;
+@property (nonatomic, nullable, strong) NSData *resumeData;
-@property (nonatomic, readonly) NSString *fileName;
-@property (nonatomic, readonly, strong) NSURL *fileURL;
-@property (nonatomic, readonly, strong) NSImage *fileIcon;
+@property (nonatomic, nullable, readonly) NSString *fileName;
+@property (nonatomic, nullable, readonly, strong) NSURL *fileURL;
+@property (nonatomic, nullable, readonly, strong) NSImage *fileIcon;
@property (nonatomic, readonly) int64_t expectedContentLength,
receivedContentLength;
@property (nonatomic, readonly) NSString *statusDescription;
@@ -87,10 +89,10 @@
@property (nonatomic, readonly) NSImage *cancelImage;
@property (nonatomic, readonly) NSImage *resumeImage;
-@property (nonatomic, readonly) NSString *cancelToolTip;
-@property (nonatomic, readonly) NSString *resumeToolTip;
+@property (nonatomic, nullable, readonly) NSString *cancelToolTip;
+@property (nonatomic, nullable, readonly) NSString *resumeToolTip;
-@property (nonatomic, readonly) NSString *scriptingURL;
+@property (nonatomic, nullable, readonly) NSString *scriptingURL;
@property (nonatomic) SKDownloadStatus scriptingStatus;
@property (class, nonatomic, readonly) NSImage *deleteImage;
@@ -97,7 +99,7 @@
@property (class, nonatomic, readonly) NSImage *cancelImage;
@property (class, nonatomic, readonly) NSImage *resumeImage;
-- (instancetype)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithURL:(nullable NSURL *)aURL;
- (instancetype)initWithProperties:(NSDictionary *)properties;
- (void)start;
@@ -114,3 +116,5 @@
- (void)downloadDidFailWithError:(NSError *)error;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDownloadController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -40,6 +40,7 @@
#import <Quartz/Quartz.h>
#import "SKTableView.h"
+NS_ASSUME_NONNULL_BEGIN
@class SKDownload;
@@ -56,19 +57,19 @@
NSMutableDictionary *touchBarItems;
}
-@property (nonatomic, strong) IBOutlet SKTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSButton *clearButton;
+@property (nonatomic, nullable, strong) IBOutlet SKTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *clearButton;
@property (class, nonatomic, readonly) SKDownloadController
*sharedDownloadController;
-- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
+- (nullable SKDownload *)addDownloadForURL:(nullable NSURL *)aURL;
- (void)removeObjectFromDownloads:(SKDownload *)download;
-- (IBAction)showDownloadPreferences:(id)sender;
-- (IBAction)clearDownloads:(id)sender;
+- (IBAction)showDownloadPreferences:(nullable id)sender;
+- (IBAction)clearDownloads:(nullable id)sender;
-- (IBAction)moveToTrash:(id)sender;
+- (IBAction)moveToTrash:(nullable id)sender;
- (NSArray *)downloads;
- (NSUInteger)countOfDownloads;
@@ -83,7 +84,9 @@
- (void)setupToolbar;
-- (NSURLSessionDownloadTask *)newDownloadTaskForDownload:(SKDownload
*)download;
+- (nullable NSURLSessionDownloadTask *)newDownloadTaskForDownload:(SKDownload
*)download;
- (void)removeDownloadTask:(NSURLSessionDownloadTask *)task;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDownloadPreferenceController.h
===================================================================
--- trunk/SKDownloadPreferenceController.h 2023-12-16 15:25:09 UTC (rev
13908)
+++ trunk/SKDownloadPreferenceController.h 2023-12-17 14:38:46 UTC (rev
13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKDownloadPreferenceController : NSWindowController
<NSTouchBarDelegate> {
NSButton *doneButton;
@@ -44,9 +45,11 @@
NSPopUpButton *downloadsFolderPopUp;
}
-@property (nonatomic, strong) IBOutlet NSButton *doneButton;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *downloadsFolderPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *doneButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*downloadsFolderPopUp;
-- (IBAction)chooseDownloadsFolder:(id)sender;
+- (IBAction)chooseDownloadsFolder:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKDragImageView.h
===================================================================
--- trunk/SKDragImageView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKDragImageView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol SKDragImageViewDelegate;
@interface SKDragImageView : NSImageView <NSDraggingSource> {
@@ -44,10 +46,10 @@
__weak id <SKDragImageViewDelegate> delegate;
}
-@property (nonatomic, weak) id <SKDragImageViewDelegate> delegate;
+@property (nonatomic, nullable, weak) id <SKDragImageViewDelegate> delegate;
-- (IBAction)show:(id)sender;
-- (IBAction)togglePreviewPanel:(id)sender;
+- (IBAction)show:(nullable id)sender;
+- (IBAction)togglePreviewPanel:(nullable id)sender;
@end
@@ -55,7 +57,9 @@
@protocol SKDragImageViewDelegate <NSObject>
@optional
-- (id<NSPasteboardWriting>)draggedObjectForDragImageView;
+- (nullable id<NSPasteboardWriting>)draggedObjectForDragImageView;
- (void)showImageForDragImageView;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKExportAccessoryController.h
===================================================================
--- trunk/SKExportAccessoryController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKExportAccessoryController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKExportAccessoryController : NSViewController {
NSPopUpButton *formatPopUpButton;
@@ -45,10 +46,12 @@
BOOL hasExportOptions, allowsEmbeddedOptions;
}
-@property (nonatomic, strong) IBOutlet NSPopUpButton *formatPopUpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*formatPopUpButton;
@property (nonatomic) BOOL hasExportOptions, allowsEmbeddedOption;
-@property (nonatomic, readonly) NSString *selectedFileType;
-@property (nonatomic, strong) NSSavePanel *savePanel;
+@property (nonatomic, nullable, readonly) NSString *selectedFileType;
+@property (nonatomic, nullable, strong) NSSavePanel *savePanel;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFDFParser.h
===================================================================
--- trunk/SKFDFParser.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFDFParser.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
typedef const char *SKFDFString;
extern SKFDFString SKFDFFDFKey;
@@ -115,7 +117,7 @@
@interface SKFDFParser : NSObject
-+ (NSArray *)noteDictionariesFromFDFData:(NSData *)data;
++ (nullable NSArray *)noteDictionariesFromFDFData:(NSData *)data;
@end
@@ -122,3 +124,5 @@
@interface NSMutableString (SKFDFExtensions)
- (void)appendFDFName:(SKFDFString)name;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFileShare.h
===================================================================
--- trunk/SKFileShare.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFileShare.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKFileShare : NSObject <NSSharingServiceDelegate> {
NSURL *fileURL;
@@ -46,10 +47,12 @@
id strongSelf;
}
-@property (nonatomic, strong) NSURL *fileURL;
-@property (nonatomic, strong) NSSharingService *sharingService;
-@property (nonatomic, copy) void (^completionHandler)(BOOL success);
+@property (nonatomic, nullable, strong) NSURL *fileURL;
+@property (nonatomic, nullable, strong) NSSharingService *sharingService;
+@property (nonatomic, nullable, copy) void (^completionHandler)(BOOL success);
-+ (void)shareURL:(NSURL *)aFileURL preparedByTask:(NSTask *)task
usingService:(NSSharingService *)aSharingService completionHandler:(void
(^)(BOOL success))aCompletionHandler;
++ (void)shareURL:(NSURL *)aFileURL preparedByTask:(NSTask *)task
usingService:(NSSharingService *)aSharingService completionHandler:(nullable
void (^)(BOOL success))aCompletionHandler;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFileUpdateChecker.h
===================================================================
--- trunk/SKFileUpdateChecker.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFileUpdateChecker.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKFileUpdateChecker : NSObject {
__weak NSDocument *document;
@@ -70,3 +71,5 @@
- (void)didUpdateFromURL:(NSURL *)fileURL;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFindController.h
===================================================================
--- trunk/SKFindController.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFindController.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol SKFindControllerDelegate;
@interface SKFindController : NSViewController {
@@ -52,20 +54,20 @@
BOOL didChange;
}
-@property (nonatomic, strong) IBOutlet NSSearchField *findField;
-@property (nonatomic, strong) IBOutlet NSTextField *messageField;
-@property (nonatomic, strong) IBOutlet NSButton *doneButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *navigationButton;
-@property (nonatomic, strong) IBOutlet NSObjectController *ownerController;
-@property (nonatomic, weak) id <SKFindControllerDelegate> delegate;
-@property (nonatomic, strong) NSString *findString;
+@property (nonatomic, nullable, strong) IBOutlet NSSearchField *findField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *messageField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *doneButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*navigationButton;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*ownerController;
+@property (nonatomic, nullable, weak) id <SKFindControllerDelegate> delegate;
+@property (nonatomic, nullable, strong) NSString *findString;
- (void)findForward:(BOOL)forward;
- (void)updateFindPboard;
-- (IBAction)find:(id)sender;
-- (IBAction)remove:(id)sender;
-- (IBAction)toggleCaseInsensitiveFind:(id)sender;
+- (IBAction)find:(nullable id)sender;
+- (IBAction)remove:(nullable id)sender;
+- (IBAction)toggleCaseInsensitiveFind:(nullable id)sender;
- (void)didAddFindBar;
@@ -76,3 +78,5 @@
- (BOOL)findString:(NSString *)string forward:(BOOL)forward;
- (void)removeFindController;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFontWell.h
===================================================================
--- trunk/SKFontWell.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFontWell.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface SKFontWell : NSButton {
id target;
SEL action;
@@ -48,14 +50,14 @@
@property (nonatomic, getter=isActive) BOOL active;
@property (nonatomic, copy) NSString *fontName;
@property (nonatomic) CGFloat fontSize;
-@property (nonatomic, copy) NSColor *textColor;
+@property (nonatomic, nullable, copy) NSColor *textColor;
@property (nonatomic) BOOL hasTextColor;
- (void)activate;
- (void)deactivate;
-- (void)changeFontFromFontManager:(id)sender;
-- (void)changeAttributesFromFontManager:(id)sender;
+- (void)changeFontFromFontManager:(nullable id)sender;
+- (void)changeAttributesFromFontManager:(nullable id)sender;
@end
@@ -65,7 +67,9 @@
BOOL hasTextColor;
}
-@property (nonatomic, copy) NSColor *textColor;
+@property (nonatomic, nullable, copy) NSColor *textColor;
@property (nonatomic) BOOL hasTextColor;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKFullScreenWindow.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import "SKMainWindow.h"
+NS_ASSUME_NONNULL_BEGIN
@interface SKFullScreenWindow : SKMainWindow <NSAnimationDelegate>
@@ -50,3 +51,5 @@
@interface NSWindowController (SKMainFullScreenWindow)
- (BOOL)handleRightMouseDown:(NSEvent *)theEvent;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKGeneralPreferences.h
===================================================================
--- trunk/SKGeneralPreferences.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKGeneralPreferences.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import "SKPreferenceController.h"
+NS_ASSUME_NONNULL_BEGIN
@interface SKGeneralPreferences : NSViewController <SKPreferencePane> {
NSPopUpButton *updateIntervalPopUpButton;
@@ -45,9 +46,11 @@
NSInteger updateInterval;
}
-@property (nonatomic, strong) IBOutlet NSPopUpButton
*updateIntervalPopUpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*updateIntervalPopUpButton;
@property (nonatomic) NSInteger updateInterval;
-- (IBAction)changePDFViewSettings:(id)sender;
+- (IBAction)changePDFViewSettings:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKGroupedSearchResult.h
===================================================================
--- trunk/SKGroupedSearchResult.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKGroupedSearchResult.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *SKGroupedSearchResultCountKey;
@interface SKGroupedSearchResult : NSObject {
@@ -60,3 +62,5 @@
- (void)addMatch:(PDFSelection *)match;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKHighlightingTableRowView.h
===================================================================
--- trunk/SKHighlightingTableRowView.h 2023-12-16 15:25:09 UTC (rev 13908)
+++ trunk/SKHighlightingTableRowView.h 2023-12-17 14:38:46 UTC (rev 13909)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface SKHighlightingTableRowView : NSTableRowView {
NSInteger highlightLevel;
@@ -45,3 +46,5 @@
}
@property (nonatomic) NSInteger highlightLevel;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/SKImageToolTipContext.h
===================================================================
--- trunk/SKImageToolTipContext.h 2023-12-16 15:25:09 UTC (rev 13908)
@@ 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
