Revision: 29019
http://sourceforge.net/p/bibdesk/svn/29019
Author: hofman
Date: 2025-02-18 16:08:25 +0000 (Tue, 18 Feb 2025)
Log Message:
-----------
Add nullability to more controller classes
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.h
trunk/bibdesk/BDSKFieldSheetController.h
trunk/bibdesk/BDSKFileContentSearchController.h
trunk/bibdesk/BDSKFileMatchConfigController.h
trunk/bibdesk/BDSKFileMatcher.h
trunk/bibdesk/BDSKFileMigrationController.h
trunk/bibdesk/BDSKFiler.h
trunk/bibdesk/BDSKFilerErrorController.h
trunk/bibdesk/BDSKFilterController.h
trunk/bibdesk/BDSKFindController.h
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKMergeController.h
trunk/bibdesk/BDSKNotesWindowController.h
trunk/bibdesk/BDSKOpenAccessoryViewController.h
trunk/bibdesk/BDSKOrphanedFilesFinder.h
trunk/bibdesk/BDSKPasswordController.h
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPreferenceController.h
trunk/bibdesk/BDSKPreferencePane.h
trunk/bibdesk/BDSKPreviewer.h
trunk/bibdesk/BDSKReadMeController.h
trunk/bibdesk/BDSKSaveAccessoryViewController.h
trunk/bibdesk/BDSKScriptGroupSheetController.h
trunk/bibdesk/BDSKSearchBookmarkController.h
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKSearchGroupViewController.h
trunk/bibdesk/BDSKTemplateDocument.h
trunk/bibdesk/BDSKTextImportController.h
trunk/bibdesk/BDSKTextViewCompletionController.h
trunk/bibdesk/BDSKTouchBarButtonGroup.h
trunk/bibdesk/BDSKTypeInfoEditor.h
trunk/bibdesk/BDSKURLGroupSheetController.h
trunk/bibdesk/BDSKURLSheetController.h
trunk/bibdesk/BDSKWebGroupViewController.h
trunk/bibdesk/BDSKWebViewModalDialogController.h
Modified: trunk/bibdesk/BDSKBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKBookmarkController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -80,7 +80,7 @@
- (IBAction)insertBookmarkSeparator:(nullable id)sender;
- (IBAction)deleteBookmark:(nullable id)sender;
-@property (nonatomic, nullable, readonly) NSUndoManager *undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKFieldSheetController.h
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKFieldSheetController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface BDSKFieldSheetController : NSWindowController <NSTouchBarDelegate>
{
NSObjectController *objectController;
@@ -57,27 +59,29 @@
NSString *cancelButtonTitle;
}
-+ (instancetype)fieldSheetControllerWithSelectableFields:(NSArray
*)selectableFields label:(NSString *)selectedFieldLabel
choosableFields:(NSArray *)choosableFields label:(NSString *)chosenFieldLabel;
++ (instancetype)fieldSheetControllerWithSelectableFields:(nullable NSArray
*)selectableFields label:(nullable NSString *)selectedFieldLabel
choosableFields:(nullable NSArray *)choosableFields label:(nullable NSString
*)chosenFieldLabel;
+ (instancetype)fieldSheetControllerWithSelectableFields:(NSArray
*)selectableFields label:(NSString *)selectedFieldLabel;
+ (instancetype)fieldSheetControllerWithChoosableFields:(NSArray
*)choosableFields label:(NSString *)chosenFieldLabel;
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *selectedFieldPopUpButton;
-@property (nonatomic, strong) IBOutlet NSComboBox *chosenFieldComboBox;
-@property (nonatomic, strong) IBOutlet NSTextField *selectedFieldLabelField;
-@property (nonatomic, strong) IBOutlet NSTextField *chosenFieldLabelField;
-@property (nonatomic, strong) IBOutlet NSButton *defaultButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*selectedFieldPopUpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox
*chosenFieldComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*selectedFieldLabelField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*chosenFieldLabelField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *defaultButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) NSString *selectedField;
-@property (nonatomic, strong) NSString *selectedFieldLabel;
-@property (nonatomic, copy) NSArray *selectableFields;
+@property (nonatomic, nullable, strong) NSString *selectedField;
+@property (nonatomic, nullable, strong) NSString *selectedFieldLabel;
+@property (nonatomic, nullable, copy) NSArray *selectableFields;
-@property (nonatomic, strong) NSString *chosenField;
-@property (nonatomic, strong) NSString *chosenFieldLabel;
-@property (nonatomic, copy) NSArray *choosableFields;
+@property (nonatomic, nullable, strong) NSString *chosenField;
+@property (nonatomic, nullable, strong) NSString *chosenFieldLabel;
+@property (nonatomic, nullable, copy) NSArray *choosableFields;
@property (nonatomic, strong) NSString *defaultButtonTitle;
@property (nonatomic, strong) NSString *cancelButtonTitle;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKFileContentSearchController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -40,6 +40,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKFileSearch.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKFileContentSearchController;
@protocol BDSKFileContentSearchControllerDelegate
@@ -77,45 +79,47 @@
}
// Use this method to instantiate a search controller for use within a
document window
-- (instancetype)initForOwner:(id<BDSKOwner>)owner;
+- (instancetype)initForOwner:(nullable id<BDSKOwner>)owner;
-@property (nonatomic, strong) IBOutlet BDSKSelectionPreservingArrayController
*resultsArrayController;
-@property (nonatomic, strong) IBOutlet BDSKTableView *tableView;
-@property (nonatomic, strong) IBOutlet BDSKEdgeView *controlView;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *indexProgressBar;
-@property (nonatomic, strong) IBOutlet NSTextField *statusField;
+@property (nonatomic, nullable, strong) IBOutlet
BDSKSelectionPreservingArrayController *resultsArrayController;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEdgeView *controlView;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*indexProgressBar;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField;
-@property (nonatomic, weak) id<BDSKFileContentSearchControllerDelegate>
delegate;
+@property (nonatomic, nullable, weak)
id<BDSKFileContentSearchControllerDelegate> delegate;
// Use this to connect a search field and initiate a search
-@property (nonatomic, strong) NSSearchField *searchField;
-@property (nonatomic, copy) NSArray *savedRecentSearches;
+@property (nonatomic, nullable, strong) NSSearchField *searchField;
+@property (nonatomic, nullable, copy) NSArray *savedRecentSearches;
@property (nonatomic, readonly) BOOL shouldShowControlView;
-@property (nonatomic, readonly) NSArray *selectedIdentifierURLs;
-@property (nonatomic, readonly) NSArray *selectedURLs;
-@property (nonatomic, readonly) NSArray *selectedResults;
+@property (nonatomic, nullable, readonly) NSArray *selectedIdentifierURLs;
+@property (nonatomic, nullable, readonly) NSArray *selectedURLs;
+@property (nonatomic, nullable, readonly) NSArray *selectedResults;
-@property (nonatomic, readonly) NSArray *clickedOrSelectedIdentifierURLs;
-@property (nonatomic, readonly) NSArray *clickedOrSelectedURLs;
-@property (nonatomic, readonly) NSArray *clickedOrSelectedResults;
+@property (nonatomic, nullable, readonly) NSArray
*clickedOrSelectedIdentifierURLs;
+@property (nonatomic, nullable, readonly) NSArray *clickedOrSelectedURLs;
+@property (nonatomic, nullable, readonly) NSArray *clickedOrSelectedResults;
- (NSArray *)identifierURLsAtIndexes:(NSIndexSet *)indexes;
- (NSArray *)URLsAtIndexes:(NSIndexSet *)indexes;
- (NSArray *)resultsAtIndexes:(NSIndexSet *)indexes;
-@property (nonatomic, copy) NSArray *results;
-@property (nonatomic, copy) NSArray *filteredResults;
+@property (nonatomic, nullable, copy) NSArray *results;
+@property (nonatomic, nullable, copy) NSArray *filteredResults;
-- (void)filterUsingURLs:(NSArray *)newFilterURLs;
+- (void)filterUsingURLs:(nullable NSArray *)newFilterURLs;
-@property (nonatomic, copy) NSData *sortDescriptorData;
+@property (nonatomic, nullable, copy) NSData *sortDescriptorData;
- (void)finish;
-- (void)resetWithPublications:(NSArray *)pubs;
-- (void)terminateForDocumentURL:(NSURL *)fileURL;
+- (void)resetWithPublications:(nullable NSArray *)pubs;
+- (void)terminateForDocumentURL:(nullable NSURL *)fileURL;
-- (void)searchForString:(NSString *)searchString;
+- (void)searchForString:(nullable NSString *)searchString;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFileMatchConfigController.h
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKFileMatchConfigController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -33,6 +33,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface BDSKFileMatchConfigController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate>
{
NSTableView *documentTableView;
@@ -49,21 +51,21 @@
NSArrayController *fileArrayController;
}
-@property (nonatomic, strong) IBOutlet NSTableView *documentTableView;
-@property (nonatomic, strong) IBOutlet NSTableView *fileTableView;
-@property (nonatomic, strong) IBOutlet NSButton *useOrphansCheckbox;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveButton;
-@property (nonatomic, strong) IBOutlet NSButton *doneButton;
-@property (nonatomic, strong) IBOutlet NSArrayController
*documentArrayController;
-@property (nonatomic, strong) IBOutlet NSArrayController *fileArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView
*documentTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *fileTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *useOrphansCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *doneButton;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*documentArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*fileArrayController;
-- (IBAction)addRemove:(id)sender;
+- (IBAction)addRemove:(nullable id)sender;
-- (IBAction)selectAllDocuments:(id)sender;
+- (IBAction)selectAllDocuments:(nullable id)sender;
@property (nonatomic, readonly) NSArray *publications;
-- (void)handleDocumentAddRemove:(NSNotification *)note;
+- (void)handleDocumentAddRemove:(nullable NSNotification *)note;
@property (nonatomic, copy) NSArray *documents;
@@ -76,3 +78,5 @@
- (void)removeObjectFromFilesAtIndex:(NSUInteger)anIndex;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFileMatcher.h
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKFileMatcher.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -40,6 +40,8 @@
#import <Quartz/Quartz.h>
#import <stdatomic.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKOutlineView;
@interface BDSKFileMatcher : NSWindowController <NSOutlineViewDelegate,
NSOutlineViewDataSource, QLPreviewPanelDataSource, QLPreviewPanelDelegate>
@@ -61,17 +63,19 @@
@property (class, nonatomic, readonly) BDSKFileMatcher *sharedInstance;
-@property (nonatomic, strong) IBOutlet BDSKOutlineView *outlineView;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressIndicator;
-@property (nonatomic, strong) IBOutlet NSTextField *statusField;
-@property (nonatomic, strong) IBOutlet NSButton *abortButton;
-@property (nonatomic, strong) IBOutlet NSButton *configureButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKOutlineView *outlineView;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressIndicator;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *abortButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *configureButton;
-- (void)matchFiles:(NSArray *)absoluteURLs withPublications:(NSArray *)pubs;
+- (void)matchFiles:(NSArray *)absoluteURLs withPublications:(nullable NSArray
*)pubs;
-- (IBAction)openAction:(id)sender;
-- (IBAction)abort:(id)sender;
-- (IBAction)configure:(id)sender;
-- (IBAction)previewAction:(id)sender;
+- (IBAction)openAction:(nullable id)sender;
+- (IBAction)abort:(nullable id)sender;
+- (IBAction)configure:(nullable id)sender;
+- (IBAction)previewAction:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFileMigrationController.h
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKFileMigrationController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface BDSKFileMigrationController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
NSTableView *tableView;
NSButton *migrateButton;
@@ -49,14 +51,16 @@
NSMutableArray *results;
}
-@property (nonatomic, strong) IBOutlet NSTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSButton *migrateButton;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressBar;
-@property (nonatomic, strong) IBOutlet NSTextField *statusField;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *migrateButton;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressBar;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField;
-- (IBAction)migrate:(id)sender;
-- (IBAction)openParentDirectory:(id)sender;
-- (IBAction)editPublication:(id)sender;
-- (IBAction)showHelp:(id)sender;
+- (IBAction)migrate:(nullable id)sender;
+- (IBAction)openParentDirectory:(nullable id)sender;
+- (IBAction)editPublication:(nullable id)sender;
+- (IBAction)showHelp:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFiler.h
===================================================================
--- trunk/bibdesk/BDSKFiler.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKFiler.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *BDSKFilerFileKey;
extern NSString *BDSKFilerPublicationKey;
extern NSString *BDSKFilerOldPathKey;
@@ -76,7 +78,7 @@
@property (class, nonatomic, readonly) BDSKFiler *sharedFiler;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressIndicator;
- (BOOL)checkPapersFolder;
@@ -90,7 +92,7 @@
@discussion This is the main method that should be used to autofile
papers.
It calls the necessary methods to do the move and generates the new locations
for the papers.
*/
-- (void)autoFileLinkedFiles:(NSArray *)papers fromDocument:(BibDocument *)doc
check:(BOOL)check actionName:(NSString *)actionName;
+- (void)autoFileLinkedFiles:(NSArray *)papers fromDocument:(BibDocument *)doc
check:(BOOL)check actionName:(nullable NSString *)actionName;
/*!
@method autoFileItems:forField:fromDocument:doc:check:
@@ -103,7 +105,7 @@
@discussion This is the main method that should be used to autofile papers.
It calls the necessary methods to do the move and generates the new locations
for the papers.
*/
-- (void)autoFileItems:(NSArray *)items forField:(NSString *)field
fromDocument:(BibDocument *)doc check:(BOOL)check actionName:(NSString
*)actionName;
+- (void)autoFileItems:(NSArray *)items forField:(NSString *)field
fromDocument:(BibDocument *)doc check:(BOOL)check actionName:(nullable NSString
*)actionName;
/*!
@method movePapers:forField:fromDocument:options:
@@ -121,7 +123,7 @@
BDSKAutoFileOptionCheckComplete indicates that for initial moves a check will
be done whether all required fields are set.
BDSKAutoFileOptionForce forces AutoFiling, even if there may be problems
moving the file.
*/
-- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)options
actionName:(NSString *)actionName;
+- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)options
actionName:(nullable NSString *)actionName;
/*!
@method moveItemAtURL:toURL:force:error:
@@ -132,6 +134,8 @@
@param errorInfo A dictionary containing information about the
problem.
@discussion -
*/
-- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(BDSKFilerError)ignoredError errorInfo:(NSDictionary **)errorInfo;
+- (BOOL)moveItemAtURL:(NSURL *)fileURL toURL:(NSURL *)newFileURL
ignoring:(BDSKFilerError)ignoredError errorInfo:(NSDictionary * _Nullable *
_Nullable)errorInfo;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFilerErrorController.h
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKFilerErrorController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKFilerErrorController : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSTouchBarDelegate> {
NSTableView *tv;
@@ -56,22 +57,22 @@
NSArray *errorInfoDicts;
}
-- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(NSString *)actionName;
+- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(nullable NSString *)actionName;
-@property (nonatomic, strong) IBOutlet NSTableView *tv;
-@property (nonatomic, strong) IBOutlet NSTextField *infoTextField;
-@property (nonatomic, strong) IBOutlet NSImageView *iconView;
-@property (nonatomic, strong) IBOutlet NSButton *forceCheckButton;
-@property (nonatomic, strong) IBOutlet NSMenu *contextMenu;
-@property (nonatomic, strong) IBOutlet NSButton *doneButton;
-@property (nonatomic, strong) IBOutlet NSButton *tryAgainButton;
-@property (nonatomic, strong) IBOutlet NSButton *dumpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tv;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *infoTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSImageView *iconView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *forceCheckButton;
+@property (nonatomic, nullable, strong) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *doneButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *tryAgainButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *dumpButton;
-- (IBAction)done:(id)sender;
-- (IBAction)tryAgain:(id)sender;
-- (IBAction)dump:(id)sender;
-- (IBAction)selectAll:(id)sender;
-- (IBAction)showFile:(id)sender;
+- (IBAction)done:(nullable id)sender;
+- (IBAction)tryAgain:(nullable id)sender;
+- (IBAction)dump:(nullable id)sender;
+- (IBAction)selectAll:(nullable id)sender;
+- (IBAction)showFile:(nullable id)sender;
- (NSArray *)errorInfoDicts;
- (NSUInteger)countOfErrorInfoDicts;
@@ -78,3 +79,5 @@
- (NSDictionary *)objectInErrorInfoDictsAtIndex:(NSUInteger)index;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFilterController.h
===================================================================
--- trunk/bibdesk/BDSKFilterController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKFilterController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKFilter.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKConditionController;
@interface BDSKFilterController : NSWindowController <NSTouchBarDelegate> {
@@ -54,10 +56,10 @@
- (instancetype)initWithFilter:(BDSKFilter *)aFilter;
-@property (nonatomic, strong) IBOutlet NSView *conditionsView;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint *widthConstraint;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSView *conditionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*widthConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
- (void)insertNewConditionAfter:(BDSKConditionController
*)aConditionController;
- (void)removeConditionController:(BDSKConditionController
*)aConditionController;
@@ -72,8 +74,10 @@
- (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;
@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKFindController.h
===================================================================
--- trunk/bibdesk/BDSKFindController.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKFindController.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -40,6 +40,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKStatusBar.h"
+NS_ASSUME_NONNULL_BEGIN
+
typedef NS_ENUM(NSInteger, BDSKSearchType) {
BDSKSearchTextual = 0,
BDSKSearchRegex = 1
@@ -111,26 +113,26 @@
*/
@property (class, nonatomic, readonly) BDSKFindController
*sharedFindController;
-@property (nonatomic, strong) IBOutlet NSComboBox *fieldToSearchComboBox;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *searchTypePopUpButton;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *searchScopePopUpButton;
-@property (nonatomic, strong) IBOutlet NSButton *ignoreCaseCheckbox;
-@property (nonatomic, strong) IBOutlet NSButton *shownScopeRadioButton;
-@property (nonatomic, strong) IBOutlet NSButton *selectedScopeRadioButton;
-@property (nonatomic, strong) IBOutlet NSComboBox *findComboBox;
-@property (nonatomic, strong) IBOutlet NSComboBox *replaceComboBox;
-@property (nonatomic, strong) IBOutlet NSButton *findAsMacroCheckbox;
-@property (nonatomic, strong) IBOutlet NSButton *replaceAsMacroCheckbox;
-@property (nonatomic, strong) IBOutlet NSButton *nextButton;
-@property (nonatomic, strong) IBOutlet NSButton *previousButton;
-@property (nonatomic, strong) IBOutlet NSButton *replaceAndFindButton;
-@property (nonatomic, strong) IBOutlet NSButton *replaceButton;
-@property (nonatomic, strong) IBOutlet NSButton *replaceAllButton;
-@property (nonatomic, strong) IBOutlet NSView *controlsView;
-@property (nonatomic, strong) IBOutlet NSButton *shouldSetWhenEmptyCheckbox;
-@property (nonatomic, strong) IBOutlet NSBox *findOptionsBox;
-@property (nonatomic, strong) IBOutlet BDSKStatusBar *statusBar;
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox
*fieldToSearchComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*searchTypePopUpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*searchScopePopUpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *ignoreCaseCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*shownScopeRadioButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*selectedScopeRadioButton;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox *findComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox *replaceComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *findAsMacroCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*replaceAsMacroCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *nextButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *previousButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*replaceAndFindButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *replaceButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *replaceAllButton;
+@property (nonatomic, nullable, strong) IBOutlet NSView *controlsView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*shouldSetWhenEmptyCheckbox;
+@property (nonatomic, nullable, strong) IBOutlet NSBox *findOptionsBox;
+@property (nonatomic, nullable, strong) IBOutlet BDSKStatusBar *statusBar;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
/*!
@method updateUI
@@ -158,9 +160,9 @@
@param errString (description)
@result (description)
*/
-- (BOOL)stringIsValidAsComplexString:(NSString *)btstring
errorMessage:(NSString **)errString;
+- (BOOL)stringIsValidAsComplexString:(NSString *)btstring
errorMessage:(NSString * _Nullable * _Nullable)errString;
-- (IBAction)openHelp:(id)sender;
+- (IBAction)openHelp:(nullable id)sender;
@property (nonatomic) BDSKSearchOperation operation;
@property (nonatomic, strong) NSString *field;
@@ -177,16 +179,16 @@
@property (nonatomic, strong) NSString *replaceAllTooltip;
@property (nonatomic, strong) NSString *replaceLabel;
-- (BOOL)validateField:(id *)value error:(NSError **)error;
-- (BOOL)validateFindString:(id *)value error:(NSError **)error;
-- (BOOL)validateReplaceString:(id *)value error:(NSError **)error;
-- (BOOL)validateSearchType:(id *)value error:(NSError **)error;
-- (BOOL)validateSearchScope:(id *)value error:(NSError **)error;
-- (BOOL)validateIgnoreCase:(id *)value error:(NSError **)error;
-- (BOOL)validateSearchSelection:(id *)value error:(NSError **)error;
-- (BOOL)validateFindAsMacro:(id *)value error:(NSError **)error;
-- (BOOL)validateReplaceAsMacro:(id *)value error:(NSError **)error;
-- (BOOL)validateOperation:(id *)value error:(NSError **)error;
+- (BOOL)validateField:(id _Nullable * _Nonnull)value error:(NSError **)error;
+- (BOOL)validateFindString:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateReplaceString:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateSearchType:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateSearchScope:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateIgnoreCase:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateSearchSelection:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateFindAsMacro:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateReplaceAsMacro:(id _Nullable * _Nonnull)value error:(NSError
**)error;
+- (BOOL)validateOperation:(id _Nullable * _Nonnull)value error:(NSError
**)error;
- (NSArray *)findHistory;
- (NSUInteger)countOfFindHistory;
@@ -200,10 +202,10 @@
- (void)insertObject:(id)obj inReplaceHistoryAtIndex:(NSUInteger)index;
- (void)removeObjectFromReplaceHistoryAtIndex:(NSUInteger)index;
-- (IBAction)toggleStatusBar:(id)sender;
+- (IBAction)toggleStatusBar:(nullable id)sender;
// general find panel action, the actual action depends on the sender's tag
-- (IBAction)performFindPanelAction:(id)sender;
+- (IBAction)performFindPanelAction:(nullable id)sender;
- (void)setFindFromSelection;
@@ -240,7 +242,7 @@
@param theDocument (description)
@result (description)
*/
-- (NSArray *)currentFoundItemsInDocument:(BibDocument *)theDocument;
+- (nullable NSArray *)currentFoundItemsInDocument:(BibDocument *)theDocument;
/*!
@method findAndReplaceInItems:ofDocument:
@@ -253,3 +255,5 @@
- (NSUInteger)findAndReplaceInItems:(NSArray *)arrayOfPubs
ofDocument:(BibDocument *)theDocument;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKTableView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKMacroResolver, BDSKTableView, BDSKComplexStringFormatter;
@interface BDSKMacroWindowController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
@@ -69,19 +71,19 @@
- (void)removeObjectFromMacrosAtIndex:(NSUInteger)idx;
- (void)replaceObjectInMacrosAtIndex:(NSUInteger)idx withObject:(id)obj;
-- (IBAction)addRemoveMacro:(id)sender;
+- (IBAction)addRemoveMacro:(nullable id)sender;
- (BOOL)addMacrosFromBibTeXString:(NSString *)aString;
-- (IBAction)closeAction:(id)sender;
+- (IBAction)closeAction:(nullable id)sender;
-- (IBAction)search:(id)sender;
+- (IBAction)search:(nullable id)sender;
-- (IBAction)changeShowAll:(id)sender;
+- (IBAction)changeShowAll:(nullable id)sender;
- (IBAction)editSelectedFieldAsRawBibTeX:(id)sender;
-- (IBAction)changeMacro:(id)sender;
-- (IBAction)changeDefinition:(id)sender;
+- (IBAction)changeMacro:(nullable id)sender;
+- (IBAction)changeDefinition:(nullable id)sender;
- (void)handleMacroChangedNotification:(NSNotification *)notif;
- (void)handleGroupWillBeRemovedNotification:(NSNotification *)notif;
@@ -92,3 +94,5 @@
@interface MacroKeyFormatter : NSFormatter
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2025-02-18 16:08:25 UTC (rev
29019)
@@ -69,7 +69,7 @@
@synthesize arrayController, tableView, closeButton, addRemoveButton,
macroResolver;
- (instancetype)init {
- self = [self initWithMacroResolver:nil];
+ self = nil;
return self;
}
Modified: trunk/bibdesk/BDSKMergeController.h
===================================================================
--- trunk/bibdesk/BDSKMergeController.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKMergeController.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "BibDocument.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BibItem;
@interface BDSKMergeController : NSWindowController {
@@ -55,23 +57,25 @@
BOOL displayAddedFields;
}
-+ (void)mergePublication:(BibItem *)mergedPub withPublication:(BibItem *)pub
fromDocument:(BibDocument *)doc window:(NSWindow *)window
completionHandler:(void (^)(BOOL didMerge, BDSKAutoGenerateStatus
status))handler;
++ (void)mergePublication:(BibItem *)mergedPub withPublication:(BibItem *)pub
fromDocument:(BibDocument *)doc window:(NSWindow *)window
completionHandler:(void (^ _Nullable )(BOOL didMerge, BDSKAutoGenerateStatus
status))handler;
-- (instancetype)initWithPublication:(BibItem *)aPub mergedPublication:(BibItem
*)mergedPub fromDocument:(BibDocument *)aDoc completionHandler:(void (^)(BOOL
didMerge, BDSKAutoGenerateStatus status))handler;
+- (instancetype)initWithPublication:(BibItem *)aPub mergedPublication:(BibItem
*)mergedPub fromDocument:(BibDocument *)aDoc completionHandler:(void (^
_Nullable)(BOOL didMerge, BDSKAutoGenerateStatus status))handler;
-@property (nonatomic, strong) IBOutlet NSTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSButton *selectAllButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *selectAllButton;
-- (IBAction)toggleAll:(id)sender;
-- (IBAction)changeDisplayAddedFields:(id)sender;
+- (IBAction)toggleAll:(nullable id)sender;
+- (IBAction)changeDisplayAddedFields:(nullable id)sender;
@property (nonatomic) BOOL displayAddedFields;
@property (nonatomic, readonly) BOOL mayOverwrite;
-@property (nonatomic, readonly) NSArray *currentFields;
+@property (nonatomic, nullable, readonly) NSArray *currentFields;
- (void)merge;
- (void)mergeOverwriting;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKNotesWindowController.h
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKNotesWindowController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import "BDSKNotesOutlineView.h"
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKNotesWindowController : NSWindowController
<BDSKNotesOutlineViewDelegate, NSOutlineViewDataSource, NSSplitViewDelegate,
NSTouchBarDelegate> {
NSURL *url;
@@ -56,17 +57,19 @@
- (instancetype)initWithURL:(NSURL *)aURL;
-@property (nonatomic, strong) IBOutlet NSOutlineView *outlineView;
-@property (nonatomic, strong) IBOutlet NSTokenField *tokenField;
-@property (nonatomic, strong) IBOutlet NSSplitView *splitView;
-@property (nonatomic, strong) IBOutlet NSObjectController *ownerController;
-@property (nonatomic, strong) IBOutlet NSButton *refreshButton;
-@property (nonatomic, strong) IBOutlet NSButton *openInSkimButton;
+@property (nonatomic, nullable, strong) IBOutlet NSOutlineView *outlineView;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField *tokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView *splitView;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*ownerController;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *refreshButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *openInSkimButton;
-@property (nonatomic, copy) NSArray *tags;
+@property (nonatomic, nullable, copy) NSArray *tags;
@property (nonatomic) double rating;
-- (IBAction)refresh:(id)sender;
-- (IBAction)openInSkim:(id)sender;
+- (IBAction)refresh:(nullable id)sender;
+- (IBAction)openInSkim:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKOpenAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKOpenAccessoryViewController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKOpenAccessoryViewController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKEncodingPopUpButton;
@interface BDSKOpenAccessoryViewController : NSViewController {
@@ -49,15 +51,17 @@
NSTextField *filterLabelField;
}
-@property (nonatomic, strong) IBOutlet BDSKEncodingPopUpButton
*openTextEncodingPopupButton;
-@property (nonatomic, strong) IBOutlet NSTextField *encodingLabelField;
-@property (nonatomic, strong) IBOutlet NSComboBox *openUsingFilterComboBox;
-@property (nonatomic, strong) IBOutlet NSTextField *filterLabelField;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEncodingPopUpButton
*openTextEncodingPopupButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*encodingLabelField;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox
*openUsingFilterComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *filterLabelField;
-@property (nonatomic, readonly) NSView *openTextEncodingAccessoryView;
-@property (nonatomic, readonly) NSView *openUsingFilterAccessoryView;
+@property (nonatomic, nullable, readonly) NSView
*openTextEncodingAccessoryView;
+@property (nonatomic, nullable, readonly) NSView *openUsingFilterAccessoryView;
@property (nonatomic) NSStringEncoding encoding;
-@property (nonatomic, strong) NSString *filterCommand;
+@property (nonatomic, nullable, strong) NSString *filterCommand;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.h
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -41,6 +41,8 @@
#import "BDSKTableView.h"
#import <stdatomic.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKTableView;
@interface BDSKOrphanedFilesFinder : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, QLPreviewPanelDataSource, QLPreviewPanelDelegate> {
@@ -64,25 +66,25 @@
@property (class, nonatomic, readonly) BDSKOrphanedFilesFinder *sharedFinder;
-@property (nonatomic, strong) IBOutlet BDSKTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSButton *refreshButton;
-@property (nonatomic, strong) IBOutlet NSArrayController *arrayController;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressIndicator;
-@property (nonatomic, strong) IBOutlet NSTextField *statusField;
-@property (nonatomic, strong) IBOutlet NSMenu *contextMenu;
-@property (nonatomic, strong) IBOutlet NSButton *matchButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *refreshButton;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*arrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressIndicator;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField;
+@property (nonatomic, nullable, strong) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *matchButton;
// shows the panel and refreshes
-- (IBAction)showOrphanedFiles:(id)sender;
-- (IBAction)refreshOrphanedFiles:(id)sender;
-- (IBAction)stopRefreshing:(id)sender;
+- (IBAction)showOrphanedFiles:(nullable id)sender;
+- (IBAction)refreshOrphanedFiles:(nullable id)sender;
+- (IBAction)stopRefreshing:(nullable id)sender;
-- (IBAction)matchFilesWithPubs:(id)sender;
+- (IBAction)matchFilesWithPubs:(nullable id)sender;
-- (IBAction)showFile:(id)sender;
-- (IBAction)moveToTrash:(id)sender;
-- (IBAction)search:(id)sender;
-- (IBAction)showMatches:(id)sender;
+- (IBAction)showFile:(nullable id)sender;
+- (IBAction)moveToTrash:(nullable id)sender;
+- (IBAction)search:(nullable id)sender;
+- (IBAction)showMatches:(nullable id)sender;
- (NSArray *)orphanedFiles;
- (NSUInteger)countOfOrphanedFiles;
@@ -90,8 +92,10 @@
- (void)insertObject:(id)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex;
- (void)removeObjectFromOrphanedFilesAtIndex:(NSUInteger)theIndex;
-@property (nonatomic, strong) NSString *searchString;
+@property (nonatomic, nullable, strong) NSString *searchString;
@property (nonatomic, readonly) BOOL wasLaunched;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKPasswordController.h
===================================================================
--- trunk/bibdesk/BDSKPasswordController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKPasswordController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKPasswordController : NSWindowController
{
@@ -46,19 +47,21 @@
NSTextField *statusField;
}
-@property (nonatomic, strong) IBOutlet NSSecureTextField *passwordField;
-@property (nonatomic, strong) IBOutlet NSTextField *statusField;
+@property (nonatomic, nullable, strong) IBOutlet NSSecureTextField
*passwordField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField;
-+ (NSString *)passwordForKeychainService:(NSString *)service account:(NSString
*)account name:(NSString *)name;
++ (nullable NSString *)passwordForKeychainService:(NSString *)service
account:(nullable NSString *)account name:(nullable NSString *)name;
-+ (BOOL)addOrModifyPassword:(NSString *)password forKeychainService:(NSString
*)service account:(NSString *)account name:(NSString *)name;
++ (BOOL)addOrModifyPassword:(NSString *)password forKeychainService:(NSString
*)service account:(nullable NSString *)account name:(nullable NSString *)name;
-+ (NSString *)passwordForKeychainServer:(NSString *)server
port:(NSInteger)port account:(NSString *)account;
++ (nullable NSString *)passwordForKeychainServer:(NSString *)server
port:(NSInteger)port account:(NSString *)account;
+ (BOOL)addOrModifyPassword:(NSString *)password forKeychainServer:(NSString
*)server port:(NSInteger)port account:(NSString *)account;
-+ (NSString *)passwordFromPanelWithMessage:(NSString *)status;
++ (nullable NSString *)passwordFromPanelWithMessage:(NSString *)status;
-- (IBAction)buttonAction:(id)sender;
+- (IBAction)buttonAction:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKPersonController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -39,6 +39,8 @@
#import <AppKit/AppKit.h>
#import "BDSKDragImageView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@protocol BDSKOwner;
@class BibDocument, BibAuthor, BDSKTableView;
@@ -69,40 +71,42 @@
- (instancetype)initWithPerson:(BibAuthor *)aPerson;
#pragma mark accessors
-@property (nonatomic, strong) IBOutlet NSTextField *nameTextField;
-@property (nonatomic, strong) IBOutlet BDSKDragImageView *imageView;
-@property (nonatomic, strong) IBOutlet BDSKTableView *publicationTableView;
-@property (nonatomic, strong) IBOutlet NSTableView *nameTableView;
-@property (nonatomic, strong) IBOutlet NSTableView *fieldTableView;
-@property (nonatomic, strong) IBOutlet NSSplitView *splitView;
-@property (nonatomic, strong) IBOutlet NSSplitView *fieldNameSplitView;
-@property (nonatomic, strong) IBOutlet NSArrayController
*publicationArrayController;
-@property (nonatomic, strong) IBOutlet NSArrayController *fieldArrayController;
-@property (nonatomic, strong) IBOutlet NSArrayController *nameArrayController;
-@property (nonatomic, strong) IBOutlet NSButton *editButton;
-@property (nonatomic, strong) IBOutlet NSWindow *editSheet;
-@property (nonatomic, strong) IBOutlet NSTextField *editField;
-@property (nonatomic, strong) IBOutlet NSTextField *editMessageField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *nameTextField;
+@property (nonatomic, nullable, strong) IBOutlet BDSKDragImageView *imageView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTableView
*publicationTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *nameTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *fieldTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView *splitView;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView
*fieldNameSplitView;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*publicationArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*fieldArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*nameArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *editButton;
+@property (nonatomic, nullable, strong) IBOutlet NSWindow *editSheet;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *editField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *editMessageField;
@property (nonatomic, strong) BibAuthor *person;
-@property (nonatomic, copy) NSArray *publicationItems;
-@property (nonatomic, copy) NSSet *names;
+@property (nonatomic, nullable, copy) NSArray *publicationItems;
+@property (nonatomic, nullable, copy) NSSet *names;
@property (nonatomic, copy) NSSet *fields;
@property (nonatomic, readonly) NSImage *image;
-@property (nonatomic, readonly) id<BDSKOwner> personOwner;
+@property (nonatomic, nullable, readonly) id<BDSKOwner> personOwner;
#pragma mark actions
-- (IBAction)edit:(id)sender;
-- (IBAction)dismissEditSheet:(id)sender;
+- (IBAction)edit:(nullable id)sender;
+- (IBAction)dismissEditSheet:(nullable id)sender;
- (void)updateUI;
- (void)updatePublicationItems;
- (void)updateFilter;
- (void)handleBibItemAddDel:(NSNotification *)note;
-- (void)handleBibItemChanged:(NSNotification *)note;
+- (void)handleBibItemChanged:(nullable NSNotification *)note;
- (void)handleGroupWillBeRemoved:(NSNotification *)note;
- (void)openSelectedPub:(id)sender;
- (void)changeNameToString:(NSString *)newNameString;
-@property (nonatomic, readonly) NSUndoManager *undoManager;
+@property (nonatomic, nullable, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKPreferenceController.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKPreferenceController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class SPUStandardUpdaterController;
@interface BDSKPreferenceController : NSWindowController <NSToolbarDelegate,
NSWindowDelegate, NSTouchBarDelegate> {
@@ -68,23 +70,23 @@
@property (class, nonatomic, readonly) BDSKPreferenceController
*sharedPreferenceController;
-@property (nonatomic, strong) IBOutlet NSView *controlView;
-@property (nonatomic, strong) IBOutlet NSButton *revertButton;
-@property (nonatomic, strong) IBOutlet NSButton *revertAllButton;
-@property (nonatomic, strong) IBOutlet NSButton *helpButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *iconsButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *goLeftRightButton;
-@property (nonatomic, strong) IBOutlet NSSearchField *searchField;
-@property (nonatomic, strong) IBOutlet NSTextField *titleField;
-@property (nonatomic, strong) IBOutlet SPUStandardUpdaterController
*updaterController;
+@property (nonatomic, nullable, strong) IBOutlet NSView *controlView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *revertButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *revertAllButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *helpButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*iconsButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*goLeftRightButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSearchField *searchField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *titleField;
+@property (nonatomic, nullable, strong) IBOutlet SPUStandardUpdaterController
*updaterController;
-- (IBAction)revertPaneDefaults:(id)sender;
-- (IBAction)revertAllDefaults:(id)sender;
-- (IBAction)showHelp:(id)sender;
+- (IBAction)revertPaneDefaults:(nullable id)sender;
+- (IBAction)revertAllDefaults:(nullable id)sender;
+- (IBAction)showHelp:(nullable id)sender;
- (IBAction)showAll:(id)sender;
-- (IBAction)showNextPreviousPane:(id)sender;
-- (IBAction)search:(id)sender;
-- (IBAction)changeFont:(id)sender;
+- (IBAction)showNextPreviousPane:(nullable id)sender;
+- (IBAction)search:(nullable id)sender;
+- (IBAction)changeFont:(nullable id)sender;
@property (nonatomic, readonly) NSArray *categories;
- (NSArray *)paneIdentifiersForCategory:(NSString *)category;
@@ -99,3 +101,5 @@
@interface BDSKTitleCell : NSTextFieldCell
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKPreferencePane.h
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKPreferencePane.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKPreferenceController, BDSKPreferenceRecord;
@interface BDSKPreferencePane : NSViewController {
@@ -56,10 +58,10 @@
@property (nonatomic, readonly) NSString *identifier;
@property (nonatomic, readonly) NSString *label;
@property (nonatomic, readonly) NSString *toolTip;
-@property (nonatomic, readonly) NSImage *icon;
-@property (nonatomic, readonly) NSString *helpAnchor;
-@property (nonatomic, readonly) NSURL *helpURL;
-@property (nonatomic, readonly) NSDictionary *initialValues;
+@property (nonatomic, nullable, readonly) NSImage *icon;
+@property (nonatomic, nullable, readonly) NSString *helpAnchor;
+@property (nonatomic, nullable, readonly) NSURL *helpURL;
+@property (nonatomic, nullable, readonly) NSDictionary *initialValues;
// these are sent to the relevant pane(s), usually the selected pane, and by
default do nothing
@@ -78,7 +80,9 @@
- (void)willCloseWindow;
- (void)addObserverForUserDefaultsKey:(NSString *)key;
-- (void)addObserverForUserDefaultsKey:(NSString *)key dependentKey:(NSString
*)dependentKey;
+- (void)addObserverForUserDefaultsKey:(NSString *)key dependentKey:(nullable
NSString *)dependentKey;
- (void)observeValueForUserDefaultsKey:(NSString *)key;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKPreviewer.h
===================================================================
--- trunk/bibdesk/BDSKPreviewer.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKPreviewer.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -41,6 +41,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKTeXTask.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class PDFView, BDSKZoomablePDFView, BDSKTeXTask;
typedef NS_ENUM(NSInteger, BDSKPreviewState) {
@@ -78,14 +80,14 @@
@property (class, nonatomic, readonly, getter=isSharedPreviewerVisible) BOOL
sharedPreviewerVisible;
@property (nonatomic, retain) IBOutlet BDSKZoomablePDFView *pdfView;
-@property (nonatomic, strong) IBOutlet NSTextView *logView;
-@property (nonatomic, strong) IBOutlet NSTabView *tabView;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressIndicator;
-@property (nonatomic, strong) IBOutlet NSImageView *warningImageView;
-@property (nonatomic, strong) IBOutlet NSTextField *warningTextField;
-@property (nonatomic, strong) IBOutlet NSView *warningView;
-@property (nonatomic, strong) IBOutlet NSView *indicatorView;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*warningViewLeadingConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView *logView;
+@property (nonatomic, nullable, strong) IBOutlet NSTabView *tabView;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressIndicator;
+@property (nonatomic, nullable, strong) IBOutlet NSImageView *warningImageView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *warningTextField;
+@property (nonatomic, nullable, strong) IBOutlet NSView *warningView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *indicatorView;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*warningViewLeadingConstraint;
@property (nonatomic) CGFloat PDFScaleFactor;
@@ -104,7 +106,7 @@
@param bibStr The bibtex string source
@param citeKeys The cite keys of the items
*/
-- (void)updateWithBibTeXString:(NSString *)bibStr citeKeys:(NSArray *)citeKeys;
+- (void)updateWithBibTeXString:(nullable NSString *)bibStr citeKeys:(nullable
NSArray *)citeKeys;
/*!
@method updateWithoutBibTeXString
@@ -129,3 +131,5 @@
*/
- (void)handleApplicationWillTerminate:(NSNotification *)notification;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKReadMeController.h
===================================================================
--- trunk/bibdesk/BDSKReadMeController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKReadMeController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,14 +38,17 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKReadMeController : NSWindowController {
NSTextView *textView;
}
@property (class, nonatomic, readonly) BDSKReadMeController
*sharedReadMeController;
-@property (nonatomic, strong) IBOutlet NSTextView *textView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView *textView;
@end
@interface BDSKRelNotesController : BDSKReadMeController {}
@property (class, nonatomic, readonly) BDSKRelNotesController
*sharedRelNotesController;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKSaveAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKEncodingPopUpButton;
@interface BDSKSaveAccessoryViewController : NSViewController {
@@ -49,16 +51,16 @@
NSSavePanel *savePanel;
}
-@property (nonatomic, strong) IBOutlet NSPopUpButton *formatTypePopupButton;
-@property (nonatomic, strong) IBOutlet BDSKEncodingPopUpButton
*saveTextEncodingPopupButton;
-@property (nonatomic, strong) IBOutlet NSButton *exportSelectionCheckButton;
-@property (nonatomic, strong) IBOutlet NSTextField *formatLabelField;
-@property (nonatomic, strong) IBOutlet NSTextField *encodingLabelField;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*formatTypePopupButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEncodingPopUpButton
*saveTextEncodingPopupButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*exportSelectionCheckButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *formatLabelField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField
*encodingLabelField;
-@property (nonatomic, strong) NSSavePanel *savePanel;
+@property (nonatomic, nullable, strong) NSSavePanel *savePanel;
-@property (nonatomic, readonly) NSView *saveAccessoryView;
-@property (nonatomic, readonly) NSView *exportAccessoryView;
+@property (nonatomic, nullable, readonly) NSView *saveAccessoryView;
+@property (nonatomic, nullable, readonly) NSView *exportAccessoryView;
- (void)addSaveFormatPopUpButton:(NSPopUpButton *)popup;
@@ -66,6 +68,8 @@
@property (nonatomic) BOOL exportSelection;
@property (nonatomic, getter=isSaveTextEncodingPopupButtonEnabled) BOOL
saveTextEncodingPopupButtonEnabled;
@property (nonatomic, getter=isExportSelectionCheckButtonEnabled) BOOL
exportSelectionCheckButtonEnabled;
-@property (nonatomic, readonly) NSString *selectedFileType;
+@property (nonatomic, nullable, readonly) NSString *selectedFileType;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKDragTextField, BDSKFieldEditor;
@interface BDSKScriptGroupSheetController : NSWindowController
<NSOpenSavePanelDelegate, NSTouchBarDelegate>
@@ -52,17 +54,17 @@
BDSKFieldEditor *dragFieldEditor;
}
-- (instancetype)initWithPath:(NSString *)aPath arguments:(NSString
*)anArguments;
+- (instancetype)initWithPath:(nullable NSString *)aPath arguments:(nullable
NSString *)anArguments;
-@property (nonatomic, strong) IBOutlet BDSKDragTextField *pathField;
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKDragTextField *pathField;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) NSString *path;
-@property (nonatomic, strong) NSString *arguments;
+@property (nonatomic, nullable, strong) NSString *path;
+@property (nonatomic, nullable, strong) NSString *arguments;
-- (IBAction)chooseScriptPath:(id)sender;
+- (IBAction)chooseScriptPath:(nullable id)sender;
- (BOOL)commitEditing;
@@ -69,3 +71,5 @@
@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKSearchBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKSearchBookmarkController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@class BDSKSearchBookmark, BDSKOutlineView;
@@ -60,11 +61,11 @@
@property (class, nonatomic, readonly) BDSKSearchBookmarkController
*sharedBookmarkController;
-@property (nonatomic, strong) IBOutlet BDSKOutlineView *outlineView;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addFolderButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addSeparatorButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *deleteButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *editButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKOutlineView *outlineView;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addFolderButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addSeparatorButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*deleteButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*editButton;
@property (nonatomic, readonly) BDSKSearchBookmark *bookmarkRoot;
@@ -71,10 +72,10 @@
- (void)insertBookmark:(BDSKSearchBookmark *)bookmar
atIndex:(NSUInteger)anIndex ofBookmark:(BDSKSearchBookmark *)parent
animate:(BOOL)animate;
- (void)removeBookmarkAtIndex:(NSUInteger)anIndex
ofBookmark:(BDSKSearchBookmark *)parent animate:(BOOL)animate;
-- (IBAction)insertBookmarkFolder:(id)sender;
-- (IBAction)insertBookmarkSeparator:(id)sender;
-- (IBAction)deleteBookmark:(id)sender;
-- (IBAction)editAction:(id)sender;
+- (IBAction)insertBookmarkFolder:(nullable id)sender;
+- (IBAction)insertBookmarkSeparator:(nullable id)sender;
+- (IBAction)deleteBookmark:(nullable id)sender;
+- (IBAction)editAction:(nullable id)sender;
- (void)saveBookmarks;
@@ -81,3 +82,5 @@
@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKServerInfo, BDSKMutableServerInfo;
@interface BDSKSearchGroupSheetController : NSWindowController
<NSTouchBarDelegate> {
@@ -75,36 +77,36 @@
NSObjectController *objectController;
}
-- (instancetype)initWithServerInfo:(BDSKServerInfo *)aServerInfo;
+- (instancetype)initWithServerInfo:(nullable BDSKServerInfo *)aServerInfo;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *serverPopup;
-@property (nonatomic, strong) IBOutlet NSTextField *nameField;
-@property (nonatomic, strong) IBOutlet NSTextField *addressField;
-@property (nonatomic, strong) IBOutlet NSTextField *portField;
-@property (nonatomic, strong) IBOutlet NSTextField *databaseField;
-@property (nonatomic, strong) IBOutlet NSSecureTextField *passwordField;
-@property (nonatomic, strong) IBOutlet NSTextField *userField;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *syntaxPopup;
-@property (nonatomic, strong) IBOutlet NSComboBox *encodingComboBox;
-@property (nonatomic, strong) IBOutlet NSButton *removeDiacriticsButton;
-@property (nonatomic, strong) IBOutlet NSButton *liteButton;
-@property (nonatomic, strong) IBOutlet NSButton *editButton;
-@property (nonatomic, strong) IBOutlet NSButton *addRemoveButton;
-@property (nonatomic, strong) IBOutlet NSView *serverView;
-@property (nonatomic, strong) IBOutlet NSButton *revealButton;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint;
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *serverPopup;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *nameField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *addressField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *portField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *databaseField;
+@property (nonatomic, nullable, strong) IBOutlet NSSecureTextField
*passwordField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *userField;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *syntaxPopup;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox *encodingComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*removeDiacriticsButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *liteButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *editButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *addRemoveButton;
+@property (nonatomic, nullable, strong) IBOutlet NSView *serverView;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *revealButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*bottomConstraint;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
-- (IBAction)selectPredefinedServer:(id)sender;
-- (IBAction)selectSyntax:(id)sender;
+- (IBAction)selectPredefinedServer:(nullable id)sender;
+- (IBAction)selectSyntax:(nullable id)sender;
-- (IBAction)addRemoveServer:(id)sender;
-- (IBAction)editServer:(id)sender;
-- (IBAction)resetServers:(id)sender;
+- (IBAction)addRemoveServer:(nullable id)sender;
+- (IBAction)editServer:(nullable id)sender;
+- (IBAction)resetServers:(nullable id)sender;
-- (IBAction)toggle:(id)sender;
+- (IBAction)toggle:(nullable id)sender;
@property (nonatomic, getter=isCustom) BOOL custom;
@property (nonatomic, getter=isEditable) BOOL editable;
@@ -120,7 +122,7 @@
@property (nonatomic, copy) BDSKServerInfo *serverInfo;
-- (IBAction)selectPredefinedServer:(id)sender;
+- (IBAction)selectPredefinedServer:(nullable id)sender;
- (BOOL)commitEditing;
@@ -127,3 +129,5 @@
@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKSearchGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKSearchGroupViewController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKSearchGroup;
@interface BDSKSearchGroupViewController : NSViewController {
@@ -45,15 +47,17 @@
NSButton *searchButton;
}
-@property (nonatomic, strong) IBOutlet NSSearchField *searchField;
-@property (nonatomic, strong) IBOutlet NSButton *searchButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSearchField *searchField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *searchButton;
-@property (nonatomic, strong) BDSKSearchGroup *group;
+@property (nonatomic, nullable, strong) BDSKSearchGroup *group;
-- (IBAction)changeSearchTerm:(id)sender;
-- (IBAction)nextSearch:(id)sender;
-- (IBAction)searchHelp:(id)sender;
+- (IBAction)changeSearchTerm:(nullable id)sender;
+- (IBAction)nextSearch:(nullable id)sender;
+- (IBAction)searchHelp:(nullable id)sender;
- (void)handleSearchGroupUpdatedNotification:(NSNotification *)notification;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTemplateDocument.h
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKTemplateDocument.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -40,6 +40,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKUndoManager.h"
+NS_ASSUME_NONNULL_BEGIN
+
extern NSString *BDSKTextTemplateDocumentType;
extern NSString *BDSKRichTextTemplateDocumentType;
@@ -116,33 +118,33 @@
NSAttributedString *attributedString;
}
-@property (nonatomic, strong) IBOutlet NSObjectController *ownerController;
-@property (nonatomic, strong) IBOutlet NSTextView *previewTextView;
-@property (nonatomic, strong) IBOutlet NSSplitView *textViewSplitView;
-@property (nonatomic, strong) IBOutlet NSTextView *prefixTemplateTextView;
-@property (nonatomic, strong) IBOutlet NSTextView *separatorTemplateTextView;
-@property (nonatomic, strong) IBOutlet NSTextView *suffixTemplateTextView;
-@property (nonatomic, strong) IBOutlet BDSKTableView *tableView;
-@property (nonatomic, strong) IBOutlet NSArrayController
*templateArrayController;
-@property (nonatomic, strong) IBOutlet NSObjectController
*tokenObjectController;
-@property (nonatomic, strong) IBOutlet NSTokenField *specialTokenField;
-@property (nonatomic, strong) IBOutlet NSTokenField *requiredTokenField;
-@property (nonatomic, strong) IBOutlet NSTokenField *optionalTokenField;
-@property (nonatomic, strong) IBOutlet NSTokenField *defaultTokenField;
-@property (nonatomic, strong) IBOutlet NSTokenField *itemTemplateTokenField;
-@property (nonatomic, strong) IBOutlet NSView *optionsView;
-@property (nonatomic, strong) IBOutlet NSView *fieldOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *appendingOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *fontOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *urlOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *personOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *linkedFileOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *dateOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *numberOptionsView;
-@property (nonatomic, strong) IBOutlet NSView *textOptionsView;
-@property (nonatomic, strong) IBOutlet NSTextField *fieldField;
-@property (nonatomic, strong) IBOutlet NSComboBox *sizeComboBox;
-@property (nonatomic, strong) IBOutlet NSArray *optionControls;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*ownerController;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView *previewTextView;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView
*textViewSplitView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView
*prefixTemplateTextView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView
*separatorTemplateTextView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView
*suffixTemplateTextView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*templateArrayController;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*tokenObjectController;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField
*specialTokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField
*requiredTokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField
*optionalTokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField
*defaultTokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSTokenField
*itemTemplateTokenField;
+@property (nonatomic, nullable, strong) IBOutlet NSView *optionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *fieldOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *appendingOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *fontOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *urlOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *personOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *linkedFileOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *dateOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *numberOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *textOptionsView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *fieldField;
+@property (nonatomic, nullable, strong) IBOutlet NSComboBox *sizeComboBox;
+@property (nonatomic, nullable, strong) IBOutlet NSArray *optionControls;
@property (nonatomic, readonly) NSArray *typeTemplates;
@@ -161,7 +163,7 @@
@property (nonatomic, getter=isBold) BOOL bold;
@property (nonatomic, getter=isItalic) BOOL italic;
-@property (nonatomic, strong) BDSKToken *selectedToken;
+@property (nonatomic, nullable, strong) BDSKToken *selectedToken;
@property (nonatomic) NSUInteger defaultTypeIndex;
@@ -170,7 +172,7 @@
@property (nonatomic, readonly) NSAttributedString *previewAttributedString;
-- (IBAction)addField:(id)sender;
+- (IBAction)addField:(nullable id)sender;
@end
@@ -177,7 +179,7 @@
#pragma mark -
@interface BDSKTokenField : NSTokenField
-@property (weak) id<BDSKTokenFieldDelegate> delegate;
+@property (nullable, weak) id<BDSKTokenFieldDelegate> delegate;
@end
#pragma mark -
@@ -184,3 +186,5 @@
@interface BDSKTextView : NSTextView
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKTextImportController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -43,6 +43,8 @@
#import "BDSKWebView.h"
#import "BDSKDownloader.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BibDocument, BibItem, BDSKEdgeView, WebDownload;
@class BDSKCiteKeyFormatter, BDSKTextImportItemTableView,
BDSKComplexStringFormatter;
@@ -98,52 +100,54 @@
- (instancetype)initForOwner:(id <BDSKOwner>)anOwner;
-@property (nonatomic, strong) IBOutlet NSTextView* sourceTextView;
-@property (nonatomic, strong) IBOutlet BDSKTextImportItemTableView*
itemTableView;
-@property (nonatomic, strong) IBOutlet NSTextField *citeKeyField;
-@property (nonatomic, strong) IBOutlet NSTextField *statusLine;
-@property (nonatomic, strong) IBOutlet NSButton *addButton;
-@property (nonatomic, strong) IBOutlet NSButton *addAndCloseButton;
-@property (nonatomic, strong) IBOutlet NSButton *closeButton;
-@property (nonatomic, strong) IBOutlet NSButton *clearButton;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *itemTypeButton;
-@property (nonatomic, strong) IBOutlet NSPopUpButton *actionMenuButton;
-@property (nonatomic, strong) IBOutlet NSSplitView *splitView;
-@property (nonatomic, strong) IBOutlet NSView *sourceView;
-@property (nonatomic, strong) IBOutlet BDSKEdgeView *webViewBox;
-@property (nonatomic, strong) IBOutlet NSView *webViewView;
-@property (nonatomic, strong) IBOutlet NSProgressIndicator *progressIndicator;
-@property (nonatomic, strong) IBOutlet NSButton *backButton;
-@property (nonatomic, strong) IBOutlet NSButton *forwardButton;
-@property (nonatomic, strong) IBOutlet NSButton *stopOrReloadButton;
-@property (nonatomic, strong) IBOutlet NSButton *citeKeyWarningButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextView* sourceTextView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKTextImportItemTableView*
itemTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeKeyField;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusLine;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *addButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *addAndCloseButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *closeButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *clearButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *itemTypeButton;
+@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*actionMenuButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSplitView *splitView;
+@property (nonatomic, nullable, strong) IBOutlet NSView *sourceView;
+@property (nonatomic, nullable, strong) IBOutlet BDSKEdgeView *webViewBox;
+@property (nonatomic, nullable, strong) IBOutlet NSView *webViewView;
+@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressIndicator;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *backButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *forwardButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *stopOrReloadButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*citeKeyWarningButton;
@property (nonatomic, readonly) BibItem *publication;
@property (nonatomic, readonly) NSArray *addedPublications;
-- (void)beginSheetForURL:(NSURL *)aURL modalForWindow:(NSWindow *)aWindow
completionHandler:(void (^)(NSInteger result))handler;
+- (void)beginSheetForURL:(nullable NSURL *)aURL modalForWindow:(NSWindow
*)aWindow completionHandler:(void (^ _Nullable )(NSInteger result))handler;
-- (IBAction)addItemAction:(id)sender;
-- (IBAction)closeAction:(id)sender;
-- (IBAction)addItemAndCloseAction:(id)sender;
-- (IBAction)clearAction:(id)sender;
-- (IBAction)showHelpAction:(id)sender;
-- (IBAction)addTextToCurrentFieldAction:(id)sender;
-- (IBAction)changeTypeOfBibAction:(id)sender;
-- (IBAction)importFromPasteboardAction:(id)sender;
-- (IBAction)importFromFileAction:(id)sender;
-- (IBAction)importFromWebAction:(id)sender;
-- (IBAction)openBookmark:(id)sender;
-- (IBAction)stopOrReloadAction:(id)sender;
-- (IBAction)addField:(id)sender;
-- (IBAction)changeValue:(id)sender;
-- (IBAction)editSelectedFieldAsRawBibTeX:(id)sender;
-- (IBAction)generateCiteKey:(id)sender;
-- (IBAction)showCiteKeyWarning:(id)sender;
+- (IBAction)addItemAction:(nullable id)sender;
+- (IBAction)closeAction:(nullable id)sender;
+- (IBAction)addItemAndCloseAction:(nullable id)sender;
+- (IBAction)clearAction:(nullable id)sender;
+- (IBAction)showHelpAction:(nullable id)sender;
+- (IBAction)addTextToCurrentFieldAction:(nullable id)sender;
+- (IBAction)changeTypeOfBibAction:(nullable id)sender;
+- (IBAction)importFromPasteboardAction:(nullable id)sender;
+- (IBAction)importFromFileAction:(nullable id)sender;
+- (IBAction)importFromWebAction:(nullable id)sender;
+- (IBAction)openBookmark:(nullable id)sender;
+- (IBAction)stopOrReloadAction:(nullable id)sender;
+- (IBAction)addField:(nullable id)sender;
+- (IBAction)changeValue:(nullable id)sender;
+- (IBAction)editSelectedFieldAsRawBibTeX:(nullable id)sender;
+- (IBAction)generateCiteKey:(nullable id)sender;
+- (IBAction)showCiteKeyWarning:(nullable id)sender;
-- (void)copyLocationAsRemoteUrl:(id)sender;
-- (void)copyLinkedLocationAsRemoteUrl:(id)sender;
-- (void)saveFileAsLocalUrl:(id)sender;
-- (void)downloadLinkedFileAsLocalUrl:(id)sender;
+- (void)copyLocationAsRemoteUrl:(nullable id)sender;
+- (void)copyLinkedLocationAsRemoteUrl:(nullable id)sender;
+- (void)saveFileAsLocalUrl:(nullable id)sender;
+- (void)downloadLinkedFileAsLocalUrl:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTextViewCompletionController.h
===================================================================
--- trunk/bibdesk/BDSKTextViewCompletionController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKTextViewCompletionController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKTextViewCompletionController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource>
{
@@ -52,12 +53,14 @@
@property (class, nonatomic, readonly) BDSKTextViewCompletionController
*sharedController;
-@property (nonatomic, strong, readonly) NSTextView *currentTextView;
+@property (nonatomic, strong, nullable, readonly) NSTextView *currentTextView;
- (void)displayCompletions:(NSArray *)completions
indexOfSelectedItem:(NSInteger)indexOfSelectedItem
forPartialWordRange:(NSRange)partialWordRange originalString:(NSString
*)originalString forTextView:(NSTextView *)textView;
- (void)endDisplay;
- (void)endDisplayAndComplete:(BOOL)complete;
- (void)endDisplayNoComplete;
-- (void)tableAction:(id)sender;
+- (void)tableAction:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTouchBarButtonGroup.h
===================================================================
--- trunk/bibdesk/BDSKTouchBarButtonGroup.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKTouchBarButtonGroup.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
@interface BDSKTouchBarButtonGroup : NSViewController {
NSArray *buttons;
@@ -48,3 +49,5 @@
- (instancetype)initByReferencingButtons:(NSArray *)refButtons;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTypeInfoEditor.h
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.h 2025-02-17 23:14:17 UTC (rev 29018)
+++ trunk/bibdesk/BDSKTypeInfoEditor.h 2025-02-18 16:08:25 UTC (rev 29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface BDSKTypeInfoEditor : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSSplitViewDelegate, NSTouchBarDelegate> {
NSTableView *typeTableView;
NSTableView *requiredTableView;
@@ -62,34 +64,34 @@
@property (class, nonatomic, readonly) BDSKTypeInfoEditor
*sharedTypeInfoEditor;
-@property (nonatomic, strong) IBOutlet NSTableView *typeTableView;
-@property (nonatomic, strong) IBOutlet NSTableView *requiredTableView;
-@property (nonatomic, strong) IBOutlet NSTableView *optionalTableView;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveTypeButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*addRemoveRequiredButton;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl
*addRemoveOptionalButton;
-@property (nonatomic, strong) IBOutlet NSButton *revertCurrentToDefaultButton;
-@property (nonatomic, strong) IBOutlet NSButton *revertAllToDefaultButton;
-@property (nonatomic, strong) IBOutlet NSButton *canEditDefaultTypesButton;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView *typeTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView
*requiredTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSTableView
*optionalTableView;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveTypeButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveRequiredButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*addRemoveOptionalButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*revertCurrentToDefaultButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*revertAllToDefaultButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton
*canEditDefaultTypesButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
- (void)revertTypes;
-- (void)addType:(NSString *)newType withFields:(NSDictionary *)fieldsDict;
-- (void)insertType:(NSString *)newType withFields:(NSDictionary *)fieldsDict
atIndex:(NSUInteger)index;
+- (void)addType:(NSString *)newType withFields:(nullable NSDictionary
*)fieldsDict;
+- (void)insertType:(NSString *)newType withFields:(nullable NSDictionary
*)fieldsDict atIndex:(NSUInteger)index;
-@property (nonatomic, strong) NSString *currentType;
+@property (nonatomic, nullable, strong) NSString *currentType;
-- (IBAction)addRemoveType:(id)sender;
-- (IBAction)addRemoveRequired:(id)sender;
-- (IBAction)addRemoveOptional:(id)sender;
-- (IBAction)revertCurrentToDefault:(id)sender;
-- (IBAction)revertAllToDefault:(id)sender;
-- (IBAction)changeCanEditDefaultTypes:(id)sender;
-- (IBAction)changeType:(id)sender;
-- (IBAction)changeRequiredField:(id)sender;
-- (IBAction)changeOptionalField:(id)sender;
+- (IBAction)addRemoveType:(nullable id)sender;
+- (IBAction)addRemoveRequired:(nullable id)sender;
+- (IBAction)addRemoveOptional:(nullable id)sender;
+- (IBAction)revertCurrentToDefault:(nullable id)sender;
+- (IBAction)revertAllToDefault:(nullable id)sender;
+- (IBAction)changeCanEditDefaultTypes:(nullable id)sender;
+- (IBAction)changeType:(nullable id)sender;
+- (IBAction)changeRequiredField:(nullable id)sender;
+- (IBAction)changeOptionalField:(nullable id)sender;
- (BOOL)canEditType:(NSString *)type;
- (BOOL)canEditField:(NSString *)field;
@@ -96,3 +98,5 @@
- (void)updateButtons;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKURLGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKURLGroupSheetController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKDragTextField, BDSKFieldEditor;
@interface BDSKURLGroupSheetController : NSWindowController
<NSTouchBarDelegate>
@@ -52,18 +54,18 @@
CFArrayRef editors;
}
-- (instancetype)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithURL:(nullable NSURL *)aURL;
-@property (nonatomic, strong) IBOutlet BDSKDragTextField *urlField;
-@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKDragTextField *urlField;
+@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-- (IBAction)chooseURL:(id)sender;
+- (IBAction)chooseURL:(nullable id)sender;
-@property (nonatomic, strong) NSString *urlString;
+@property (nonatomic, nullable, strong) NSString *urlString;
-@property (nonatomic, readonly) NSURL *URL;
+@property (nonatomic, nullable, readonly) NSURL *URL;
- (BOOL)commitEditing;
@@ -70,3 +72,5 @@
@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKURLSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKURLSheetController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+NS_ASSUME_NONNULL_BEGIN
+
@interface BDSKURLSheetController : NSWindowController <NSTouchBarDelegate> {
NSTextField *urlField;
NSButton *okButton;
@@ -44,14 +46,16 @@
NSButton *cancelButton;
}
-@property (nonatomic, strong) IBOutlet NSTextField *urlField;
-@property (nonatomic, strong) IBOutlet NSButton *okButton;
-@property (nonatomic, strong) IBOutlet NSButton *cancelButton;
+@property (nonatomic, nullable, strong) IBOutlet NSTextField *urlField;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
+@property (nonatomic, nullable, strong) IBOutlet NSButton *cancelButton;
-@property (nonatomic, strong) NSString *urlString;
+@property (nonatomic, nullable, strong) NSString *urlString;
-@property (nonatomic, readonly) NSURL *URL;
+@property (nonatomic, nullable, readonly) NSURL *URL;
-- (void)openBookmark:(id)sender;
+- (void)openBookmark:(nullable id)sender;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKWebGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.h 2025-02-17 23:14:17 UTC (rev
29018)
+++ trunk/bibdesk/BDSKWebGroupViewController.h 2025-02-18 16:08:25 UTC (rev
29019)
@@ -40,6 +40,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKWebView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKEdgeView, BDSKAddressTextField, BDSKFieldEditor;
@interface BDSKWebGroupViewController : NSViewController <NSMenuDelegate,
BDSKWebViewNavigationDelegate> {
@@ -48,15 +50,17 @@
BDSKFieldEditor *fieldEditor;
}
-@property (nonatomic, strong) IBOutlet BDSKAddressTextField *urlField;
-@property (nonatomic, strong) IBOutlet NSSegmentedControl *backForwardButton;
+@property (nonatomic, nullable, strong) IBOutlet BDSKAddressTextField
*urlField;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*backForwardButton;
-@property (nonatomic, strong) BDSKWebView *webView;
+@property (nonatomic, nullable, strong) BDSKWebView *webView;
-- (IBAction)changeURL:(id)sender;
-- (IBAction)goBackForward:(id)sender;
-- (IBAction)stopOrReloadAction:(id)sender;
+- (IBAction)changeURL:(nullable id)sender;
+- (IBAction)goBackForward:(nullable id)sender;
+- (IBAction)stopOrReloadAction:(nullable id)sender;
-- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject;
+- (nullable id)windowWillReturnFieldEditor:(NSWindow *)sender
toObject:(id)anObject;
@end
+
+NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKWebViewModalDialogController.h
===================================================================
--- trunk/bibdesk/BDSKWebViewModalDialogController.h 2025-02-17 23:14:17 UTC
(rev 29018)
+++ trunk/bibdesk/BDSKWebViewModalDialogController.h 2025-02-18 16:08:25 UTC
(rev 29019)
@@ -39,6 +39,8 @@
#import <Cocoa/Cocoa.h>
#import "BDSKWebView.h"
+NS_ASSUME_NONNULL_BEGIN
+
@class BDSKStatusBar;
@interface BDSKWebViewModalDialogController : NSWindowController
<BDSKWebViewDelegate, NSWindowDelegate> {
@@ -48,3 +50,5 @@
}
@property (nonatomic, readonly) BDSKWebView *webView;
@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
