Revision: 29026 http://sourceforge.net/p/bibdesk/svn/29026 Author: hofman Date: 2025-02-19 10:41:39 +0000 (Wed, 19 Feb 2025) Log Message: ----------- add nullability to view classes
Modified Paths: -------------- trunk/bibdesk/BDSKAddressTextField.h trunk/bibdesk/BDSKAddressTextFieldCell.h trunk/bibdesk/BDSKButtonBar.h trunk/bibdesk/BDSKColorCell.h trunk/bibdesk/BDSKColorLabelWell.h trunk/bibdesk/BDSKColorRowView.h trunk/bibdesk/BDSKColoredView.h trunk/bibdesk/BDSKComboBoxCell.h trunk/bibdesk/BDSKComplexStringCell.h trunk/bibdesk/BDSKControlTableCellView.h trunk/bibdesk/BDSKDragImageView.h trunk/bibdesk/BDSKDragTextField.h trunk/bibdesk/BDSKEdgeView.h trunk/bibdesk/BDSKEditorTableView.h trunk/bibdesk/BDSKEditorTextField.h trunk/bibdesk/BDSKEditorTextView.h trunk/bibdesk/BDSKEmbeddedButton.h trunk/bibdesk/BDSKFieldEditor.h trunk/bibdesk/BDSKFilePathCell.h trunk/bibdesk/BDSKFindFieldEditor.h trunk/bibdesk/BDSKFlippedView.h trunk/bibdesk/BDSKFontWell.h trunk/bibdesk/BDSKFormatTextField.h trunk/bibdesk/BDSKGradientView.h trunk/bibdesk/BDSKGroupBubbleView.h trunk/bibdesk/BDSKGroupCellView.h trunk/bibdesk/BDSKGroupImageView.h trunk/bibdesk/BDSKGroupOutlineView.h trunk/bibdesk/BDSKGroupParentCell.h trunk/bibdesk/BDSKGroupRowView.h trunk/bibdesk/BDSKGroupTextFieldCell.h trunk/bibdesk/BDSKHighlightingPopUpButton.h trunk/bibdesk/BDSKImagePopUpButton.h trunk/bibdesk/BDSKImagePopUpButtonCell.h trunk/bibdesk/BDSKImportTextView.h trunk/bibdesk/BDSKLevelIndicatorCell.h trunk/bibdesk/BDSKLineNumberView.h trunk/bibdesk/BDSKLineTextField.h trunk/bibdesk/BDSKMainTableView.h trunk/bibdesk/BDSKNotesOutlineView.h trunk/bibdesk/BDSKOutlineView.h trunk/bibdesk/BDSKPreferenceWindow.h trunk/bibdesk/BDSKRatingButton.h trunk/bibdesk/BDSKRatingButtonCell.h trunk/bibdesk/BDSKResizeView.h trunk/bibdesk/BDSKScriptMenu.h trunk/bibdesk/BDSKScrollableTextField.h trunk/bibdesk/BDSKSecureTextField.h trunk/bibdesk/BDSKSplitView.h trunk/bibdesk/BDSKStatusBar.h trunk/bibdesk/BDSKTableView.h trunk/bibdesk/BDSKTextImportItemTableView.h trunk/bibdesk/BDSKTextWithIconCell.h trunk/bibdesk/BDSKToolbarItem.h trunk/bibdesk/BDSKWebGroupViewController.m trunk/bibdesk/BDSKWebView.h trunk/bibdesk/BDSKWrappingView.h trunk/bibdesk/BDSKZoomablePDFView.h trunk/bibdesk/BDSKZoomableTextView.h Modified: trunk/bibdesk/BDSKAddressTextField.h =================================================================== --- trunk/bibdesk/BDSKAddressTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKAddressTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKDragTextField.h" +NS_ASSUME_NONNULL_BEGIN @interface BDSKAddressTextField : BDSKDragTextField { NSImageView *imageView; @@ -48,8 +49,10 @@ @property (nonatomic, readonly) NSButton *button; @property (nonatomic, readonly) NSImageView *imageView; -@property (nonatomic, strong) NSURL *URL; +@property (nonatomic, nullable, strong) NSURL *URL; @property (nonatomic, readonly) NSArray *subcontrols; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKAddressTextFieldCell.h =================================================================== --- trunk/bibdesk/BDSKAddressTextFieldCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKAddressTextFieldCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKAddressTextFieldCell : NSTextFieldCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKButtonBar.h =================================================================== --- trunk/bibdesk/BDSKButtonBar.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKButtonBar.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @class BDSKImagePopUpButton; @@ -52,8 +53,8 @@ SEL action, addAction, removeAction; } -@property (nonatomic, weak) id target; -@property (nonatomic) SEL action, addAction, removeAction; +@property (nonatomic, nullable, weak) id target; +@property (nonatomic, nullable) SEL action, addAction, removeAction; @property (nonatomic) BOOL hasAddButton, hasRemoveButton; @@ -62,6 +63,8 @@ - (void)addButtonWithIdentifier:(NSString *)identifier title:(NSString *)title; - (void)removeButtonWithIdentifier:(NSString *)identifier reuse:(BOOL)reuse; -@property (nonatomic, weak) NSString *selectedIdentifier; +@property (nonatomic, nullable, weak) NSString *selectedIdentifier; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKColorCell.h =================================================================== --- trunk/bibdesk/BDSKColorCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKColorCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,8 +38,12 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + @interface BDSKColorView : NSControl @end @interface BDSKColorCell : NSCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKColorLabelWell.h =================================================================== --- trunk/bibdesk/BDSKColorLabelWell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKColorLabelWell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKColorLabelWell : NSColorWell { NSArray *buttons; @@ -51,8 +52,10 @@ @property (nonatomic) CGFloat margin; -@property (nonatomic, copy) NSString *title; +@property (nonatomic, nullable, copy) NSString *title; @property (nonatomic) BOOL showLabel; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKColorRowView.h =================================================================== --- trunk/bibdesk/BDSKColorRowView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKColorRowView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,11 +38,14 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKColorRowView : NSTableRowView { NSColor *color; } -@property (nonatomic, strong) NSColor *color; +@property (nonatomic, nullable, strong) NSColor *color; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKColoredView.h =================================================================== --- trunk/bibdesk/BDSKColoredView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKColoredView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,11 +38,14 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKColoredView : NSView { NSColor *backgroundColor; } -@property (nonatomic, strong) NSColor *backgroundColor; +@property (nonatomic, nullable, strong) NSColor *backgroundColor; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKComboBoxCell.h =================================================================== --- trunk/bibdesk/BDSKComboBoxCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKComboBoxCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKComboBoxCell : NSComboBoxCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKComplexStringCell.h =================================================================== --- trunk/bibdesk/BDSKComplexStringCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKComplexStringCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,10 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKComplexStringCell : NSTextFieldCell @end + +NS_ASSUME_NONNULL_END + Modified: trunk/bibdesk/BDSKControlTableCellView.h =================================================================== --- trunk/bibdesk/BDSKControlTableCellView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKControlTableCellView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,11 +38,14 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKControlTableCellView : NSTableCellView { __weak NSControl *control; } -@property (nonatomic, weak) IBOutlet NSControl *control; +@property (nonatomic, nullable, weak) IBOutlet NSControl *control; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKDragImageView.h =================================================================== --- trunk/bibdesk/BDSKDragImageView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKDragImageView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,8 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + @class BDSKDragImageView; @protocol BDSKDragImageViewDelegate <NSObject> @@ -55,8 +57,10 @@ NSDragOperation draggingsourceOperationMask, localDraggingsourceOperationMask; } -@property (nonatomic, weak) id<BDSKDragImageViewDelegate> delegate; +@property (nonatomic, nullable, weak) id<BDSKDragImageViewDelegate> delegate; - (void)setDraggingSourceOperationMask:(NSDragOperation)mask forLocal:(BOOL)isLocal; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKDragTextField.h =================================================================== --- trunk/bibdesk/BDSKDragTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKDragTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,8 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + @class BDSKDragTextField; @protocol BDSKDragTextFieldDelegate <NSTextFieldDelegate> @@ -50,5 +52,7 @@ @interface BDSKDragTextField : NSTextField { BOOL highlighted; } -@property (weak) id<BDSKDragTextFieldDelegate> delegate; +@property (nullable, weak) id<BDSKDragTextFieldDelegate> delegate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKEdgeView.h =================================================================== --- trunk/bibdesk/BDSKEdgeView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKEdgeView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN typedef NS_OPTIONS(NSUInteger, BDSKRectEdgeMask) { BDSKNoEdgeMask = 0, @@ -63,22 +64,24 @@ @property (nonatomic, readonly) NSRect contentRect; -@property (nonatomic, strong) NSView *backgroundView; +@property (nonatomic, nullable, strong) NSView *backgroundView; @property (nonatomic) BDSKRectEdgeMask edges; -@property (nonatomic, copy) NSArray *backgroundColors; +@property (nonatomic, nullable, copy) NSArray *backgroundColors; -@property (nonatomic, copy) NSArray *edgeColors; -- (void)setEdgeColor:(NSColor *)aColor; +@property (nonatomic, nullable, copy) NSArray *edgeColors; +- (void)setEdgeColor:(nullable NSColor *)aColor; -- (NSColor *)colorForEdge:(NSRectEdge)edge; -- (void)setColor:(NSColor *)aColor forEdge:(NSRectEdge)edge; +- (nullable NSColor *)colorForEdge:(NSRectEdge)edge; +- (void)setColor:(nullable NSColor *)aColor forEdge:(NSRectEdge)edge; @property (nonatomic) NSInteger tag; @property (nonatomic, getter=isReflectViewEnabled) BOOL reflectViewEnabled; -- (void)reflectScrollView:(NSScrollView *)scrollView animate:(BOOL)animate; +- (void)reflectScrollView:(nullable NSScrollView *)scrollView animate:(BOOL)animate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKEditorTableView.h =================================================================== --- trunk/bibdesk/BDSKEditorTableView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKEditorTableView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKEditorTableView : NSTableView @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKEditorTextField.h =================================================================== --- trunk/bibdesk/BDSKEditorTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKEditorTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -40,6 +40,8 @@ #import "BDSKComplexStringCell.h" #import "BDSKEmbeddedButton.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKDragButton; @interface BDSKEditorTextField : NSTextField { @@ -46,8 +48,8 @@ BDSKDragButton *button; SEL buttonAction; } -@property (nonatomic) SEL buttonAction; -@property (nonatomic, strong) id representedObject; +@property (nonatomic, nullable) SEL buttonAction; +@property (nonatomic, nullable, strong) id representedObject; @end @@ -63,3 +65,5 @@ @interface BDSKDragButtonCell : NSButtonCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKEditorTextView.h =================================================================== --- trunk/bibdesk/BDSKEditorTextView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKEditorTextView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKEditorTextView : NSTextView { BOOL usesDefaultFont; @@ -44,3 +45,5 @@ } @property (nonatomic) BOOL usesDefaultFont; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKEmbeddedButton.h =================================================================== --- trunk/bibdesk/BDSKEmbeddedButton.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKEmbeddedButton.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKEmbeddedButton : NSButton @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFieldEditor.h =================================================================== --- trunk/bibdesk/BDSKFieldEditor.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFieldEditor.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @protocol BDSKFieldEditorDelegate <NSTextViewDelegate> @optional @@ -57,7 +58,7 @@ BOOL isCompleting; } - (void)registerForDelegatedDraggedTypes:(NSArray *)pboardTypes; -@property (weak) id<BDSKFieldEditorDelegate> delegate; +@property (nullable, weak) id<BDSKFieldEditorDelegate> delegate; @end // the above delegate methods could be implemented by calling these delegate methods for NSControl subclasses that actually have a delegate @@ -78,3 +79,5 @@ @interface NSTableView (BDSKFieldEditorDelegate) <BDSKFieldEditorDelegate> @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFilePathCell.h =================================================================== --- trunk/bibdesk/BDSKFilePathCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFilePathCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKTextWithIconCell.h" +NS_ASSUME_NONNULL_BEGIN @interface BDSKFilePathCell : BDSKTextWithIconCell @end @@ -46,3 +47,5 @@ @interface BDSKFilePathFormatter : NSFormatter @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFindFieldEditor.h =================================================================== --- trunk/bibdesk/BDSKFindFieldEditor.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFindFieldEditor.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN -@interface BDSKFindFieldEditor : NSTextView {} +@interface BDSKFindFieldEditor : NSTextView @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFlippedView.h =================================================================== --- trunk/bibdesk/BDSKFlippedView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFlippedView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,7 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKFlippedView : NSView +@end -@end +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFontWell.h =================================================================== --- trunk/bibdesk/BDSKFontWell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFontWell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKFontWell : NSButton { __weak id target; @@ -52,7 +53,7 @@ @property (nonatomic, strong) NSString *fontName; @property (nonatomic) CGFloat fontSize; -- (void)changeFontFromFontManager:(id)sender; +- (void)changeFontFromFontManager:(nullable id)sender; @end @@ -59,3 +60,5 @@ @interface BDSKFontWellCell : NSButtonCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKFormatTextField.h =================================================================== --- trunk/bibdesk/BDSKFormatTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKFormatTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @protocol BDSKFormatTextFieldDelegate <NSTextFieldDelegate> - (void)controlTextDidChangeSelection:(NSNotification *)notification; @@ -45,7 +46,8 @@ @interface BDSKFormatTextField : NSTextField -@property (weak) id<BDSKFormatTextFieldDelegate> delegate; +@property (nullable, weak) id<BDSKFormatTextFieldDelegate> delegate; @end +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGradientView.h =================================================================== --- trunk/bibdesk/BDSKGradientView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGradientView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGradientView : NSView { @@ -45,6 +46,9 @@ NSArray *backgroundColors; } -@property (nonatomic, copy) NSArray *backgroundColors; +@property (nonatomic, nullable, copy) NSArray *backgroundColors; @end + +NS_ASSUME_NONNULL_END + Modified: trunk/bibdesk/BDSKGroupBubbleView.h =================================================================== --- trunk/bibdesk/BDSKGroupBubbleView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupBubbleView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupBubbleView : NSImageView { NSVisualEffectView *bgView; @@ -46,3 +47,5 @@ @interface BDSKGroupBubbleCell : NSImageCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGroupCellView.h =================================================================== --- trunk/bibdesk/BDSKGroupCellView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupCellView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupCellView : NSTableCellView { __weak NSTextField *nameField; @@ -46,11 +47,13 @@ __weak NSProgressIndicator *progressIndicator; } -@property (nonatomic, weak) IBOutlet NSTextField *nameField; -@property (nonatomic, weak) IBOutlet NSTextField *labelField; -@property (nonatomic, weak) IBOutlet NSImageView *bubbleView; -@property (nonatomic, weak) IBOutlet NSProgressIndicator *progressIndicator; +@property (nonatomic, nullable, weak) IBOutlet NSTextField *nameField; +@property (nonatomic, nullable, weak) IBOutlet NSTextField *labelField; +@property (nonatomic, nullable, weak) IBOutlet NSImageView *bubbleView; +@property (nonatomic, nullable, weak) IBOutlet NSProgressIndicator *progressIndicator; -@property (nonatomic, strong) NSFont *font; +@property (nonatomic, nullable, strong) NSFont *font; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGroupImageView.h =================================================================== --- trunk/bibdesk/BDSKGroupImageView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupImageView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupImageView : NSImageView @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGroupOutlineView.h =================================================================== --- trunk/bibdesk/BDSKGroupOutlineView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupOutlineView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKOutlineView.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKGroupOutlineView; @protocol BDSKGroupOutlineViewDelegate <BDSKOutlineViewDelegate> @@ -56,6 +58,8 @@ @property (nonatomic) CGFloat alternateRowHeight; -@property (weak) id<BDSKGroupOutlineViewDelegate> delegate; +@property (nullable, weak) id<BDSKGroupOutlineViewDelegate> delegate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGroupParentCell.h =================================================================== --- trunk/bibdesk/BDSKGroupParentCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupParentCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,10 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupParentCell : NSTextFieldCell @end + +NS_ASSUME_NONNULL_END + Modified: trunk/bibdesk/BDSKGroupRowView.h =================================================================== --- trunk/bibdesk/BDSKGroupRowView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupRowView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupRowView : NSTableRowView { BOOL highlighted; @@ -47,3 +48,5 @@ @property (nonatomic, getter=isHighlighted) BOOL highlighted; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKGroupTextFieldCell.h =================================================================== --- trunk/bibdesk/BDSKGroupTextFieldCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKGroupTextFieldCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKGroupTextFieldCell : NSTextFieldCell { BOOL displayAsColor; @@ -46,3 +47,5 @@ @property (nonatomic) BOOL displayAsColor; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKHighlightingPopUpButton.h =================================================================== --- trunk/bibdesk/BDSKHighlightingPopUpButton.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKHighlightingPopUpButton.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKHighlightingPopUpButton : NSPopUpButton @end @@ -45,3 +46,5 @@ @interface BDSKHighlightingPopUpButtonCell : NSPopUpButtonCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKImagePopUpButton.h =================================================================== --- trunk/bibdesk/BDSKImagePopUpButton.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKImagePopUpButton.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKImagePopUpButton : NSPopUpButton @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.h =================================================================== --- trunk/bibdesk/BDSKImagePopUpButtonCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKImagePopUpButtonCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,7 +39,11 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + @interface BDSKImagePopUpButtonCell : NSPopUpButtonCell { NSButtonCell *buttonCell; } @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKImportTextView.h =================================================================== --- trunk/bibdesk/BDSKImportTextView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKImportTextView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,7 +38,10 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKImportTextView : NSTextView -- (IBAction)makePlainText:(id)sender; +- (IBAction)makePlainText:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKLevelIndicatorCell.h =================================================================== --- trunk/bibdesk/BDSKLevelIndicatorCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKLevelIndicatorCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKLevelIndicator : NSLevelIndicator @end @@ -44,3 +45,5 @@ @interface BDSKLevelIndicatorCell : NSLevelIndicatorCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKLineNumberView.h =================================================================== --- trunk/bibdesk/BDSKLineNumberView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKLineNumberView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKLineNumberView : NSRulerView { NSPointerArray *lineCharacterIndexes; @@ -45,3 +46,5 @@ } @property (nonatomic, readonly) CGFloat requiredRuleThickness; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKLineTextField.h =================================================================== --- trunk/bibdesk/BDSKLineTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKLineTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,7 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKLineTextField : NSTextField @end +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKMainTableView.h =================================================================== --- trunk/bibdesk/BDSKMainTableView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKMainTableView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -35,12 +35,13 @@ #import <Cocoa/Cocoa.h> #import "BDSKTableView.h" +NS_ASSUME_NONNULL_BEGIN @protocol BDSKMainTableViewDelegate <BDSKTableViewDelegate> @optional - (NSDictionary *)defaultColumnWidthsForTableView:(NSTableView *)aTableView; - (void)tableView:(NSTableView *)aTableView openParentForItemAtRow:(NSInteger)rowIndex; -- (NSColor *)tableView:(NSTableView *)aTableView highlightColorForRow:(NSInteger)rowIndex; +- (nullable NSColor *)tableView:(NSTableView *)aTableView highlightColorForRow:(NSInteger)rowIndex; @end @@ -68,21 +69,21 @@ - (void)removeTableColumnWithIdentifier:(NSString *)identifier; - (void)updateTableColumnTypes; -- (NSImage *)cellImageForField:(NSString *)field; +- (nullable NSImage *)cellImageForField:(NSString *)field; -- (NSTableCellView *)makeViewForTableColumn:(NSTableColumn *)tableColumn owner:(id)owner; +- (nullable NSTableCellView *)makeViewForTableColumn:(NSTableColumn *)tableColumn owner:(nullable id)owner; @property (nonatomic, readonly) NSArray *tableColumnIdentifiers; - (void)scrollRowToCenter:(NSUInteger)row; -- (void)alternateDelete:(id)sender; -- (void)alternateCut:(id)sender; +- (void)alternateDelete:(nullable id)sender; +- (void)alternateCut:(nullable id)sender; @property (nonatomic, readonly) BOOL canAlternateDelete; @property (nonatomic, readonly) BOOL canAlternateCut; -@property (weak) id<BDSKMainTableViewDelegate> delegate; -@property (weak) id <BDSKMainTableViewDataSource> dataSource; +@property (nullable, weak) id<BDSKMainTableViewDelegate> delegate; +@property (nullable, weak) id <BDSKMainTableViewDataSource> dataSource; @end @@ -110,3 +111,4 @@ @interface BDSKMainTableHeaderView : NSTableHeaderView @end +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKNotesOutlineView.h =================================================================== --- trunk/bibdesk/BDSKNotesOutlineView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKNotesOutlineView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKOutlineView.h" +NS_ASSUME_NONNULL_BEGIN @protocol BDSKNotesOutlineViewDelegate <BDSKOutlineViewDelegate> @optional @@ -50,7 +51,7 @@ @interface BDSKNotesOutlineView : BDSKOutlineView { NSImageCell *resizeIndicatorCell; } -@property (weak) id<BDSKNotesOutlineViewDelegate> delegate; +@property (nullable, weak) id<BDSKNotesOutlineViewDelegate> delegate; @end @@ -58,3 +59,5 @@ NSImageCell *resizeIndicatorCell; } @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKOutlineView.h =================================================================== --- trunk/bibdesk/BDSKOutlineView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKOutlineView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKTypeSelectHelper.h" +NS_ASSUME_NONNULL_BEGIN + @protocol BDSKOutlineViewDelegate <NSOutlineViewDelegate> @optional @@ -79,36 +81,38 @@ } - (NSArray *)itemsAtRowIndexes:(NSIndexSet *)indexes; -@property (nonatomic, readonly) NSArray *selectedItems; -@property (nonatomic, readonly) NSArray *clickedOrSelectedItems; +@property (nonatomic, nullable, readonly) NSArray *selectedItems; +@property (nonatomic, nullable, readonly) NSArray *clickedOrSelectedItems; -@property (nonatomic, strong) BDSKTypeSelectHelper *typeSelectHelper; +@property (nonatomic, nullable, strong) BDSKTypeSelectHelper *typeSelectHelper; -- (void)changeFont:(id)sender; +- (void)changeFont:(nullable id)sender; - (void)outlineViewFontChanged; - (CGFloat)rowHeightForFont:(NSFont *)font; -- (void)updateFontPanel:(NSNotification *)notification; +- (void)updateFontPanel:(nullable NSNotification *)notification; -@property (nonatomic, strong) NSString *fontNamePreferenceKey; -@property (nonatomic, strong) NSString *fontSizePreferenceKey; +@property (nonatomic, nullable, strong) NSString *fontNamePreferenceKey; +@property (nonatomic, nullable, strong) NSString *fontSizePreferenceKey; -- (void)moveUp:(id)sender; -- (void)moveDown:(id)sender; -- (void)scrollToBeginningOfDocument:(id)sender; -- (void)scrollToEndOfDocument:(id)sender; -- (void)insertNewline:(id)sender; -- (void)insertSpace:(id)sender; -- (void)insertShiftSpace:(id)sender; +- (void)moveUp:(nullable id)sender; +- (void)moveDown:(nullable id)sender; +- (void)scrollToBeginningOfDocument:(nullable id)sender; +- (void)scrollToEndOfDocument:(nullable id)sender; +- (void)insertNewline:(nullable id)sender; +- (void)insertSpace:(nullable id)sender; +- (void)insertShiftSpace:(nullable id)sender; -- (void)delete:(id)sender; -- (void)copy:(id)sender; -- (void)cut:(id)sender; -- (void)paste:(id)sender; -- (void)duplicate:(id)sender; +- (void)delete:(nullable id)sender; +- (void)copy:(nullable id)sender; +- (void)cut:(nullable id)sender; +- (void)paste:(nullable id)sender; +- (void)duplicate:(nullable id)sender; @property (nonatomic, readonly) BOOL canDelete, canCopy, canCut, canPaste, canDuplicate; -@property (weak) id <BDSKOutlineViewDelegate> delegate; -@property (weak) id<BDSKOutlineViewDataSource> dataSource; +@property (nullable, weak) id <BDSKOutlineViewDelegate> delegate; +@property (nullable, weak) id<BDSKOutlineViewDataSource> dataSource; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKPreferenceWindow.h =================================================================== --- trunk/bibdesk/BDSKPreferenceWindow.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKPreferenceWindow.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKPreferenceWindow : NSWindow @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKRatingButton.h =================================================================== --- trunk/bibdesk/BDSKRatingButton.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKRatingButton.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,11 +39,13 @@ #import <Cocoa/Cocoa.h> #import "BDSKRatingButtonCell.h" +NS_ASSUME_NONNULL_BEGIN -@interface BDSKRatingButton : NSButton { -} +@interface BDSKRatingButton : NSButton @property (nonatomic) NSUInteger rating; @property (nonatomic) NSUInteger maxRating; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKRatingButtonCell.h =================================================================== --- trunk/bibdesk/BDSKRatingButtonCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKRatingButtonCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKRatingButtonCell : NSButtonCell { NSUInteger rating; @@ -50,3 +51,5 @@ @property (nonatomic) NSUInteger maxRating; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKResizeView.h =================================================================== --- trunk/bibdesk/BDSKResizeView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKResizeView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKResizeView : NSSplitView { NSLayoutConstraint *constraint; @@ -45,8 +46,10 @@ CGFloat maxValue; } -@property (nonatomic, strong) IBOutlet NSLayoutConstraint *constraint; +@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint *constraint; @property (nonatomic) CGFloat minValue, maxValue; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKScriptMenu.h =================================================================== --- trunk/bibdesk/BDSKScriptMenu.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKScriptMenu.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,10 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + @interface NSApplication (BDSKScriptMenu) @property (nonatomic, readonly) NSMenu *scriptMenu; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKScrollableTextField.h =================================================================== --- trunk/bibdesk/BDSKScrollableTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKScrollableTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSInteger, BDSKScrollButton) { BDSKScrollLeftButton = 0, @@ -44,8 +45,8 @@ BDSKScrollRightButton = 1 }; - -@interface BDSKScrollableTextField : NSTextField { -} +@interface BDSKScrollableTextField : NSTextField @property (nonatomic) CGFloat scrollAmount; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKSecureTextField.h =================================================================== --- trunk/bibdesk/BDSKSecureTextField.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKSecureTextField.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKSecureTextField : NSSecureTextField { BOOL showsText; @@ -58,3 +59,5 @@ @interface BDSKUnsecureTextFieldCell : NSTextFieldCell @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKSplitView.h =================================================================== --- trunk/bibdesk/BDSKSplitView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKSplitView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKSplitView : NSSplitView { BOOL animating; @@ -45,3 +46,5 @@ @property (nonatomic, readonly, getter=isAnimating) BOOL animating; - (void)setPosition:(CGFloat)position ofDividerAtIndex:(NSInteger)dividerIndex animate:(BOOL)animate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKStatusBar.h =================================================================== --- trunk/bibdesk/BDSKStatusBar.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKStatusBar.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,8 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + typedef NS_ENUM(NSInteger, BDSKProgressIndicatorStyle) { BDSKProgressIndicatorStyleNone = 0, BDSKProgressIndicatorStyleIndeterminate = 1, @@ -44,12 +46,11 @@ BDSKProgressIndicatorStyleDeterminate = 2 }; - @class BDSKStatusBar; @protocol BDSKStatusBarDelegate <NSObject> @optional -- (NSString *)statusBar:(BDSKStatusBar *)statusBar toolTipForIdentifier:(NSString *)identifier; +- (nullable NSString *)statusBar:(BDSKStatusBar *)statusBar toolTipForIdentifier:(NSString *)identifier; @end @@ -69,15 +70,15 @@ BOOL animating; } -- (void)toggleBelowView:(NSView *)view animate:(BOOL)animate; +- (void)toggleBelowView:(nullable NSView *)view animate:(BOOL)animate; -@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint; +@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint *bottomConstraint; @property (nonatomic, readonly, getter=isVisible) BOOL visible; -@property (nonatomic, strong) NSString *stringValue; +@property (nonatomic, nullable, strong) NSString *stringValue; -@property (nonatomic, strong) NSFont *font; +@property (nonatomic, nullable, strong) NSFont *font; @property (nonatomic) NSTextAlignment alignment; @@ -84,7 +85,7 @@ @property (nonatomic) CGFloat leftMargin; @property (nonatomic) CGFloat rightMargin; -@property (nonatomic, readonly) NSProgressIndicator *progressIndicator; +@property (nonatomic, nullable, readonly) NSProgressIndicator *progressIndicator; @property (nonatomic) BDSKProgressIndicatorStyle progressIndicatorStyle; @property (nonatomic) double progressIndicatorValue; @@ -91,12 +92,14 @@ @property (nonatomic, readonly) NSArray *iconIdentifiers; - (void)addIcon:(NSImage *)icon withIdentifier:(NSString *)identifier; -- (void)addIcon:(NSImage *)icon withIdentifier:(NSString *)identifier toolTip:(NSString *)toolTip; +- (void)addIcon:(NSImage *)icon withIdentifier:(NSString *)identifier toolTip:(nullable NSString *)toolTip; - (void)removeIconWithIdentifier:(NSString *)identifier; -- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)userData; +- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(nullable void *)userData; - (void)rebuildToolTips; -@property (nonatomic, weak) id<BDSKStatusBarDelegate> delegate; +@property (nonatomic, nullable, weak) id<BDSKStatusBarDelegate> delegate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKTableView.h =================================================================== --- trunk/bibdesk/BDSKTableView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKTableView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKTypeSelectHelper.h" +NS_ASSUME_NONNULL_BEGIN + @protocol BDSKTableViewDelegate <NSTableViewDelegate> @optional @@ -81,34 +83,36 @@ + (BOOL)shouldQueueTypeSelectHelper; -@property (nonatomic, strong) BDSKTypeSelectHelper *typeSelectHelper; +@property (nonatomic, nullable, strong) BDSKTypeSelectHelper *typeSelectHelper; -- (void)changeFont:(id)sender; +- (void)changeFont:(nullable id)sender; - (void)tableViewFontChanged; - (CGFloat)rowHeightForFont:(NSFont *)font; -- (void)updateFontPanel:(NSNotification *)notification; +- (void)updateFontPanel:(nullable NSNotification *)notification; -@property (nonatomic, strong) NSString *fontNamePreferenceKey; -@property (nonatomic, strong) NSString *fontSizePreferenceKey; +@property (nonatomic, nullable, strong) NSString *fontNamePreferenceKey; +@property (nonatomic, nullable, strong) NSString *fontSizePreferenceKey; -- (void)invertSelection:(id)sender; -- (void)moveUp:(id)sender; -- (void)moveDown:(id)sender; -- (void)scrollToBeginningOfDocument:(id)sender; -- (void)scrollToEndOfDocument:(id)sender; -- (void)insertNewline:(id)sender; -- (void)insertSpace:(id)sender; -- (void)insertShiftSpace:(id)sender; +- (void)invertSelection:(nullable id)sender; +- (void)moveUp:(nullable id)sender; +- (void)moveDown:(nullable id)sender; +- (void)scrollToBeginningOfDocument:(nullable id)sender; +- (void)scrollToEndOfDocument:(nullable id)sender; +- (void)insertNewline:(nullable id)sender; +- (void)insertSpace:(nullable id)sender; +- (void)insertShiftSpace:(nullable id)sender; -- (void)delete:(id)sender; -- (void)copy:(id)sender; -- (void)cut:(id)sender; -- (void)paste:(id)sender; -- (void)duplicate:(id)sender; +- (void)delete:(nullable id)sender; +- (void)copy:(nullable id)sender; +- (void)cut:(nullable id)sender; +- (void)paste:(nullable id)sender; +- (void)duplicate:(nullable id)sender; @property (nonatomic, readonly) BOOL canDelete, canCopy, canCut, canPaste, canDuplicate; -@property (weak) id<BDSKTableViewDelegate> delegate; -@property (weak) id<BDSKTableViewDataSource> dataSource; +@property (nullable, weak) id<BDSKTableViewDelegate> delegate; +@property (nullable, weak) id<BDSKTableViewDataSource> dataSource; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKTextImportItemTableView.h =================================================================== --- trunk/bibdesk/BDSKTextImportItemTableView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKTextImportItemTableView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKTableView.h" +NS_ASSUME_NONNULL_BEGIN @protocol BDSKTextImportItemTableViewDelegate <BDSKTableViewDelegate> - (void)tableViewDidChangeTemporaryTypeSelectMode:(NSTableView *)tView; @@ -53,6 +54,8 @@ @property (nonatomic, readonly, getter=isInTemporaryTypeSelectMode) BOOL inTemporaryTypeSelectMode; -@property (weak) id<BDSKTextImportItemTableViewDelegate> delegate; +@property (nullable, weak) id<BDSKTextImportItemTableViewDelegate> delegate; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKTextWithIconCell.h =================================================================== --- trunk/bibdesk/BDSKTextWithIconCell.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKTextWithIconCell.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,8 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN + extern NSString *BDSKTextWithIconStringKey; extern NSString *BDSKTextWithIconImageKey; @@ -63,5 +65,7 @@ #pragma mark - @interface NSFormatter (BDSKTextWithIconCell) -- (NSImage *)imageForObjectValue:(id)obj; +- (nullable NSImage *)imageForObjectValue:(id)obj; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKToolbarItem.h =================================================================== --- trunk/bibdesk/BDSKToolbarItem.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKToolbarItem.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,9 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKToolbarItem : NSToolbarItem @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKWebGroupViewController.m =================================================================== --- trunk/bibdesk/BDSKWebGroupViewController.m 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKWebGroupViewController.m 2025-02-19 10:41:39 UTC (rev 29026) @@ -88,7 +88,7 @@ [backForwardButton setMenu:menu forSegment:FORWARD_SEGMENT_INDEX]; // update the buttons, we should not be retrieving at this point - [self webView:nil setLoading:NO]; + [self webView:[self representedObject] setLoading:NO]; [urlField registerForDraggedTypes:@[(__bridge NSString *)kUTTypeURL, (__bridge NSString *)kUTTypeFileURL, NSURLPboardType, NSFilenamesPboardType]]; Modified: trunk/bibdesk/BDSKWebView.h =================================================================== --- trunk/bibdesk/BDSKWebView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKWebView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import <WebKit/WebKit.h> +NS_ASSUME_NONNULL_BEGIN + enum { BDSKWebMenuItemTagOpenLinkInBrowser = 1001, BDSKWebMenuItemTagBookmarkLink, @@ -60,13 +62,13 @@ NSTimer *urlTimer; } -@property (nonatomic, weak) id<BDSKWebViewDelegate> delegate; -@property (nonatomic, weak) id<BDSKWebViewNavigationDelegate> navigationDelegate; +@property (nonatomic, nullable, weak) id<BDSKWebViewDelegate> delegate; +@property (nonatomic, nullable, weak) id<BDSKWebViewNavigationDelegate> navigationDelegate; -@property (nonatomic, strong) NSURL *URL; +@property (nonatomic, nullable, strong) NSURL *URL; -- (IBAction)addBookmark:(id)sender; -- (IBAction)saveSource:(id)sender; +- (IBAction)addBookmark:(nullable id)sender; +- (IBAction)saveSource:(nullable id)sender; - (void)monitorURL; - (void)stopMonitoringURL; @@ -78,8 +80,8 @@ @protocol BDSKWebViewDelegate <NSObject> @optional -- (void)webView:(WebView *)sender setTitle:(NSString *)title; -- (void)webView:(WebView *)sender setStatusText:(NSString *)text; +- (void)webView:(WebView *)sender setTitle:(nullable NSString *)title; +- (void)webView:(WebView *)sender setStatusText:(nullable NSString *)text; - (WebView *)webViewCreateWebView:(WebView *)sender; - (void)webViewShow:(WebView *)sender; @@ -103,8 +105,10 @@ @protocol BDSKWebViewNavigationDelegate <NSObject> @optional -- (void)webView:(WebView *)sender setURL:(NSURL *)aURL; -- (void)webView:(WebView *)sender setIcon:(NSImage *)icon; +- (void)webView:(WebView *)sender setURL:(nullable NSURL *)aURL; +- (void)webView:(WebView *)sender setIcon:(nullable NSImage *)icon; - (void)webView:(WebView *)sender setLoading:(BOOL)loading; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKWrappingView.h =================================================================== --- trunk/bibdesk/BDSKWrappingView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKWrappingView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,9 +38,12 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKWrappingView : NSView { NSTextField *wrappingLabel; } -@property (nonatomic, strong) IBOutlet NSTextField *wrappingLabel; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *wrappingLabel; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKZoomablePDFView.h =================================================================== --- trunk/bibdesk/BDSKZoomablePDFView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKZoomablePDFView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import <Quartz/Quartz.h> +NS_ASSUME_NONNULL_BEGIN + @class BDSKBackgroundView; @interface BDSKZoomablePDFView : PDFView { @@ -48,6 +50,8 @@ @property (nonatomic, readonly) NSScrollView *scrollView; -- (IBAction)printSelection:(id)sender; +- (IBAction)printSelection:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BDSKZoomableTextView.h =================================================================== --- trunk/bibdesk/BDSKZoomableTextView.h 2025-02-19 09:45:36 UTC (rev 29025) +++ trunk/bibdesk/BDSKZoomableTextView.h 2025-02-19 10:41:39 UTC (rev 29026) @@ -38,6 +38,7 @@ #import <Cocoa/Cocoa.h> +NS_ASSUME_NONNULL_BEGIN @interface BDSKZoomableTextView : NSTextView { NSPopUpButton *scalePopUpButton; @@ -48,12 +49,14 @@ @property (nonatomic) CGFloat scaleFactor; -- (IBAction)zoomToActualSize:(id)sender; -- (IBAction)zoomIn:(id)sender; -- (IBAction)zoomOut:(id)sender; +- (IBAction)zoomToActualSize:(nullable id)sender; +- (IBAction)zoomIn:(nullable id)sender; +- (IBAction)zoomOut:(nullable id)sender; @property (nonatomic, readonly) BOOL canZoomToActualSize, canZoomIn, canZoomOut; -- (IBAction)printSelection:(id)sender; +- (IBAction)printSelection:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Bibdesk-commit mailing list Bibdesk-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-commit