Revision: 29025 http://sourceforge.net/p/bibdesk/svn/29025 Author: hofman Date: 2025-02-19 09:45:36 +0000 (Wed, 19 Feb 2025) Log Message: ----------- add nullability to preference pane classes
Modified Paths: -------------- trunk/bibdesk/BDSKStringConstants.h trunk/bibdesk/BibPref_AutoFile.h trunk/bibdesk/BibPref_Cite.h trunk/bibdesk/BibPref_CiteKey.h trunk/bibdesk/BibPref_Crossref.h trunk/bibdesk/BibPref_Defaults.h trunk/bibdesk/BibPref_Display.h trunk/bibdesk/BibPref_Export.h trunk/bibdesk/BibPref_Files.h trunk/bibdesk/BibPref_General.h trunk/bibdesk/BibPref_ScriptHooks.h trunk/bibdesk/BibPref_Sharing.h trunk/bibdesk/BibPref_TeX.h Modified: trunk/bibdesk/BDSKStringConstants.h =================================================================== --- trunk/bibdesk/BDSKStringConstants.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BDSKStringConstants.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -34,6 +34,7 @@ #import <Foundation/Foundation.h> +NS_ASSUME_NONNULL_BEGIN @interface NSString (BDSKStringConstants) + (void)initializeStringConstants; @@ -328,3 +329,5 @@ #pragma mark Exception name strings extern NSString *BDSKUnimplementedException; + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_AutoFile.h =================================================================== --- trunk/bibdesk/BibPref_AutoFile.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_AutoFile.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -40,6 +40,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN @interface BibPref_AutoFile : BDSKPreferencePane <NSControlTextEditingDelegate> { NSTextField *papersFolderLocationTextField; @@ -64,35 +65,37 @@ NSString *lastPapersFolderPath; } -@property (nonatomic, strong) IBOutlet NSTextField *papersFolderLocationTextField; -@property (nonatomic, strong) IBOutlet NSButton *choosePapersFolderLocationButton; -@property (nonatomic, strong) IBOutlet NSButton *fixedPapersFolderRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *relativePapersFolderRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *filePapersAutomaticallyCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnMoveFolderCheckButton; -@property (nonatomic, strong) IBOutlet NSTextField *formatField; -@property (nonatomic, strong) IBOutlet NSPopUpButton *formatPresetPopUp; -@property (nonatomic, strong) IBOutlet NSPopUpButton *formatRepositoryPopUp; -@property (nonatomic, strong) IBOutlet NSButton *formatWarningButton; -@property (nonatomic, strong) IBOutlet NSButton *formatLowercaseCheckButton; -@property (nonatomic, strong) IBOutlet NSTextField *previewTextField; -@property (nonatomic, strong) IBOutlet NSButton *cleanNothingRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanBracesRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanTeXRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanWindowsRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanNonASCIIRadioButton; -@property (nonatomic, strong) IBOutlet NSTextField *previewDisplay; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *papersFolderLocationTextField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *choosePapersFolderLocationButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *fixedPapersFolderRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *relativePapersFolderRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *filePapersAutomaticallyCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnMoveFolderCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *formatField; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *formatPresetPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *formatRepositoryPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSButton *formatWarningButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *formatLowercaseCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *previewTextField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanNothingRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanBracesRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanTeXRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanWindowsRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanNonASCIIRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *previewDisplay; @property (nonatomic) BOOL hasPapersFolder; -- (IBAction)choosePapersFolderLocationAction:(id)sender; -- (IBAction)localUrlFormatChanged:(id)sender; -- (IBAction)localUrlFormatAdd:(id)sender; -- (IBAction)localUrlHelp:(id)sender; -- (IBAction)formatHelp:(id)sender; -- (IBAction)showLocalUrlFormatWarning:(id)sender; +- (IBAction)choosePapersFolderLocationAction:(nullable id)sender; +- (IBAction)localUrlFormatChanged:(nullable id)sender; +- (IBAction)localUrlFormatAdd:(nullable id)sender; +- (IBAction)localUrlHelp:(nullable id)sender; +- (IBAction)formatHelp:(nullable id)sender; +- (IBAction)showLocalUrlFormatWarning:(nullable id)sender; @end @interface BDSKFolderPathFormatter : NSFormatter @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Cite.h =================================================================== --- trunk/bibdesk/BibPref_Cite.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Cite.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -36,6 +36,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @interface BibPref_Cite : BDSKPreferencePane <NSTextFieldDelegate> { NSPopUpButton *defaultDragCopyPopup; @@ -53,25 +55,27 @@ NSButton *contextBracketRadioButton; } -@property (nonatomic, strong) IBOutlet NSPopUpButton *defaultDragCopyPopup; -@property (nonatomic, strong) IBOutlet NSPopUpButton *defaultDragCopyTemplatePopup; -@property (nonatomic, strong) IBOutlet NSPopUpButton *alternateDragCopyPopup; -@property (nonatomic, strong) IBOutlet NSPopUpButton *alternateDragCopyTemplatePopup; -@property (nonatomic, strong) IBOutlet NSTextField *citeBehaviorLine; -@property (nonatomic, strong) IBOutlet NSTextField *citeStringField; -@property (nonatomic, strong) IBOutlet NSButton *singleRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *separateRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *multipleRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *prependTildeCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *texBracketRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *contextBracketRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *defaultDragCopyPopup; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *defaultDragCopyTemplatePopup; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *alternateDragCopyPopup; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *alternateDragCopyTemplatePopup; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeBehaviorLine; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeStringField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *singleRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *separateRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *multipleRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *prependTildeCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *texBracketRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *contextBracketRadioButton; @property (nonatomic) NSInteger useTeXBrackets; -- (IBAction)changeDefaultDragCopyTemplate:(id)sender; -- (IBAction)changeAlternateDragCopyTemplate:(id)sender; +- (IBAction)changeDefaultDragCopyTemplate:(nullable id)sender; +- (IBAction)changeAlternateDragCopyTemplate:(nullable id)sender; @end @interface BDSKDragCopyCiteKeyFormatter : NSFormatter @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_CiteKey.h =================================================================== --- trunk/bibdesk/BibPref_CiteKey.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_CiteKey.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -39,6 +39,7 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN @interface BibPref_CiteKey : BDSKPreferencePane { @@ -55,22 +56,24 @@ NSTextField *previewDisplay; } -@property (nonatomic, strong) IBOutlet NSTextField *citeKeyLine; -@property (nonatomic, strong) IBOutlet NSTextField *formatField; -@property (nonatomic, strong) IBOutlet NSPopUpButton *formatPresetPopUp; -@property (nonatomic, strong) IBOutlet NSPopUpButton *formatRepositoryPopUp; -@property (nonatomic, strong) IBOutlet NSButton *formatWarningButton; -@property (nonatomic, strong) IBOutlet NSButton *citeKeyAutogenerateCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *citeKeyLowercaseCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanBracesRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanTeXRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *cleanNothingRadioButton; -@property (nonatomic, strong) IBOutlet NSTextField *previewDisplay; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeKeyLine; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *formatField; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *formatPresetPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *formatRepositoryPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSButton *formatWarningButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *citeKeyAutogenerateCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *citeKeyLowercaseCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanBracesRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanTeXRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *cleanNothingRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *previewDisplay; -- (IBAction)citeKeyFormatChanged:(id)sender; -- (IBAction)citeKeyFormatAdd:(id)sender; -- (IBAction)citeKeyHelp:(id)sender; -- (IBAction)formatHelp:(id)sender; -- (IBAction)showCiteKeyFormatWarning:(id)sender; +- (IBAction)citeKeyFormatChanged:(nullable id)sender; +- (IBAction)citeKeyFormatAdd:(nullable id)sender; +- (IBAction)citeKeyHelp:(nullable id)sender; +- (IBAction)formatHelp:(nullable id)sender; +- (IBAction)showCiteKeyFormatWarning:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Crossref.h =================================================================== --- trunk/bibdesk/BibPref_Crossref.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Crossref.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @interface BibPref_Crossref : BDSKPreferencePane <NSTableViewDelegate, NSTableViewDataSource> { NSButton *autoSortCheckButton; @@ -50,17 +52,19 @@ NSMutableArray *typesArray; } -@property (nonatomic, strong) IBOutlet NSButton *autoSortCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnEditInheritedCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *duplicateBooktitleCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *forceDuplicateBooktitleCheckButton; -@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveTypeButton; -@property (nonatomic, strong) IBOutlet NSTableView *tableView; +@property (nonatomic, nullable, strong) IBOutlet NSButton *autoSortCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnEditInheritedCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *duplicateBooktitleCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *forceDuplicateBooktitleCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *addRemoveTypeButton; +@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView; -- (IBAction)addRemoveType:(id)sender; -- (IBAction)changeDuplicateType:(id)sender; +- (IBAction)addRemoveType:(nullable id)sender; +- (IBAction)changeDuplicateType:(nullable id)sender; @end @interface BDSKDisablingTableView : NSTableView @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Defaults.h =================================================================== --- trunk/bibdesk/BibPref_Defaults.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Defaults.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -36,6 +36,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKMacroWindowController, BDSKTableView; @interface BibPref_Defaults : BDSKPreferencePane <NSTableViewDelegate, NSTableViewDataSource> @@ -58,34 +60,36 @@ BDSKMacroWindowController *macroWC; } -@property (nonatomic, strong) IBOutlet NSButton *useLocalUrlButton; -@property (nonatomic, strong) IBOutlet NSButton *convertURLFieldsButton; -@property (nonatomic, strong) IBOutlet NSButton *removeLocalFileFieldsButton; -@property (nonatomic, strong) IBOutlet NSButton *removeRemoteURLFieldsButton; -@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveDefaultFieldButton; -@property (nonatomic, strong) IBOutlet NSWindow *globalMacroFileSheet; -@property (nonatomic, strong) IBOutlet BDSKTableView *globalMacroFilesTableView; -@property (nonatomic, strong) IBOutlet NSTableView *defaultFieldsTableView; -@property (nonatomic, strong) IBOutlet NSButton *editGlobalMacroDefsButton; -@property (nonatomic, strong) IBOutlet NSPopUpButton *localFileOptionPopup; -@property (nonatomic, strong) IBOutlet NSPopUpButton *pdfViewerPopup; -@property (nonatomic, strong) IBOutlet NSPopUpButton *downloadsFolderPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSButton *useLocalUrlButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *convertURLFieldsButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *removeLocalFileFieldsButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *removeRemoteURLFieldsButton; +@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *addRemoveDefaultFieldButton; +@property (nonatomic, nullable, strong) IBOutlet NSWindow *globalMacroFileSheet; +@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *globalMacroFilesTableView; +@property (nonatomic, nullable, strong) IBOutlet NSTableView *defaultFieldsTableView; +@property (nonatomic, nullable, strong) IBOutlet NSButton *editGlobalMacroDefsButton; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *localFileOptionPopup; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *pdfViewerPopup; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *downloadsFolderPopUp; @property (nonatomic) BOOL convertURLFields; -- (IBAction)changeFieldName:(id)sender; -- (IBAction)changeFieldType:(id)sender; -- (IBAction)changeFieldIsDefault:(id)sender; -- (IBAction)changeGlobalMacroFile:(id)sender; +- (IBAction)changeFieldName:(nullable id)sender; +- (IBAction)changeFieldType:(nullable id)sender; +- (IBAction)changeFieldIsDefault:(nullable id)sender; +- (IBAction)changeGlobalMacroFile:(nullable id)sender; -- (IBAction)addRemoveDefaultField:(id)sender; -- (IBAction)showTypeInfoEditor:(id)sender; +- (IBAction)addRemoveDefaultField:(nullable id)sender; +- (IBAction)showTypeInfoEditor:(nullable id)sender; -- (IBAction)showMacrosWindow:(id)sender; -- (IBAction)showMacroFileWindow:(id)sender; -- (IBAction)closeMacroFileWindow:(id)sender; -- (IBAction)addRemoveGlobalMacroFile:(id)sender; -- (IBAction)changeDefaultPDFViewer:(id)sender; -- (IBAction)chooseDownloadsFolder:(id)sender; +- (IBAction)showMacrosWindow:(nullable id)sender; +- (IBAction)showMacroFileWindow:(nullable id)sender; +- (IBAction)closeMacroFileWindow:(nullable id)sender; +- (IBAction)addRemoveGlobalMacroFile:(nullable id)sender; +- (IBAction)changeDefaultPDFViewer:(nullable id)sender; +- (IBAction)chooseDownloadsFolder:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Display.h =================================================================== --- trunk/bibdesk/BibPref_Display.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Display.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -40,6 +40,8 @@ #import "BDSKPreferencePane.h" #import "BDSKPreferenceController.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKFontWell; @interface BibPref_Display : BDSKPreferencePane { @@ -61,20 +63,22 @@ BOOL updatingFont; } -@property (nonatomic, strong) IBOutlet NSComboBox *previewMaxNumberComboBox; -@property (nonatomic, strong) IBOutlet BDSKFontWell *publicationsFontWell; -@property (nonatomic, strong) IBOutlet BDSKFontWell *groupsFontWell; -@property (nonatomic, strong) IBOutlet BDSKFontWell *personsFontWell; -@property (nonatomic, strong) IBOutlet BDSKFontWell *abstractFontWell; -@property (nonatomic, strong) IBOutlet NSTextField *ignoredSortTermsField; -@property (nonatomic, strong) IBOutlet NSButton *displayGroupCountButton; -@property (nonatomic, strong) IBOutlet NSButton *authorFirstNameButton; -@property (nonatomic, strong) IBOutlet NSButton *authorAbbreviateButton; -@property (nonatomic, strong) IBOutlet NSButton *authorLastNameFirstButton; +@property (nonatomic, nullable, strong) IBOutlet NSComboBox *previewMaxNumberComboBox; +@property (nonatomic, nullable, strong) IBOutlet BDSKFontWell *publicationsFontWell; +@property (nonatomic, nullable, strong) IBOutlet BDSKFontWell *groupsFontWell; +@property (nonatomic, nullable, strong) IBOutlet BDSKFontWell *personsFontWell; +@property (nonatomic, nullable, strong) IBOutlet BDSKFontWell *abstractFontWell; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *ignoredSortTermsField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *displayGroupCountButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *authorFirstNameButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *authorAbbreviateButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *authorLastNameFirstButton; -- (IBAction)changePublicationsFont:(id)sender; -- (IBAction)changeGroupsFont:(id)sender; -- (IBAction)changePersonsFont:(id)sender; -- (IBAction)changeAbstractFont:(id)sender; +- (IBAction)changePublicationsFont:(nullable id)sender; +- (IBAction)changeGroupsFont:(nullable id)sender; +- (IBAction)changePersonsFont:(nullable id)sender; +- (IBAction)changeAbstractFont:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Export.h =================================================================== --- trunk/bibdesk/BibPref_Export.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Export.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -40,6 +40,8 @@ #import "BDSKPreferencePane.h" #import "BDSKOutlineView.h" +NS_ASSUME_NONNULL_BEGIN + typedef NS_ENUM(NSInteger, BDSKTemplateListType) { BDSKTemplateListExport = 0, BDSKTemplateListService = 1 @@ -61,26 +63,28 @@ NSPopUpButton *chooseMainPagePopup; } -@property (nonatomic, strong) IBOutlet BDSKOutlineView *outlineView; -@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveButton; -@property (nonatomic, strong) IBOutlet NSButton *exportRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *serviceRadioButton; -@property (nonatomic, strong) IBOutlet NSWindow *chooseMainPageSheet; -@property (nonatomic, strong) IBOutlet NSPopUpButton *chooseMainPagePopup; +@property (nonatomic, nullable, strong) IBOutlet BDSKOutlineView *outlineView; +@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *addRemoveButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *exportRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *serviceRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSWindow *chooseMainPageSheet; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *chooseMainPagePopup; @property (nonatomic) BDSKTemplateListType templatePrefList; -- (IBAction)resetDefaultFiles:(id)sender; +- (IBAction)resetDefaultFiles:(nullable id)sender; -- (IBAction)addRemoveNode:(id)sender; +- (IBAction)addRemoveNode:(nullable id)sender; -- (IBAction)changeName:(id)sender; -- (IBAction)changeRole:(id)sender; +- (IBAction)changeName:(nullable id)sender; +- (IBAction)changeRole:(nullable id)sender; -- (IBAction)revealInFinder:(id)sender; -- (IBAction)chooseFile:(id)sender; -- (IBAction)chooseFileDoubleAction:(id)sender; +- (IBAction)revealInFinder:(nullable id)sender; +- (IBAction)chooseFile:(nullable id)sender; +- (IBAction)chooseFileDoubleAction:(nullable id)sender; -- (IBAction)dismissChooseMainPageSheet:(id)sender; +- (IBAction)dismissChooseMainPageSheet:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Files.h =================================================================== --- trunk/bibdesk/BibPref_Files.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Files.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKEncodingPopUpButton; @interface BibPref_Files : BDSKPreferencePane { @@ -56,23 +58,25 @@ NSTextField *autosaveTimeField; } -@property (nonatomic, strong) IBOutlet NSButton *showErrorsCheckButton; -@property (nonatomic, strong) IBOutlet BDSKEncodingPopUpButton *encodingPopUp; -@property (nonatomic, strong) IBOutlet NSButton *shouldTeXifyCheckButton; -@property (nonatomic, strong) IBOutlet NSButton *saveAnnoteAndAbstractAtEndButton; -@property (nonatomic, strong) IBOutlet NSButton *useNormalizedNamesButton; -@property (nonatomic, strong) IBOutlet NSButton *useTemplateFileButton; -@property (nonatomic, strong) IBOutlet NSButton *outputTemplateFileButton; -@property (nonatomic, strong) IBOutlet NSButton *autosaveInPlaceRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *autosaveBackupRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *neverAutosaveRadioButton; -@property (nonatomic, strong) IBOutlet NSStepper *autosaveTimeStepper; -@property (nonatomic, strong) IBOutlet NSTextField *autosaveTimeField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *showErrorsCheckButton; +@property (nonatomic, nullable, strong) IBOutlet BDSKEncodingPopUpButton *encodingPopUp; +@property (nonatomic, nullable, strong) IBOutlet NSButton *shouldTeXifyCheckButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *saveAnnoteAndAbstractAtEndButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *useNormalizedNamesButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *useTemplateFileButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *outputTemplateFileButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *autosaveInPlaceRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *autosaveBackupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *neverAutosaveRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSStepper *autosaveTimeStepper; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *autosaveTimeField; -- (IBAction)setDefaultStringEncoding:(id)sender; -- (IBAction)editTemplateFile:(id)sender; -- (IBAction)resetTemplateFile:(id)sender; -- (IBAction)showConversionEditor:(id)sender; -- (IBAction)resetConversions:(id)sender; +- (IBAction)setDefaultStringEncoding:(nullable id)sender; +- (IBAction)editTemplateFile:(nullable id)sender; +- (IBAction)resetTemplateFile:(nullable id)sender; +- (IBAction)showConversionEditor:(nullable id)sender; +- (IBAction)resetConversions:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_General.h =================================================================== --- trunk/bibdesk/BibPref_General.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_General.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -37,6 +37,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @interface BibPref_General : BDSKPreferencePane { NSButton *emptyStartupRadioButton; NSButton *nothingStartupRadioButton; @@ -58,28 +60,30 @@ NSButton *defaultBibFileButton; } -@property (nonatomic, strong) IBOutlet NSButton *emptyStartupRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *nothingStartupRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *openStartupRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *fileStartupRadioButton; -@property (nonatomic, strong) IBOutlet NSButton *savedStartupRadioButton; -@property (nonatomic, strong) IBOutlet NSPopUpButton *emailTemplatePopup; -@property (nonatomic, strong) IBOutlet NSButton *editOnPasteButton; -@property (nonatomic, strong) IBOutlet NSButton *downloadImportedURLsButton; -@property (nonatomic, strong) IBOutlet NSTextField *downloadedTypesTextField; -@property (nonatomic, strong) IBOutlet NSButton *replaceDownloadedURLsButton; -@property (nonatomic, strong) IBOutlet NSPopUpButton *checkForUpdatesButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnDeleteButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnRemovalFromGroupButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnRenameGroupButton; -@property (nonatomic, strong) IBOutlet NSButton *warnOnGenerateCiteKeysButton; -@property (nonatomic, strong) IBOutlet NSButton *askToTrashFilesButton; -@property (nonatomic, strong) IBOutlet NSTextField *defaultBibFileTextField; -@property (nonatomic, strong) IBOutlet NSButton *defaultBibFileButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *emptyStartupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *nothingStartupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *openStartupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *fileStartupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *savedStartupRadioButton; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *emailTemplatePopup; +@property (nonatomic, nullable, strong) IBOutlet NSButton *editOnPasteButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *downloadImportedURLsButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *downloadedTypesTextField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *replaceDownloadedURLsButton; +@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *checkForUpdatesButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnDeleteButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnRemovalFromGroupButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnRenameGroupButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *warnOnGenerateCiteKeysButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *askToTrashFilesButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *defaultBibFileTextField; +@property (nonatomic, nullable, strong) IBOutlet NSButton *defaultBibFileButton; -- (IBAction)setAutoOpenFilePath:(id)sender; -- (IBAction)changeEmailTemplate:(id)sender; -- (IBAction)chooseAutoOpenFile:(id) sender; -- (IBAction)changeUpdateInterval:(id)sender; +- (IBAction)setAutoOpenFilePath:(nullable id)sender; +- (IBAction)changeEmailTemplate:(nullable id)sender; +- (IBAction)chooseAutoOpenFile:(nullable id) sender; +- (IBAction)changeUpdateInterval:(nullable id)sender; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_ScriptHooks.h =================================================================== --- trunk/bibdesk/BibPref_ScriptHooks.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_ScriptHooks.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -39,6 +39,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @interface BibPref_ScriptHooks : BDSKPreferencePane <NSTableViewDelegate, NSTableViewDataSource, NSMenuDelegate> { NSTableView *tableView; NSSegmentedControl *addRemoveButton; @@ -45,16 +47,16 @@ NSArray *scriptHookFiles; } -@property (nonatomic, strong) IBOutlet NSTableView *tableView; -@property (nonatomic, strong) IBOutlet NSSegmentedControl *addRemoveButton; +@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView; +@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *addRemoveButton; @property (nonatomic, readonly) NSArray *scriptHookFiles; -- (IBAction)addRemoveScriptHook:(id)sender; -- (void)showOrChooseScriptFile:(id)sender; -- (void)revealScriptFileInFinder:(id)sender; -- (void)removeScriptFile:(id)sender; -- (void)editNewScriptFile:(id)sender; +- (IBAction)addRemoveScriptHook:(nullable id)sender; +- (void)showOrChooseScriptFile:(nullable id)sender; +- (void)revealScriptFileInFinder:(nullable id)sender; +- (void)removeScriptFile:(nullable id)sender; +- (void)editNewScriptFile:(nullable id)sender; @end @@ -66,10 +68,12 @@ - (instancetype)initWithName:(NSString *)aName; @property (nonatomic, readonly) NSString *name; -@property (nonatomic, readonly) NSString *localizedName; -@property (nonatomic, strong) NSString *path; -@property (nonatomic, readonly) NSString *abbreviatedPath; -@property (nonatomic, readonly) NSImage *icon; +@property (nonatomic, nullable, readonly) NSString *localizedName; +@property (nonatomic, nullable, strong) NSString *path; +@property (nonatomic, nullable, readonly) NSString *abbreviatedPath; +@property (nonatomic, nullable, readonly) NSImage *icon; @property (nonatomic, readonly) NSString *toolTip; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_Sharing.h =================================================================== --- trunk/bibdesk/BibPref_Sharing.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_Sharing.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -40,6 +40,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @interface BibPref_Sharing : BDSKPreferencePane { NSButton *enableBrowsingButton; @@ -53,15 +55,17 @@ BOOL didDisplay; } -@property (nonatomic, strong) IBOutlet NSButton *enableBrowsingButton; -@property (nonatomic, strong) IBOutlet NSButton *enableSharingButton; -@property (nonatomic, strong) IBOutlet NSButton *usePasswordButton; -@property (nonatomic, strong) IBOutlet NSSecureTextField *passwordField; -@property (nonatomic, strong) IBOutlet NSTextField *sharedNameField; -@property (nonatomic, strong) IBOutlet NSTextField *statusField; -@property (nonatomic, strong) IBOutlet NSTextField *usedNameField; -@property (nonatomic, strong) IBOutlet NSImageView *statusImageView; +@property (nonatomic, nullable, strong) IBOutlet NSButton *enableBrowsingButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *enableSharingButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *usePasswordButton; +@property (nonatomic, nullable, strong) IBOutlet NSSecureTextField *passwordField; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *sharedNameField; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *statusField; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *usedNameField; +@property (nonatomic, nullable, strong) IBOutlet NSImageView *statusImageView; -@property (nonatomic, copy) NSString *password; +@property (nonatomic, nullable, copy) NSString *password; @end + +NS_ASSUME_NONNULL_END Modified: trunk/bibdesk/BibPref_TeX.h =================================================================== --- trunk/bibdesk/BibPref_TeX.h 2025-02-18 23:29:15 UTC (rev 29024) +++ trunk/bibdesk/BibPref_TeX.h 2025-02-19 09:45:36 UTC (rev 29025) @@ -37,6 +37,8 @@ #import <Cocoa/Cocoa.h> #import "BDSKPreferencePane.h" +NS_ASSUME_NONNULL_BEGIN + @class BDSKEncodingPopUpButton; @interface BibPref_TeX : BDSKPreferencePane <NSTextFieldDelegate, NSAlertDelegate> @@ -48,16 +50,18 @@ BDSKEncodingPopUpButton *encodingPopUpButton; } -@property (nonatomic, strong) IBOutlet NSButton *usesTeXButton; -@property (nonatomic, strong) IBOutlet NSTextField *texBinaryPathField; -@property (nonatomic, strong) IBOutlet NSTextField *bibtexBinaryPathField; -@property (nonatomic, strong) IBOutlet NSComboBox *bibTeXStyleField; -@property (nonatomic, strong) IBOutlet BDSKEncodingPopUpButton *encodingPopUpButton; +@property (nonatomic, nullable, strong) IBOutlet NSButton *usesTeXButton; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *texBinaryPathField; +@property (nonatomic, nullable, strong) IBOutlet NSTextField *bibtexBinaryPathField; +@property (nonatomic, nullable, strong) IBOutlet NSComboBox *bibTeXStyleField; +@property (nonatomic, nullable, strong) IBOutlet BDSKEncodingPopUpButton *encodingPopUpButton; -- (IBAction)changeStyle:(id)sender; -- (IBAction)resetTeXPreviewFile:(id)sender; -- (IBAction)openTeXPreviewFile:(id)sender; -- (IBAction)downloadTeX:(id)sender; +- (IBAction)changeStyle:(nullable id)sender; +- (IBAction)resetTeXPreviewFile:(nullable id)sender; +- (IBAction)openTeXPreviewFile:(nullable nullable id)sender; +- (IBAction)downloadTeX:(nullable id)sender; - (IBAction)changeDefaultTeXEncoding:(id)sender; @end + +NS_ASSUME_NONNULL_END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Bibdesk-commit mailing list Bibdesk-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-commit