Revision: 29018
http://sourceforge.net/p/bibdesk/svn/29018
Author: hofman
Date: 2025-02-17 23:14:17 +0000 (Mon, 17 Feb 2025)
Log Message:
-----------
Add nullable for some controller classes
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController.h
trunk/bibdesk/BDSKApplication.h
trunk/bibdesk/BDSKBookmarkController.h
trunk/bibdesk/BDSKBookmarkSheetController.h
trunk/bibdesk/BDSKCharacterConversion.h
trunk/bibdesk/BDSKCompletionServer.h
trunk/bibdesk/BDSKComplexStringEditor.h
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKCustomCiteDrawerController.h
trunk/bibdesk/BDSKDocumentController.h
trunk/bibdesk/BDSKDocumentInfoWindowController.h
trunk/bibdesk/BDSKEditor.h
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorManager.h
trunk/bibdesk/BDSKErrorObjectController.h
Modified: trunk/bibdesk/BDSKAppController.h
===================================================================
--- trunk/bibdesk/BDSKAppController.h 2025-02-17 22:45:48 UTC (rev 29017)
+++ trunk/bibdesk/BDSKAppController.h 2025-02-17 23:14:17 UTC (rev 29018)
@@ -36,6 +36,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKAppController : NSObject <NSApplicationDelegate,
NSMenuDelegate> {
IBOutlet NSMenu *columnsMenu;
@@ -51,24 +52,26 @@
BOOL didCheckReopen;
}
-- (IBAction)visitWebSite:(id)sender;
-- (IBAction)visitWiki:(id)sender;
-- (IBAction)reportBug:(id)sender;
-- (IBAction)requestFeature:(id)sender;
+- (IBAction)visitWebSite:(nullable id)sender;
+- (IBAction)visitWiki:(nullable id)sender;
+- (IBAction)reportBug:(nullable id)sender;
+- (IBAction)requestFeature:(nullable id)sender;
-- (IBAction)toggleShowingErrorPanel:(id)sender;
-- (IBAction)toggleShowingPreviewPanel:(id)sender;
+- (IBAction)toggleShowingErrorPanel:(nullable id)sender;
+- (IBAction)toggleShowingPreviewPanel:(nullable id)sender;
-- (IBAction)showReadMeFile:(id)sender;
-- (IBAction)showRelNotes:(id)sender;
+- (IBAction)showReadMeFile:(nullable id)sender;
+- (IBAction)showRelNotes:(nullable id)sender;
-- (IBAction)editSearchBookmarks:(id)sender;
+- (IBAction)editSearchBookmarks:(nullable id)sender;
-- (IBAction)showBookmarks:(id)sender;
+- (IBAction)showBookmarks:(nullable id)sender;
-- (IBAction)clearHistory:(id)sender;
-- (IBAction)toggleHistoryByDate:(id)sender;
+- (IBAction)clearHistory:(nullable id)sender;
+- (IBAction)toggleHistoryByDate:(nullable id)sender;
-- (IBAction)toggleShowingOrphanedFilesPanel:(id)sender;
+- (IBAction)toggleShowingOrphanedFilesPanel:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKApplication.h
===================================================================
--- trunk/bibdesk/BDSKApplication.h 2025-02-17 22:45:48 UTC (rev 29017)
+++ trunk/bibdesk/BDSKApplication.h 2025-02-17 23:14:17 UTC (rev 29018)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol BDSKApplicationDelegate;
@protocol BDSKApplicationDelegate <NSApplicationDelegate>
@@ -49,6 +51,8 @@
- (void)relaunch;
-@property (weak) id<BDSKApplicationDelegate> delegate;
+@property (nullable, weak) id<BDSKApplicationDelegate> delegate;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKBookmarkController.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import <WebKit/WebKit.h>
+NS_ASSUME_NONNULL_BEGIN
@class BDSKBookmark, BDSKOutlineView;
@@ -61,11 +62,11 @@
@property (class, nonatomic, readonly) BDSKBookmarkController
*sharedBookmarkController;
-@property (nonatomic, strong) IBOutlet BDSKOutlineView *outlineView;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addBookmarkButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addFolderButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addSeparatorButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *deleteButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKOutlineView *outlineView;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addBookmarkButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addFolderButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addSeparatorButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*deleteButton;
@property (nonatomic, readonly) BDSKBookmark *bookmarkRoot;
@@ -74,11 +75,13 @@
- (void)addBookmarkWithURL:(NSURL *)aURL proposedName:(NSString *)name
modalForWindow:(NSWindow *)window;
-- (IBAction)insertBookmark:(id)sender;
-- (IBAction)insertBookmarkFolder:(id)sender;
-- (IBAction)insertBookmarkSeparator:(id)sender;
-- (IBAction)deleteBookmark:(id)sender;
+- (IBAction)insertBookmark:(nullable id)sender;
+- (IBAction)insertBookmarkFolder:(nullable id)sender;
+- (IBAction)insertBookmarkSeparator:(nullable id)sender;
+- (IBAction)deleteBookmark:(nullable id)sender;
-@property (nonatomic, readonly) NSUndoManager *undoManager;
+@property (nonatomic, nullable, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKBookmarkSheetController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkSheetController.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKBookmarkSheetController.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKBookmarkSheetController : NSWindowController
<NSTouchBarDelegate> {
NSTextField *textField;
@@ -46,15 +47,17 @@
NSButton *cancelButton;
}
-@property (nonatomic, strong) IBOutlet NSTextField *textField;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *folderPopUp;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *textField;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *folderPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) NSString *stringValue;
+@property (nonatomic, nullable, strong) NSString *stringValue;
-@property (nonatomic, readonly) NSPopUpButton *folderPopUpButton;
+@property (nonatomic, nullable, readonly) NSPopUpButton *folderPopUpButton;
-@property (nonatomic, readonly) id selectedFolder;
+@property (nonatomic, nullable, readonly) id selectedFolder;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKCharacterConversion.h
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKCharacterConversion.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
typedef NS_ENUM(NSInteger, BDSKListType) {
BDSKListTypeOneWay = 1,
BDSKListTypeTwoWay = 2
@@ -66,19 +68,19 @@
@property (class, nonatomic, readonly) BDSKCharacterConversion
*sharedConversionEditor;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *listButton;
-@property (nonatomic, strong) IBOutlet NSTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveButton;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *listButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
- (void)updateDicts;
-- (IBAction)changeList:(id)sender;
-- (IBAction)addRemove:(id)sender;
+- (IBAction)changeList:(nullable id)sender;
+- (IBAction)addRemove:(nullable id)sender;
-- (IBAction)changeRoman:(id)sender;
-- (IBAction)changeTex:(id)sender;
+- (IBAction)changeRoman:(nullable id)sender;
+- (IBAction)changeTex:(nullable id)sender;
@property (nonatomic) BDSKListType listType;
@property (nonatomic, copy) NSDictionary *oneWayDict;
@@ -90,11 +92,11 @@
@end
-@interface BDSKRomanCharacterFormatter : NSFormatter {
-}
+@interface BDSKRomanCharacterFormatter : NSFormatter
@end
-@interface BDSKTeXFormatter : NSFormatter {
-}
+@interface BDSKTeXFormatter : NSFormatter
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKCompletionServer.h
===================================================================
--- trunk/bibdesk/BDSKCompletionServer.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKCompletionServer.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKCompletionServer : NSObject {
#pragma clang diagnostic push
@@ -47,3 +48,5 @@
}
@property (class, nonatomic, readonly) BDSKCompletionServer
*sharedCompletionServer;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKComplexStringEditor.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKComplexStringEditor.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKComplexStringFormatter;
@interface BDSKComplexStringEditor : NSWindowController {
@@ -55,10 +57,12 @@
- (void)remove;
-@property (nonatomic, strong) IBOutlet NSTextField *expandedValueTextField;
-@property (nonatomic, strong) IBOutlet NSImageView *focusRingView;
-@property (nonatomic, strong) IBOutlet NSBox *box;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*expandedValueTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSImageView *focusRingView;
+@property (nonatomic, nullable, strong) IBOutlet NSBox *box;
@property (nonatomic, readonly, getter=isAttached) BOOL attached;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKConditionController.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -39,9 +39,10 @@
#import <Cocoa/Cocoa.h>
#import "BDSKCondition.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKFilterController, BDSKRatingButton;
-
@interface BDSKConditionController : NSViewController {
NSObjectController *objectController;
NSComboBox *keyComboBox;
@@ -73,44 +74,46 @@
BOOL isObserving;
}
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
-@property (nonatomic, strong) IBOutlet NSComboBox *keyComboBox;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *comparisonPopUp;
-@property (nonatomic, strong) IBOutlet NSPopUpButton
*attachmentComparisonPopUp;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *dateComparisonPopUp;
-@property (nonatomic, strong) IBOutlet NSTextField *valueTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *countTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *numberTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *andNumberTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *dateTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *toDateTextField;
-@property (nonatomic, strong) IBOutlet NSTextField *agoText;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *periodPopUp;
-@property (nonatomic, strong) IBOutlet NSButton *booleanButton;
-@property (nonatomic, strong) IBOutlet NSButton *triStateButton;
-@property (nonatomic, strong) IBOutlet BDSKRatingButton *ratingButton;
-@property (nonatomic, strong) IBOutlet NSColorWell *colorWell;
-@property (nonatomic, strong) IBOutlet NSView *comparisonView;
-@property (nonatomic, strong) IBOutlet NSView *valueView;
-@property (nonatomic, strong) IBOutlet NSButton *addButton;
-@property (nonatomic, strong) IBOutlet NSButton *removeButton;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint *heightConstraint;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*comparisonWidthConstraint;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*valueWidthConstraint;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*stringvalueWidthConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox *keyComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*comparisonPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*attachmentComparisonPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*dateComparisonPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *valueTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *countTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *numberTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*andNumberTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *dateTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *toDateTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *agoText;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *periodPopUp;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *booleanButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *triStateButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKRatingButton
*ratingButton;
+@property (nonatomic, nullable, strong) IBOutlet NSColorWell *colorWell;
+@property (nonatomic, nullable, strong) IBOutlet NSView *comparisonView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *valueView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *addButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *removeButton;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*heightConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*comparisonWidthConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*valueWidthConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*stringvalueWidthConstraint;
-- (instancetype)initWithCondition:(BDSKCondition *)aCondition;
+- (instancetype)initWithCondition:(nullable BDSKCondition *)aCondition;
-- (IBAction)changeRating:(id)sender;
+- (IBAction)changeRating:(nullable id)sender;
@property (nonatomic, weak) BDSKFilterController *filterController;
-@property (nonatomic, readonly) BDSKCondition *condition;
+@property (nonatomic, nullable, readonly) BDSKCondition *condition;
@property (nonatomic, readonly) NSArray *keys;
- (void)discardEditing;
- (BOOL)commitEditing;
-- (void)commitEditingWithDelegate:(id)delegate
didCommitSelector:(SEL)didCommitSelector contextInfo:(void *)contextInfo;
+- (void)commitEditingWithDelegate:(nullable id)delegate
didCommitSelector:(nullable SEL)didCommitSelector contextInfo:(nullable void
*)contextInfo;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.h
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.h 2025-02-17 22:45:48 UTC
(rev 29017)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.h 2025-02-17 23:14:17 UTC
(rev 29018)
@@ -37,6 +37,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BibDocument;
@interface BDSKCustomCiteDrawerController : NSViewController
<NSTableViewDelegate, NSTableViewDataSource, NSMenuDelegate> {
@@ -47,13 +49,15 @@
- (instancetype)initForDocument:(BibDocument *)aDocument;
-@property (nonatomic, strong) IBOutlet NSTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
@property (nonatomic, readonly) CGFloat contentWidth;
-- (IBAction)add:(id)sender;
-- (IBAction)remove:(id)sender;
+- (IBAction)add:(nullable id)sender;
+- (IBAction)remove:(nullable id)sender;
-- (IBAction)changeCiteString:(id)sender;
+- (IBAction)changeCiteString:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKDocumentController.h
===================================================================
--- trunk/bibdesk/BDSKDocumentController.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKDocumentController.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -34,9 +34,11 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKEncodingPopUpButton;
-
@class BibDocument;
@interface BDSKDocumentController : NSDocumentController {
@@ -57,20 +59,22 @@
@property (nonatomic, readonly) BOOL openedFile;
-@property (nonatomic, readonly) id mainDocument;
+@property (nonatomic, nullable, readonly) id mainDocument;
-- (BibDocument *)currentBibliographyDocumentAndDisplay:(BOOL)display
error:(NSError **)outError;
+- (nullable BibDocument *)currentBibliographyDocumentAndDisplay:(BOOL)display
error:(NSError **)outError;
- (NSStringEncoding)lastSelectedEncodingForURL:(NSURL *)aURL;
- (void)willDuplicateTemplate:(BOOL)isTemplate
withEncoding:(NSStringEncoding)encoding;
-- (IBAction)openDocumentUsingFilter:(id)sender;
+- (IBAction)openDocumentUsingFilter:(nullable id)sender;
- (IBAction)openDocumentUsingPhonyCiteKeys:(id)sender;
-- (IBAction)newTemplateDocument:(id)sender;
-- (IBAction)openTemplateDocument:(id)sender;
+- (IBAction)newTemplateDocument:(nullable id)sender;
+- (IBAction)openTemplateDocument:(nullable id)sender;
-- (IBAction)newTemplateWindowForTab:(id)sender;
+- (IBAction)newTemplateWindowForTab:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.h
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.h 2025-02-17 22:45:48 UTC
(rev 29017)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.h 2025-02-17 23:14:17 UTC
(rev 29018)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKDocumentInfoWindowController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
NSTableView *tableView;
@@ -49,16 +50,18 @@
BOOL ignoreEdit;
}
-@property (nonatomic, strong) IBOutlet NSTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveButton;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-- (IBAction)addRemoveKey:(id)sender;
+- (IBAction)addRemoveKey:(nullable id)sender;
-- (IBAction)changeKey:(id)sender;
-- (IBAction)changeValue:(id)sender;
+- (IBAction)changeKey:(nullable id)sender;
+- (IBAction)changeValue:(nullable id)sender;
@property (nonatomic, copy) NSMapTable *info;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h 2025-02-17 22:45:48 UTC (rev 29017)
+++ trunk/bibdesk/BDSKEditor.h 2025-02-17 23:14:17 UTC (rev 29018)
@@ -44,6 +44,8 @@
#import <FileView/FileView.h>
#import <Quartz/Quartz.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKStatusBar, BDSKZoomablePDFView, BDSKEditorTableView,
BDSKEditorTextView;
@class BDSKCiteKeyFormatter, BDSKComplexStringFormatter;
@class BibItem, BibAuthor;
@@ -121,105 +123,105 @@
- (instancetype)initWithPublication:(BibItem *)aBib;
-@property (nonatomic, strong) IBOutlet NSSplitView *mainSplitView;
-@property (nonatomic, strong) IBOutlet NSSplitView *fileSplitView;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *bibTypeButton;
-@property (nonatomic, strong) IBOutlet BDSKEditorTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSCollectionView *collectionView;
-@property (nonatomic, strong) IBOutlet NSTabView *tabView;
-@property (nonatomic, strong) IBOutlet BDSKEditorTextView *notesView;
-@property (nonatomic, strong) IBOutlet BDSKEditorTextView *abstractView;
-@property (nonatomic, strong) IBOutlet BDSKEditorTextView *rssDescriptionView;
-@property (nonatomic, strong) IBOutlet NSTextField *citeKeyField;
-@property (nonatomic, strong) IBOutlet NSTextField *citeKeyTitle;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *actionButton;
-@property (nonatomic, strong) IBOutlet NSButton *addFieldButton;
-@property (nonatomic, strong) IBOutlet NSMenu *contextMenu;
-@property (nonatomic, strong) IBOutlet BDSKStatusBar *statusBar;
-@property (nonatomic, strong) IBOutlet NSButton *citeKeyWarningButton;
-@property (nonatomic, strong) IBOutlet NSTableView *authorTableView;
-@property (nonatomic, strong) IBOutlet FVFileView *fileView;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint *heightConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView *mainSplitView;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView *fileSplitView;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *bibTypeButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEditorTableView
*tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSCollectionView
*collectionView;
+@property (nonatomic, nullable, strong) IBOutlet NSTabView *tabView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEditorTextView *notesView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEditorTextView
*abstractView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEditorTextView
*rssDescriptionView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeKeyField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeKeyTitle;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *actionButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *addFieldButton;
+@property (nonatomic, nullable, strong) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, nullable, strong) IBOutlet BDSKStatusBar *statusBar;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*citeKeyWarningButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *authorTableView;
+@property (nonatomic, nullable, strong) IBOutlet FVFileView *fileView;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*heightConstraint;
@property (nonatomic, readonly) BibItem *publication;
-- (IBAction)chooseLocalFile:(id)sender;
+- (IBAction)chooseLocalFile:(nullable id)sender;
-- (IBAction)chooseRemoteURL:(id)sender;
+- (IBAction)chooseRemoteURL:(nullable id)sender;
-- (IBAction)raiseAddField:(id)sender;
-- (IBAction)raiseDelField:(id)sender;
-- (IBAction)raiseChangeFieldName:(id)sender;
+- (IBAction)raiseAddField:(nullable id)sender;
+- (IBAction)raiseDelField:(nullable id)sender;
+- (IBAction)raiseChangeFieldName:(nullable id)sender;
-- (IBAction)editSelectedFieldAsRawBibTeX:(id)sender;
+- (IBAction)editSelectedFieldAsRawBibTeX:(nullable id)sender;
-@property (nonatomic, strong) NSString *status;
+@property (nonatomic, nullable, strong) NSString *status;
-- (IBAction)openLinkedFile:(id)sender;
+- (IBAction)openLinkedFile:(nullable id)sender;
-- (IBAction)revealLinkedFile:(id)sender;
+- (IBAction)revealLinkedFile:(nullable id)sender;
-- (IBAction)openLinkedURL:(id)sender;
+- (IBAction)openLinkedURL:(nullable id)sender;
-- (IBAction)showNotesForLinkedFile:(id)sender;
+- (IBAction)showNotesForLinkedFile:(nullable id)sender;
-- (IBAction)copyNotesForLinkedFile:(id)sender;
+- (IBAction)copyNotesForLinkedFile:(nullable id)sender;
-- (IBAction)downloadRemoteURL:(id)sender;
+- (IBAction)downloadRemoteURL:(nullable id)sender;
-- (IBAction)previewAction:(id)sender;
+- (IBAction)previewAction:(nullable id)sender;
-- (IBAction)copy:(id)sender;
-- (IBAction)copyAsAction:(id)sender;
+- (IBAction)copy:(nullable id)sender;
+- (IBAction)copyAsAction:(nullable id)sender;
-- (IBAction)editAction:(id)sender;
+- (IBAction)editAction:(nullable id)sender;
-- (IBAction)printSelection:(id)sender;
+- (IBAction)printSelection:(nullable id)sender;
-- (IBAction)pasteAndMerge:(id)sender;
+- (IBAction)pasteAndMerge:(nullable id)sender;
-- (void)addLinkedFileFromMenuItem:(id)sender;
-- (void)addLinkedURLFromMenuItem:(id)sender;
+- (void)addLinkedFileFromMenuItem:(nullable id)sender;
+- (void)addLinkedURLFromMenuItem:(nullable id)sender;
-- (IBAction)trashLinkedFiles:(id)sender;
+- (IBAction)trashLinkedFiles:(nullable id)sender;
-- (IBAction)showCiteKeyWarning:(id)sender;
+- (IBAction)showCiteKeyWarning:(nullable id)sender;
-- (IBAction)bibTypeDidChange:(id)sender;
+- (IBAction)bibTypeDidChange:(nullable id)sender;
-- (IBAction)changeFlag:(id)sender;
+- (IBAction)changeFlag:(nullable id)sender;
-- (IBAction)changeValue:(id)sender;
+- (IBAction)changeValue:(nullable id)sender;
-- (IBAction)changeCiteKey:(id)sender;
+- (IBAction)changeCiteKey:(nullable id)sender;
-- (IBAction)generateCiteKey:(id)sender;
+- (IBAction)generateCiteKey:(nullable id)sender;
-- (IBAction)consolidateLinkedFiles:(id)sender;
+- (IBAction)consolidateLinkedFiles:(nullable id)sender;
-- (IBAction)duplicateTitleToBooktitle:(id)sender;
+- (IBAction)duplicateTitleToBooktitle:(nullable id)sender;
-@property (nonatomic, strong) NSString *keyField;
+@property (nonatomic, nullable, strong) NSString *keyField;
-- (IBAction)selectCrossrefParentAction:(id)sender;
-- (IBAction)createNewPubUsingCrossrefAction:(id)sender;
+- (IBAction)selectCrossrefParentAction:(nullable id)sender;
+- (IBAction)createNewPubUsingCrossrefAction:(nullable id)sender;
-- (IBAction)tableButtonAction:(id)sender;
+- (IBAction)tableButtonAction:(nullable id)sender;
-- (void)previewURLs:(NSArray *)theURLs;
+- (void)previewURLs:(nullable NSArray *)theURLs;
- (void)stopPreviewing;
#pragma mark Person controller
-- (IBAction)showPersonDetail:(id)sender;
+- (IBAction)showPersonDetail:(nullable id)sender;
@property (nonatomic, readonly) NSInteger numberOfPersons;
- (BibAuthor *)personAtIndex:(NSUInteger)anIndex;
@property (nonatomic, readonly) NSArray *persons;
-- (IBAction)toggleSideBar:(id)sender;
-- (IBAction)toggleStatusBar:(id)sender;
+- (IBAction)toggleSideBar:(nullable id)sender;
+- (IBAction)toggleStatusBar:(nullable id)sender;
@end
@@ -231,9 +233,11 @@
@interface BDSKEditorCollectionViewItem : NSCollectionViewItem {
__weak NSButton *button;
}
-@property (nonatomic, weak) NSButton *button;
+@property (nonatomic, nullable, weak) NSButton *button;
@end
@interface BDSKEditorRowView : NSTableRowView
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2025-02-17 22:45:48 UTC (rev 29017)
+++ trunk/bibdesk/BDSKErrorEditor.h 2025-02-17 23:14:17 UTC (rev 29018)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKErrorManager, BibDocument;
@interface BDSKErrorEditor : NSWindowController <NSTextStorageDelegate,
NSTouchBarDelegate> {
@@ -58,26 +60,26 @@
}
// designated initializer
-- (instancetype)initWithFileURL:(NSURL *)aFileURL pasteDragData:(NSData
*)aData;
+- (instancetype)initWithFileURL:(nullable NSURL *)aFileURL
pasteDragData:(nullable NSData *)aData;
// for editing document source file, load and name errors
- (instancetype)initWithFileURL:(NSURL *)aFileURL;
// for editing Paste/Drag data
- (instancetype)initWithPasteDragData:(NSData *)aData;
-@property (nonatomic, strong) IBOutlet NSTextView *textView;
-@property (nonatomic, strong) IBOutlet NSButton *syntaxHighlightCheckbox;
-@property (nonatomic, strong) IBOutlet NSButton *reopenButton;
-@property (nonatomic, strong) IBOutlet NSButton *reloadButton;
-@property (nonatomic, strong) IBOutlet NSTextField *lineNumberField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView *textView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*syntaxHighlightCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *reopenButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *reloadButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *lineNumberField;
-@property (nonatomic, weak) BDSKErrorManager *manager;
+@property (nonatomic, nullable, weak) BDSKErrorManager *manager;
-@property (nonatomic, copy) NSArray *errors;
+@property (nonatomic, nullable, copy) NSArray *errors;
-@property (nonatomic, strong) NSURL *fileURL;
-@property (nonatomic, readonly) NSString *displayName;
-@property (nonatomic, readonly) NSData *pasteDragData;
+@property (nonatomic, nullable, strong) NSURL *fileURL;
+@property (nonatomic, nullable, readonly) NSString *displayName;
+@property (nonatomic, nullable, readonly) NSData *pasteDragData;
@property (nonatomic, readonly, getter=isPasteDrag) BOOL pasteDrag;
- (void)updateDisplayName;
@@ -84,10 +86,10 @@
- (void)updateErrorMarkers;
-- (IBAction)loadFile:(id)sender;
-- (IBAction)reopenDocument:(id)sender;
-- (IBAction)changeSyntaxHighlighting:(id)sender;
-- (IBAction)changeLineNumber:(id)sender;
+- (IBAction)loadFile:(nullable id)sender;
+- (IBAction)reopenDocument:(nullable id)sender;
+- (IBAction)changeSyntaxHighlighting:(nullable id)sender;
+- (IBAction)changeLineNumber:(nullable id)sender;
- (void)gotoLine:(NSInteger)lineNumber;
@@ -96,3 +98,5 @@
- (void)handleUndoManagerChangeDoneNotification:(NSNotification *)notification;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKErrorManager.h
===================================================================
--- trunk/bibdesk/BDSKErrorManager.h 2025-02-17 22:45:48 UTC (rev 29017)
+++ trunk/bibdesk/BDSKErrorManager.h 2025-02-17 23:14:17 UTC (rev 29018)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKErrorObjectController, BDSKErrorObject, BDSKErrorEditor,
BibDocument;
@interface BDSKErrorManager : NSObject {
@@ -50,22 +52,22 @@
NSInteger uniqueNumber;
}
-@property (class, nonatomic, readonly) BDSKErrorManager *allItemsErrorManager;
+@property (class, nonatomic, nullable, readonly) BDSKErrorManager
*allItemsErrorManager;
-- (instancetype)initWithDocument:(BibDocument *)aDocument;
+- (instancetype)initWithDocument:(nullable BibDocument *)aDocument;
-@property (nonatomic, weak) BDSKErrorObjectController *errorController;
+@property (nonatomic, nullable, weak) BDSKErrorObjectController
*errorController;
-@property (nonatomic, strong) BibDocument *sourceDocument;
+@property (nonatomic, nullable, strong) BibDocument *sourceDocument;
@property (nonatomic, readonly) NSInteger uniqueNumber;
-@property (nonatomic, strong) NSString *documentDisplayName;
-@property (nonatomic, readonly) NSString *displayName;
+@property (nonatomic, nullable, strong) NSString *documentDisplayName;
+@property (nonatomic, nullable, readonly) NSString *displayName;
@property (nonatomic, readonly) NSStringEncoding documentStringEncoding;
- (void)updateDisplayName;
-@property (nonatomic, readonly) BDSKErrorEditor *mainEditor;
+@property (nonatomic, nullable, readonly) BDSKErrorEditor *mainEditor;
@property (nonatomic, readonly) NSArray *editors;
@@ -74,3 +76,5 @@
- (void)removeClosedEditors;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2025-02-17 22:45:48 UTC (rev
29017)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2025-02-17 23:14:17 UTC (rev
29018)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BibDocument, BibItem, BDSKErrorObject, BDSKErrorManager,
BDSKErrorEditor, BDSKTableView;
@interface BDSKErrorObjectController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource> {
@@ -58,8 +60,8 @@
@property (class, nonatomic, readonly) BDSKErrorObjectController
*sharedErrorObjectController;
-@property (nonatomic, strong) IBOutlet BDSKTableView *errorTableView;
-@property (nonatomic, strong) IBOutlet NSArrayController *errorsController;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *errorTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*errorsController;
- (NSArray *)errors;
@@ -76,7 +78,7 @@
- (void)addManager:(BDSKErrorManager *)manager;
- (void)removeManager:(BDSKErrorManager *)manager;
-@property (nonatomic, strong) BDSKErrorManager *filterManager;
+@property (nonatomic, nullable, strong) BDSKErrorManager *filterManager;
@property (nonatomic) BOOL hideWarnings;
// called from the tableView doubleclick
@@ -91,14 +93,16 @@
- (void)removeErrorsForEditor:(BDSKErrorEditor *)editor;
// tableView actions
-- (IBAction)copy:(id)sender;
-- (IBAction)gotoError:(id)sender;
+- (IBAction)copy:(nullable id)sender;
+- (IBAction)gotoError:(nullable id)sender;
// any use of btparse should be bracketed by a pair of
startObservingErrors/endObservingErrorsFor... calls
- (void)startObservingErrors;
- (void)endObservingErrorsForPublication:(BibItem *)pub;
-- (void)endObservingErrorsForDocument:(BibDocument *)document
pasteDragData:(NSData *)data;
+- (void)endObservingErrorsForDocument:(nullable BibDocument *)document
pasteDragData:(nullable NSData *)data;
- (void)reportError:(BDSKErrorObject *)error;
@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
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
