Revision: 28695
http://sourceforge.net/p/bibdesk/svn/28695
Author: hofman
Date: 2024-02-05 15:51:17 +0000 (Mon, 05 Feb 2024)
Log Message:
-----------
Use instancetype
Modified Paths:
--------------
trunk/bibdesk/BDSKAsynchronousWebParser.h
trunk/bibdesk/BDSKBookmark.h
trunk/bibdesk/BDSKCategoryFormatter.h
trunk/bibdesk/BDSKCategoryGroup.h
trunk/bibdesk/BDSKCitationFormatter.h
trunk/bibdesk/BDSKComplexString.h
trunk/bibdesk/BDSKComplexStringEditor.h
trunk/bibdesk/BDSKComplexStringFormatter.h
trunk/bibdesk/BDSKCondition+Scripting.h
trunk/bibdesk/BDSKCondition.h
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKCustomCiteDrawerController.h
trunk/bibdesk/BDSKDocumentSearch.h
trunk/bibdesk/BDSKDownloadManager.h
trunk/bibdesk/BDSKEditor.h
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorManager.h
trunk/bibdesk/BDSKErrorObject.h
trunk/bibdesk/BDSKExternalGroup.h
trunk/bibdesk/BDSKField.h
trunk/bibdesk/BDSKFieldCollection.h
trunk/bibdesk/BDSKFieldInfo.h
trunk/bibdesk/BDSKFieldSheetController.h
trunk/bibdesk/BDSKFileContentSearchController.h
trunk/bibdesk/BDSKFileSearch.h
trunk/bibdesk/BDSKFileSearchIndex.h
trunk/bibdesk/BDSKFileSearchResult.h
trunk/bibdesk/BDSKFilerErrorController.h
trunk/bibdesk/BDSKFilter.h
trunk/bibdesk/BDSKFilterController.h
trunk/bibdesk/BDSKFormatStringFormatter.h
trunk/bibdesk/BDSKGroup.h
trunk/bibdesk/BDSKGroupsArray.h
trunk/bibdesk/BDSKInfo.h
trunk/bibdesk/BDSKItemDownload.h
trunk/bibdesk/BDSKLastImportGroup.h
trunk/bibdesk/BDSKLinkedFile.h
trunk/bibdesk/BDSKMacro.h
trunk/bibdesk/BDSKMacroResolver.h
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMergeController.h
trunk/bibdesk/BDSKMetadataCacheOperation.h
trunk/bibdesk/BDSKNotesSearchIndex.h
trunk/bibdesk/BDSKNotesWindowController.h
trunk/bibdesk/BDSKParentGroup.h
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPreferencePane.h
trunk/bibdesk/BDSKPreferenceRecord.h
trunk/bibdesk/BDSKPublicationsArray.h
trunk/bibdesk/BDSKRadioTransformer.h
trunk/bibdesk/BDSKRatingButtonCell.h
trunk/bibdesk/BDSKScriptGroup.h
trunk/bibdesk/BDSKScriptGroupSheetController.h
trunk/bibdesk/BDSKScriptHook.h
trunk/bibdesk/BDSKSearchBookmark.h
trunk/bibdesk/BDSKSearchGroup.h
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKServerInfo.h
trunk/bibdesk/BDSKSharedGroup.h
trunk/bibdesk/BDSKSharingClient.h
trunk/bibdesk/BDSKSmartGroup.h
trunk/bibdesk/BDSKSoapBinding.h
trunk/bibdesk/BDSKStaticGroup.h
trunk/bibdesk/BDSKStringNode.h
trunk/bibdesk/BDSKTeXTask.h
trunk/bibdesk/BDSKTemplate.h
trunk/bibdesk/BDSKTemplateObjectProxy.h
trunk/bibdesk/BDSKTemplateTag.h
trunk/bibdesk/BDSKTextImportController.h
trunk/bibdesk/BDSKTextUndoManager.h
trunk/bibdesk/BDSKToken.h
trunk/bibdesk/BDSKTouchBarButtonGroup.h
trunk/bibdesk/BDSKTreeNode.h
trunk/bibdesk/BDSKTypeInfo.h
trunk/bibdesk/BDSKTypeTemplate.h
trunk/bibdesk/BDSKURLGroup.h
trunk/bibdesk/BDSKURLGroupSheetController.h
trunk/bibdesk/BDSKVersionNumber.h
trunk/bibdesk/BDSKWebParser.h
trunk/bibdesk/BibAuthor.h
trunk/bibdesk/BibItem.h
trunk/bibdesk/BibPref_ScriptHooks.h
trunk/bibdesk/NSAttributedString_BDSKExtensions.h
trunk/bibdesk/NSColor_BDSKExtensions.h
trunk/bibdesk/NSData_BDSKExtensions.h
trunk/bibdesk/NSError_BDSKExtensions.h
trunk/bibdesk/NSImage_BDSKExtensions.h
trunk/bibdesk/NSInvocation_BDSKExtensions.h
Modified: trunk/bibdesk/BDSKAsynchronousWebParser.h
===================================================================
--- trunk/bibdesk/BDSKAsynchronousWebParser.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKAsynchronousWebParser.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -88,7 +88,7 @@
id contextInfo;
}
-- (id)initWithRequest:(NSURLRequest *)aRequest
delegate:(id<BDSKCitationDownloadDelegate>)aDelegate
contextInfo:(id)aContextInfo;
+- (instancetype)initWithRequest:(NSURLRequest *)aRequest
delegate:(id<BDSKCitationDownloadDelegate>)aDelegate
contextInfo:(id)aContextInfo;
@property (nonatomic, readonly) NSURL *URL;
@property (nonatomic, readonly) NSData *data;
Modified: trunk/bibdesk/BDSKBookmark.h
===================================================================
--- trunk/bibdesk/BDSKBookmark.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKBookmark.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -48,12 +48,12 @@
__weak BDSKBookmark *parent;
}
-- (id)initWithURL:(NSURL *)aURL name:(NSString *)aName;
-- (id)initFolderWithChildren:(NSArray *)aChildren name:(NSString *)aName;
-- (id)initFolderWithName:(NSString *)aName;
-- (id)initRootWithChildrenDictionaries:(NSArray *)dictionaries;
-- (id)initSeparator;
-- (id)initWithDictionary:(NSDictionary *)dictionary;
+- (instancetype)initWithURL:(NSURL *)aURL name:(NSString *)aName;
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren name:(NSString
*)aName;
+- (instancetype)initFolderWithName:(NSString *)aName;
+- (instancetype)initRootWithChildrenDictionaries:(NSArray *)dictionaries;
+- (instancetype)initSeparator;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKCategoryFormatter.h
===================================================================
--- trunk/bibdesk/BDSKCategoryFormatter.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKCategoryFormatter.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -43,6 +43,6 @@
NSString *key;
}
-- (id)initWithKey:(NSString *)aKey;
+- (instancetype)initWithKey:(NSString *)aKey;
@end
Modified: trunk/bibdesk/BDSKCategoryGroup.h
===================================================================
--- trunk/bibdesk/BDSKCategoryGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKCategoryGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -51,7 +51,7 @@
@param aName The name for the group, use nil for the "empty" group.
@param aKey The key for the group.
*/
-- (id)initWithName:(id)aName key:(NSString *)aKey;
+- (instancetype)initWithName:(id)aName key:(NSString *)aKey;
@property (nonatomic, readonly) NSString *key;
Modified: trunk/bibdesk/BDSKCitationFormatter.h
===================================================================
--- trunk/bibdesk/BDSKCitationFormatter.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKCitationFormatter.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -50,7 +50,7 @@
__weak id delegate;
}
-- (id)initWithDelegate:(id<BDSKCitationFormatterDelegate>)aDelegate;
+- (instancetype)initWithDelegate:(id<BDSKCitationFormatterDelegate>)aDelegate;
@property (nonatomic, weak) id<BDSKCitationFormatterDelegate> delegate;
Modified: trunk/bibdesk/BDSKComplexString.h
===================================================================
--- trunk/bibdesk/BDSKComplexString.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKComplexString.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -57,7 +57,7 @@
@param macroResolver The macro resolver used to resolve macros
in the complex string.
@result -
*/
-+ (id)stringWithNodes:(NSArray *)nodesArray macroResolver:(BDSKMacroResolver
*)macroResolver;
++ (instancetype)stringWithNodes:(NSArray *)nodesArray
macroResolver:(BDSKMacroResolver *)macroResolver;
/*!
@method stringWithBibTeXString:macroResolver:error:
@@ -68,7 +68,7 @@
@param outError When failing, will be set to the parsing error.
@result -
*/
-+ (id)stringWithBibTeXString:(NSString *)btstring
macroResolver:(BDSKMacroResolver *)theMacroResolver error:(NSError **)outError;
++ (instancetype)stringWithBibTeXString:(NSString *)btstring
macroResolver:(BDSKMacroResolver *)theMacroResolver error:(NSError **)outError;
/*!
@method initWithNodes:macroResolver:
@@ -79,7 +79,7 @@
@param macroResolver The macro resolver used to resolve macros
in the complex string.
@result -
*/
-- (id)initWithNodes:(NSArray *)nodesArray macroResolver:(BDSKMacroResolver
*)theMacroResolver;
+- (instancetype)initWithNodes:(NSArray *)nodesArray
macroResolver:(BDSKMacroResolver *)theMacroResolver;
/*!
@method initWithBibTeXString:macroResolver:error:
@@ -90,7 +90,7 @@
@param outError When failing, will be set to the parsing error.
@result -
*/
-- (id)initWithBibTeXString:(NSString *)btstring
macroResolver:(BDSKMacroResolver *)theMacroResolver error:(NSError **)outError;
+- (instancetype)initWithBibTeXString:(NSString *)btstring
macroResolver:(BDSKMacroResolver *)theMacroResolver error:(NSError **)outError;
/*!
@method isComplex
Modified: trunk/bibdesk/BDSKComplexStringEditor.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKComplexStringEditor.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -49,7 +49,7 @@
NSText *editor;
}
-- (id)initWithFormatter:(BDSKComplexStringFormatter *)aFormatter;
+- (instancetype)initWithFormatter:(BDSKComplexStringFormatter *)aFormatter;
- (void)attachToEditor:(NSText *)textObj;
Modified: trunk/bibdesk/BDSKComplexStringFormatter.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringFormatter.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKComplexStringFormatter.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -45,7 +45,7 @@
BDSKComplexStringEditor *complexStringEditor;
}
-- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
+- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
@property (nonatomic) BOOL editAsComplexString;
Modified: trunk/bibdesk/BDSKCondition+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKCondition+Scripting.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKCondition+Scripting.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -41,7 +41,7 @@
@interface BDSKCondition (Scripting)
-- (id)initWithScriptingProperties:(NSDictionary *)properties;
+- (instancetype)initWithScriptingProperties:(NSDictionary *)properties;
@property (nonatomic, readonly) NSString *scriptingKey;
@property (nonatomic, readonly) NSInteger scriptingComparison;
Modified: trunk/bibdesk/BDSKCondition.h
===================================================================
--- trunk/bibdesk/BDSKCondition.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKCondition.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -116,7 +116,7 @@
@property (class, nonatomic, readonly) NSString *dictionaryVersion;
-- (id)initWithDictionary:(NSDictionary *)dictionary;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKConditionController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -98,7 +98,7 @@
@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*valueWidthConstraint;
@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*stringvalueWidthConstraint;
-- (id)initWithCondition:(BDSKCondition *)aCondition;
+- (instancetype)initWithCondition:(BDSKCondition *)aCondition;
- (IBAction)changeRating:(id)sender;
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.h
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.h 2024-02-04 15:40:43 UTC
(rev 28694)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.h 2024-02-05 15:51:17 UTC
(rev 28695)
@@ -45,7 +45,7 @@
NSMutableArray *customStringArray;
}
-- (id)initForDocument:(BibDocument *)aDocument;
+- (instancetype)initForDocument:(BibDocument *)aDocument;
@property (nonatomic, strong) IBOutlet NSTableView *tableView;
Modified: trunk/bibdesk/BDSKDocumentSearch.h
===================================================================
--- trunk/bibdesk/BDSKDocumentSearch.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKDocumentSearch.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -56,7 +56,7 @@
}
// following are all thread safe, aDelegate must implement all delegate methods
-- (id)initWithDelegate:(id<BDSKDocumentSearchDelegate>)aDelegate;
+- (instancetype)initWithDelegate:(id<BDSKDocumentSearchDelegate>)aDelegate;
- (void)searchForString:(NSString *)searchString index:(SKIndexRef)index
selectedPublications:(NSArray *)selPubs
scrollPositionAsPercentage:(NSPoint)scrollPoint;
@property (nonatomic, readonly) NSArray *previouslySelectedPublications;
Modified: trunk/bibdesk/BDSKDownloadManager.h
===================================================================
--- trunk/bibdesk/BDSKDownloadManager.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKDownloadManager.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -72,7 +72,7 @@
NSURLDownload *URLDownload;
}
-- (id)initWithURLDownload:(NSURLDownload *)aDownload;
+- (instancetype)initWithURLDownload:(NSURLDownload *)aDownload;
@property (nonatomic, readonly) NSURLDownload *URLDownload;
@property (nonatomic, readonly) NSUInteger uniqueID;
Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKEditor.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -119,7 +119,7 @@
} editorFlags;
}
-- (id)initWithPublication:(BibItem *)aBib;
+- (instancetype)initWithPublication:(BibItem *)aBib;
@property (nonatomic, strong) IBOutlet NSSplitView *mainSplitView;
@property (nonatomic, strong) IBOutlet NSSplitView *fileSplitView;
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKErrorEditor.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -58,11 +58,11 @@
}
// designated initializer
-- (id)initWithFileURL:(NSURL *)aFileURL pasteDragData:(NSData *)aData;
+- (instancetype)initWithFileURL:(NSURL *)aFileURL pasteDragData:(NSData
*)aData;
// for editing document source file, load and name errors
-- (id)initWithFileURL:(NSURL *)aFileURL;
+- (instancetype)initWithFileURL:(NSURL *)aFileURL;
// for editing Paste/Drag data
-- (id)initWithPasteDragData:(NSData *)aData;
+- (instancetype)initWithPasteDragData:(NSData *)aData;
@property (nonatomic, strong) IBOutlet NSTextView *textView;
@property (nonatomic, strong) IBOutlet NSButton *syntaxHighlightCheckbox;
Modified: trunk/bibdesk/BDSKErrorManager.h
===================================================================
--- trunk/bibdesk/BDSKErrorManager.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKErrorManager.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -52,7 +52,7 @@
@property (class, nonatomic, readonly) BDSKErrorManager *allItemsErrorManager;
-- (id)initWithDocument:(BibDocument *)aDocument;
+- (instancetype)initWithDocument:(BibDocument *)aDocument;
@property (nonatomic, weak) BDSKErrorObjectController *errorController;
Modified: trunk/bibdesk/BDSKErrorObject.h
===================================================================
--- trunk/bibdesk/BDSKErrorObject.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKErrorObject.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -55,7 +55,7 @@
+ (void)reportError:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag;
+ (void)reportErrorMessage:(NSString *)msg forFile:(NSString *)filePath
line:(NSInteger)line;
-- (id)initWithClassName:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag;
+- (instancetype)initWithClassName:(NSString *)className message:(NSString
*)msg forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag;
@property (nonatomic, readonly) NSString *fileName;
@property (nonatomic, readonly) NSInteger lineNumber;
Modified: trunk/bibdesk/BDSKExternalGroup.h
===================================================================
--- trunk/bibdesk/BDSKExternalGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKExternalGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -49,7 +49,7 @@
BDSKMacroResolver *macroResolver;
}
-- (id)initWithName:(NSString *)aName;
+- (instancetype)initWithName:(NSString *)aName;
- (void)refresh;
Modified: trunk/bibdesk/BDSKField.h
===================================================================
--- trunk/bibdesk/BDSKField.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKField.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -45,7 +45,7 @@
__weak BibItem *bibItem;
}
-- (id)initWithName:(NSString *)newName bibItem:(BibItem *)newBibItem;
+- (instancetype)initWithName:(NSString *)newName bibItem:(BibItem *)newBibItem;
@property (nonatomic, readonly) NSString *name;
Modified: trunk/bibdesk/BDSKFieldCollection.h
===================================================================
--- trunk/bibdesk/BDSKFieldCollection.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKFieldCollection.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -55,7 +55,7 @@
BDSKFieldCollectionType type;
}
-- (id)initWithItem:(BibItem *)anItem;
+- (instancetype)initWithItem:(BibItem *)anItem;
- (void)setType:(BDSKFieldCollectionType)type;
- (id)fieldForName:(NSString *)name;
- (BOOL)isUsedField:(NSString *)name;
@@ -72,7 +72,7 @@
unsigned long mutations;
}
-- (id)initWithFieldCollection:(BDSKFieldCollection *)collection
fieldNames:(NSArray *)array;
+- (instancetype)initWithFieldCollection:(BDSKFieldCollection *)collection
fieldNames:(NSArray *)array;
@property (nonatomic, readonly) id nonEmpty;
- (NSUInteger)count;
- (id)objectAtIndex:(NSUInteger)index;
Modified: trunk/bibdesk/BDSKFieldInfo.h
===================================================================
--- trunk/bibdesk/BDSKFieldInfo.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKFieldInfo.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -42,7 +42,7 @@
NSString *name;
}
-- (id)initWithName:(NSString *)newName;
+- (instancetype)initWithName:(NSString *)newName;
@property (nonatomic, readonly) NSString *name;
Modified: trunk/bibdesk/BDSKFieldSheetController.h
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKFieldSheetController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -57,9 +57,9 @@
NSString *cancelButtonTitle;
}
-+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel choosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel;
-+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel;
-+ (id)fieldSheetControllerWithChoosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel;
++ (instancetype)fieldSheetControllerWithSelectableFields:(NSArray
*)selectableFields label:(NSString *)selectedFieldLabel
choosableFields:(NSArray *)choosableFields label:(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;
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h 2024-02-04 15:40:43 UTC
(rev 28694)
+++ trunk/bibdesk/BDSKFileContentSearchController.h 2024-02-05 15:51:17 UTC
(rev 28695)
@@ -77,7 +77,7 @@
}
// Use this method to instantiate a search controller for use within a
document window
-- (id)initForOwner:(id<BDSKOwner>)owner;
+- (instancetype)initForOwner:(id<BDSKOwner>)owner;
@property (nonatomic, strong) IBOutlet BDSKSelectionPreservingArrayController
*resultsArrayController;
@property (nonatomic, strong) IBOutlet BDSKTableView *tableView;
Modified: trunk/bibdesk/BDSKFileSearch.h
===================================================================
--- trunk/bibdesk/BDSKFileSearch.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKFileSearch.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -111,7 +111,7 @@
*/
-- (id)initWithIndex:(BDSKFileSearchIndex *)anIndex delegate:(id
<BDSKSearchDelegate>)aDelegate;
+- (instancetype)initWithIndex:(BDSKFileSearchIndex *)anIndex delegate:(id
<BDSKSearchDelegate>)aDelegate;
// primary entry point for searching; starts the search, which will send
delegate messages
- (void)searchForString:(NSString *)aString withOptions:(SKSearchOptions)opts;
Modified: trunk/bibdesk/BDSKFileSearchIndex.h
===================================================================
--- trunk/bibdesk/BDSKFileSearchIndex.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKFileSearchIndex.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -83,7 +83,7 @@
CFAbsoluteTime lastUpdateTime;
}
-- (id)initForOwner:(id <BDSKOwner>)owner;
+- (instancetype)initForOwner:(id <BDSKOwner>)owner;
// Warning: it is /not/ safe to write to this SKIndexRef directly; use it
only for reading.
@property (nonatomic, readonly) SKIndexRef index;
Modified: trunk/bibdesk/BDSKFileSearchResult.h
===================================================================
--- trunk/bibdesk/BDSKFileSearchResult.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKFileSearchResult.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -50,7 +50,7 @@
}
// This class is designed to be used in a hashing container (NSSet,
NSDictionary) when you want the isEqual: and hash to be based on file comparison
-- (id)initWithURL:(NSURL *)aURL identifierURL:(NSURL *)anIdentifierURL
title:(NSString *)aTitle score:(CGFloat)aScore;
+- (instancetype)initWithURL:(NSURL *)aURL identifierURL:(NSURL
*)anIdentifierURL title:(NSString *)aTitle score:(CGFloat)aScore;
// used by the table cell
@property (nonatomic, readonly) NSImage *image;
Modified: trunk/bibdesk/BDSKFilerErrorController.h
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKFilerErrorController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -56,7 +56,7 @@
NSArray *errorInfoDicts;
}
-- (id)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(NSString *)actionName;
+- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(NSString *)actionName;
@property (nonatomic, strong) IBOutlet NSTableView *tv;
@property (nonatomic, strong) IBOutlet NSTextField *infoTextField;
Modified: trunk/bibdesk/BDSKFilter.h
===================================================================
--- trunk/bibdesk/BDSKFilter.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKFilter.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -53,8 +53,8 @@
NSUndoManager *undoManager;
}
-- (id)initWithConditions:(NSArray *)aConditions
conjunction:(BDSKConjunction)aConjunction;
-- (id)initWithDictionary:(NSDictionary *)dictionary;
+- (instancetype)initWithConditions:(NSArray *)aConditions
conjunction:(BDSKConjunction)aConjunction;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKFilterController.h
===================================================================
--- trunk/bibdesk/BDSKFilterController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKFilterController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -51,7 +51,7 @@
NSUndoManager *undoManager;
}
-- (id)initWithFilter:(BDSKFilter *)aFilter;
+- (instancetype)initWithFilter:(BDSKFilter *)aFilter;
@property (nonatomic, strong) IBOutlet NSView *conditionsView;
@property (nonatomic, strong) IBOutlet NSLayoutConstraint *widthConstraint;
Modified: trunk/bibdesk/BDSKFormatStringFormatter.h
===================================================================
--- trunk/bibdesk/BDSKFormatStringFormatter.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKFormatStringFormatter.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -44,6 +44,6 @@
NSAttributedString *attributedString;
NSString *formatError;
}
-- (id)initWithField:(NSString *)field;
+- (instancetype)initWithField:(NSString *)field;
@property (nonatomic, readonly) NSString *formatError;
@end
Modified: trunk/bibdesk/BDSKGroup.h
===================================================================
--- trunk/bibdesk/BDSKGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -79,9 +79,9 @@
@discussion This is the designated initializer.
@param aName The name for the group.
*/
-- (id)initWithName:(id)aName;
+- (instancetype)initWithName:(id)aName;
-- (id)initWithDictionary:(NSDictionary *)groupDict;
+- (instancetype)initWithDictionary:(NSDictionary *)groupDict;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKGroupsArray.h
===================================================================
--- trunk/bibdesk/BDSKGroupsArray.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKGroupsArray.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -49,7 +49,7 @@
__weak BibDocument *document;
}
-- (id)initWithDocument:(BibDocument *)aDocument;
+- (instancetype)initWithDocument:(BibDocument *)aDocument;
@property (nonatomic, readonly) BDSKLibraryParentGroup *libraryParent;
@property (nonatomic, readonly) BDSKExternalParentGroup *externalParent;
Modified: trunk/bibdesk/BDSKInfo.h
===================================================================
--- trunk/bibdesk/BDSKInfo.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKInfo.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -45,7 +45,7 @@
__weak BibDocument *document;
}
-- (id)initWithName:(NSString *)newName document:(BibDocument *)newDocument;
+- (instancetype)initWithName:(NSString *)newName document:(BibDocument
*)newDocument;
@property (nonatomic, readonly) NSString *name;
Modified: trunk/bibdesk/BDSKItemDownload.h
===================================================================
--- trunk/bibdesk/BDSKItemDownload.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKItemDownload.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -63,8 +63,8 @@
@property (nonatomic, readonly) double progress;
@property (nonatomic, readonly) NSURL *fileURL;
-- (id)initWithLinkedFile:(BDSKLinkedFile *)aLinkedFile
atIndex:(NSUInteger)anIndex options:(NSUInteger)anOptions;
-- (id)initWithURL:(NSURL *)aURL options:(NSUInteger)anOptions;
+- (instancetype)initWithLinkedFile:(BDSKLinkedFile *)aLinkedFile
atIndex:(NSUInteger)anIndex options:(NSUInteger)anOptions;
+- (instancetype)initWithURL:(NSURL *)aURL options:(NSUInteger)anOptions;
- (void)start;
- (void)cancel;
Modified: trunk/bibdesk/BDSKLastImportGroup.h
===================================================================
--- trunk/bibdesk/BDSKLastImportGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKLastImportGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -42,6 +42,6 @@
@interface BDSKLastImportGroup : BDSKStaticGroup
-- (id)initWithLastImport:(NSArray *)array;
+- (instancetype)initWithLastImport:(NSArray *)array;
@end
Modified: trunk/bibdesk/BDSKLinkedFile.h
===================================================================
--- trunk/bibdesk/BDSKLinkedFile.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKLinkedFile.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -77,15 +77,15 @@
@interface BDSKLinkedFile (BDSKLinkedFileCreation)
-+ (id)linkedFileWithURL:(NSURL *)aURL
delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
-+ (id)linkedFileWithBase64String:(NSString *)base64String
delegate:(id)aDelegate;
-+ (id)linkedFileWithURLString:(NSString *)aString;
++ (instancetype)linkedFileWithURL:(NSURL *)aURL
delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
++ (instancetype)linkedFileWithBase64String:(NSString *)base64String
delegate:(id)aDelegate;
++ (instancetype)linkedFileWithURLString:(NSString *)aString;
// creates a linked local file or remote URL object depending on the URL
-- (id)initWithURL:(NSURL *)aURL delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
+- (instancetype)initWithURL:(NSURL *)aURL
delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
// creates a linked local file
-- (id)initWithBase64String:(NSString *)base64String
delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
+- (instancetype)initWithBase64String:(NSString *)base64String
delegate:(id<BDSKLinkedFileDelegate>)aDelegate;
// creates a linked remote URL
-- (id)initWithURLString:(NSString *)aString;
+- (instancetype)initWithURLString:(NSString *)aString;
@end
Modified: trunk/bibdesk/BDSKMacro.h
===================================================================
--- trunk/bibdesk/BDSKMacro.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKMacro.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -45,7 +45,7 @@
__weak BDSKMacroResolver *macroResolver;
}
-- (id)initWithName:(NSString *)aName macroResolver:(BDSKMacroResolver
*)aMacroResolver;
+- (instancetype)initWithName:(NSString *)aName
macroResolver:(BDSKMacroResolver *)aMacroResolver;
@property (nonatomic, strong) NSString *name;
Modified: trunk/bibdesk/BDSKMacroResolver.h
===================================================================
--- trunk/bibdesk/BDSKMacroResolver.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKMacroResolver.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -60,7 +60,7 @@
@property (class, nonatomic, readonly) BDSKMacroResolver *defaultMacroResolver;
-- (id)initWithOwner:(id<BDSKOwner>)anOwner;
+- (instancetype)initWithOwner:(id<BDSKOwner>)anOwner;
@property (nonatomic, readonly) id<BDSKOwner> owner;
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -52,7 +52,7 @@
BOOL showAll;
}
-- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
+- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
@property (nonatomic, strong) IBOutlet NSArrayController *arrayController;
@property (nonatomic, strong) IBOutlet BDSKTableView *tableView;
Modified: trunk/bibdesk/BDSKMergeController.h
===================================================================
--- trunk/bibdesk/BDSKMergeController.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKMergeController.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -57,7 +57,7 @@
+ (void)mergePublication:(BibItem *)mergedPub withPublication:(BibItem *)pub
fromDocument:(BibDocument *)doc window:(NSWindow *)window
completionHandler:(void (^)(BOOL didMerge, BDSKAutoGenerateStatus
status))handler;
-- (id)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 (^)(BOOL
didMerge, BDSKAutoGenerateStatus status))handler;
@property (nonatomic, strong) IBOutlet NSTableView *tableView;
@property (nonatomic, strong) IBOutlet NSButton *selectAllButton;
Modified: trunk/bibdesk/BDSKMetadataCacheOperation.h
===================================================================
--- trunk/bibdesk/BDSKMetadataCacheOperation.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKMetadataCacheOperation.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -43,7 +43,7 @@
NSArray *publicationInfos;
NSURL *documentURL;
}
-- (id)initWithPublicationInfos:(NSArray *)pubInfos forDocumentURL:(NSURL
*)aURL;
+- (instancetype)initWithPublicationInfos:(NSArray *)pubInfos
forDocumentURL:(NSURL *)aURL;
@end
@interface BDSKMetadataCacheQueue : NSObject {
Modified: trunk/bibdesk/BDSKNotesSearchIndex.h
===================================================================
--- trunk/bibdesk/BDSKNotesSearchIndex.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKNotesSearchIndex.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -57,7 +57,7 @@
__weak id <BDSKNotesSearchIndexDelegate> delegate;
}
-- (id)initForOwner:(id <BDSKOwner>)owner;
+- (instancetype)initForOwner:(id <BDSKOwner>)owner;
@property (nonatomic, weak) id <BDSKNotesSearchIndexDelegate> delegate;
Modified: trunk/bibdesk/BDSKNotesWindowController.h
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKNotesWindowController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -54,7 +54,7 @@
NSButton *openInSkimButton;
}
-- (id)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithURL:(NSURL *)aURL;
@property (nonatomic, strong) IBOutlet NSOutlineView *outlineView;
@property (nonatomic, strong) IBOutlet NSTokenField *tokenField;
Modified: trunk/bibdesk/BDSKParentGroup.h
===================================================================
--- trunk/bibdesk/BDSKParentGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKParentGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -101,7 +101,7 @@
NSString *key;
}
-- (id)initWithKey:(NSString *)aKey;
+- (instancetype)initWithKey:(NSString *)aKey;
@property (nonatomic, strong) NSArray *categoryGroups;
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKPersonController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -66,7 +66,7 @@
}
#pragma mark initialization
-- (id)initWithPerson:(BibAuthor *)aPerson;
+- (instancetype)initWithPerson:(BibAuthor *)aPerson;
#pragma mark accessors
@property (nonatomic, strong) IBOutlet NSTextField *nameTextField;
Modified: trunk/bibdesk/BDSKPreferencePane.h
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKPreferencePane.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -47,7 +47,7 @@
NSMutableDictionary *dependentKeys;
}
-- (id)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController;
+- (instancetype)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController;
@property (nonatomic, readonly) BDSKPreferenceController *preferenceController;
Modified: trunk/bibdesk/BDSKPreferenceRecord.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceRecord.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKPreferenceRecord.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -45,7 +45,7 @@
NSDictionary *dictionary;
}
-- (id)initWithDictionary:(NSDictionary *)aDictionary;
+- (instancetype)initWithDictionary:(NSDictionary *)aDictionary;
@property (nonatomic, readonly) NSString *identifier;
@property (nonatomic, readonly) Class paneClass;
Modified: trunk/bibdesk/BDSKPublicationsArray.h
===================================================================
--- trunk/bibdesk/BDSKPublicationsArray.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKPublicationsArray.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -47,7 +47,7 @@
BDSKItemSearchIndexes *searchIndexes;
}
-- (id)initWithArray:(NSArray *)anArray NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithArray:(NSArray *)anArray NS_DESIGNATED_INITIALIZER;
- (BDSKPublicationsArray *)copyTemporary;
// otherArray should contain the same publications, just reordered
Modified: trunk/bibdesk/BDSKRadioTransformer.h
===================================================================
--- trunk/bibdesk/BDSKRadioTransformer.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKRadioTransformer.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -46,6 +46,6 @@
NSInteger targetValue;
}
-- (id)initWithTargetValue:(NSInteger)value;
+- (instancetype)initWithTargetValue:(NSInteger)value;
@end
Modified: trunk/bibdesk/BDSKRatingButtonCell.h
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKRatingButtonCell.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -44,7 +44,7 @@
NSUInteger maxRating;
}
-- (id)initWithMaxRating:(NSUInteger)aRating;
+- (instancetype)initWithMaxRating:(NSUInteger)aRating;
@property (nonatomic) NSUInteger rating;
@property (nonatomic) NSUInteger maxRating;
Modified: trunk/bibdesk/BDSKScriptGroup.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKScriptGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -58,8 +58,8 @@
NSData *stdoutData;
}
-- (id)initWithScriptPath:(NSString *)path scriptArguments:(NSString
*)arguments;
-- (id)initWithName:(NSString *)aName scriptPath:(NSString *)path
scriptArguments:(NSString *)arguments scriptType:(BDSKScriptType)type;
+- (instancetype)initWithScriptPath:(NSString *)path scriptArguments:(NSString
*)arguments;
+- (instancetype)initWithName:(NSString *)aName scriptPath:(NSString *)path
scriptArguments:(NSString *)arguments scriptType:(BDSKScriptType)type;
@property (nonatomic, strong) NSString *scriptPath;
@property (nonatomic, strong) NSString *scriptArguments;
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.h 2024-02-04 15:40:43 UTC
(rev 28694)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.h 2024-02-05 15:51:17 UTC
(rev 28695)
@@ -52,7 +52,7 @@
BDSKFieldEditor *dragFieldEditor;
}
-- (id)initWithPath:(NSString *)aPath arguments:(NSString *)anArguments;
+- (instancetype)initWithPath:(NSString *)aPath arguments:(NSString
*)anArguments;
@property (nonatomic, strong) IBOutlet BDSKDragTextField *pathField;
@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
Modified: trunk/bibdesk/BDSKScriptHook.h
===================================================================
--- trunk/bibdesk/BDSKScriptHook.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKScriptHook.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -67,7 +67,7 @@
+ (BDSKScriptHook *)newWithName:(NSString *)name;
-- (id)initWithName:(NSString *)aName script:(NSUserAppleScriptTask *)aScript;
+- (instancetype)initWithName:(NSString *)aName script:(NSUserAppleScriptTask
*)aScript;
@property (nonatomic, readonly) NSString *name;
@property (nonatomic, readonly) NSString *uniqueID;
Modified: trunk/bibdesk/BDSKSearchBookmark.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSearchBookmark.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -48,12 +48,12 @@
__weak BDSKSearchBookmark *parent;
}
-- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel;
-- (id)initFolderWithLabel:(NSString *)aLabel;
-- (id)initRootWithChildrenDictionaries:(NSArray *)dictionaries;
-- (id)initSeparator;
-- (id)initWithInfo:(NSDictionary *)aDictionary label:(NSString *)aLabel;
-- (id)initWithDictionary:(NSDictionary *)dictionary;
+- (instancetype)initFolderWithChildren:(NSArray *)aChildren label:(NSString
*)aLabel;
+- (instancetype)initFolderWithLabel:(NSString *)aLabel;
+- (instancetype)initRootWithChildrenDictionaries:(NSArray *)dictionaries;
+- (instancetype)initSeparator;
+- (instancetype)initWithInfo:(NSDictionary *)aDictionary label:(NSString
*)aLabel;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKSearchGroup.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSearchGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -53,7 +53,7 @@
@end
@protocol BDSKSearchGroupServer <NSObject>
-- (id)initWithGroup:(id<BDSKSearchGroup>)aGroup serverInfo:(BDSKServerInfo
*)info;
+- (instancetype)initWithGroup:(id<BDSKSearchGroup>)aGroup
serverInfo:(BDSKServerInfo *)info;
@property (nonatomic, readonly) NSString *type;
@property (nonatomic, copy) BDSKServerInfo *serverInfo;
@property (nonatomic, readonly) NSInteger numberOfAvailableResults;
@@ -73,8 +73,8 @@
id<BDSKSearchGroupServer> server;
}
-- (id)initWithServerInfo:(BDSKServerInfo *)info searchTerm:(NSString *)string;
-- (id)initWithURL:(NSURL *)bdsksearchURL;
+- (instancetype)initWithServerInfo:(BDSKServerInfo *)info searchTerm:(NSString
*)string;
+- (instancetype)initWithURL:(NSURL *)bdsksearchURL;
@property (nonatomic, readonly) NSString *type;
@property (nonatomic, copy) BDSKServerInfo *serverInfo;
@@ -110,7 +110,7 @@
+ (NSArray *)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray
*publications))completionHandler;
-- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
+- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
- (NSArray *)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo completionHandler:(void(^)(NSArray
*publications))aCompletionHandler;
@end
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2024-02-04 15:40:43 UTC
(rev 28694)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2024-02-05 15:51:17 UTC
(rev 28695)
@@ -75,7 +75,7 @@
NSObjectController *objectController;
}
-- (id)initWithServerInfo:(BDSKServerInfo *)aServerInfo;
+- (instancetype)initWithServerInfo:(BDSKServerInfo *)aServerInfo;
@property (nonatomic, strong) IBOutlet NSPopUpButton *serverPopup;
@property (nonatomic, strong) IBOutlet NSTextField *nameField;
Modified: trunk/bibdesk/BDSKServerInfo.h
===================================================================
--- trunk/bibdesk/BDSKServerInfo.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKServerInfo.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -59,11 +59,11 @@
BDSKReadWriteLock *passwordLock;
}
-+ (id)defaultServerInfoWithType:(NSString *)aType;
++ (instancetype)defaultServerInfoWithType:(NSString *)aType;
-- (id)initWithType:(NSString *)aType name:(NSString *)aName database:(NSString
*)aDbase host:(NSString *)aHost port:(NSString *)aPort options:(NSDictionary
*)options;
+- (instancetype)initWithType:(NSString *)aType name:(NSString *)aName
database:(NSString *)aDbase host:(NSString *)aHost port:(NSString *)aPort
options:(NSDictionary *)options;
-- (id)initWithDictionary:(NSDictionary *)info;
+- (instancetype)initWithDictionary:(NSDictionary *)info;
@property (nonatomic, readonly) NSDictionary *dictionaryValue;
Modified: trunk/bibdesk/BDSKSharedGroup.h
===================================================================
--- trunk/bibdesk/BDSKSharedGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSharedGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -50,7 +50,7 @@
@property (class, nonatomic, readonly) NSImage *lockedIcon;
@property (class, nonatomic, readonly) NSImage *unlockedIcon;
-- (id)initWithClient:(BDSKSharingClient *)aClient;
+- (instancetype)initWithClient:(BDSKSharingClient *)aClient;
@property (nonatomic, readonly) BDSKSharingClient *client;
@property (nonatomic, readonly) BOOL needsUpdate;
Modified: trunk/bibdesk/BDSKSharingClient.h
===================================================================
--- trunk/bibdesk/BDSKSharingClient.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSharingClient.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -51,7 +51,7 @@
BDSKAsyncSharingClient *asyncClient;
}
-- (id)initWithService:(NSNetService *)aService;
+- (instancetype)initWithService:(NSNetService *)aService;
@property (nonatomic, readonly) NSData *archivedPublications;
@property (nonatomic, readonly) NSData *archivedMacros;
Modified: trunk/bibdesk/BDSKSmartGroup.h
===================================================================
--- trunk/bibdesk/BDSKSmartGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSmartGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -50,8 +50,8 @@
BDSKFilter *filter;
}
-- (id)initWithFilter:(BDSKFilter *)aFilter;
-- (id)initWithName:(id)aName filter:(BDSKFilter *)aFilter;
+- (instancetype)initWithFilter:(BDSKFilter *)aFilter;
+- (instancetype)initWithName:(id)aName filter:(BDSKFilter *)aFilter;
@property (nonatomic, strong) BDSKFilter *filter;
Modified: trunk/bibdesk/BDSKSoapBinding.h
===================================================================
--- trunk/bibdesk/BDSKSoapBinding.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKSoapBinding.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -29,7 +29,7 @@
@property (nonatomic, strong) NSMutableArray *cookies;
@property (nonatomic, strong) NSString *authUsername;
@property (nonatomic, strong) NSString *authPassword;
-- (id)initWithAddress:(NSString *)anAddress namespaceURI:(NSString
*)aNamespaceURI;
+- (instancetype)initWithAddress:(NSString *)anAddress namespaceURI:(NSString
*)aNamespaceURI;
- (NSString *)serializedEnvelopeUsingHeaderElements:(NSDictionary
*)headerElements bodyElements:(NSDictionary *)bodyElements;
- (NSURLRequest *)requestUsingBody:(NSString *)body soapAction:(NSString
*)soapAction;
- (void)addCookie:(NSHTTPCookie *)toAdd;
@@ -51,8 +51,8 @@
@property (nonatomic, strong) NSString *soapAction;
@property (nonatomic, weak) id<BDSKSoapBindingOperationDelegate> delegate;
@property (nonatomic, strong) BDSKDownload *download;
-- (id)initWithBinding:(BDSKSoapBinding *)aBinding
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate soapAction:(NSString
*)aSoapAction bodyElements:(NSDictionary *)aBodyElements
responseClasses:(NSDictionary *)aResponseClasses;
-- (id)initWithParameters:(BDSKSoapElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate;
+- (instancetype)initWithBinding:(BDSKSoapBinding *)aBinding
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate soapAction:(NSString
*)aSoapAction bodyElements:(NSDictionary *)aBodyElements
responseClasses:(NSDictionary *)aResponseClasses;
+- (instancetype)initWithParameters:(BDSKSoapElement *)parameters
delegate:(id<BDSKSoapBindingOperationDelegate>)aDelegate;
- (void)start;
- (void)waitUntilExit;
- (void)cancel;
Modified: trunk/bibdesk/BDSKStaticGroup.h
===================================================================
--- trunk/bibdesk/BDSKStaticGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKStaticGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -46,7 +46,7 @@
NSArray *tmpKeys;
}
-- (id)initWithName:(id)aName publications:(NSArray *)array;
+- (instancetype)initWithName:(id)aName publications:(NSArray *)array;
@property (nonatomic, copy) NSArray *publications;
Modified: trunk/bibdesk/BDSKStringNode.h
===================================================================
--- trunk/bibdesk/BDSKStringNode.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKStringNode.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -86,7 +86,7 @@
@param s The value string.
@result An initialized string node.
*/
-- (id)initWithType:(BDSKStringNodeType)aType value:(NSString *)s;
+- (instancetype)initWithType:(BDSKStringNodeType)aType value:(NSString *)s;
/*!
@method isEqual:
Modified: trunk/bibdesk/BDSKTeXTask.h
===================================================================
--- trunk/bibdesk/BDSKTeXTask.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTeXTask.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -67,8 +67,8 @@
NSUInteger generatedDataMask;
}
-- (id)init;
-- (id)initWithFileName:(NSString *)fileName;
+- (instancetype)init;
+- (instancetype)initWithFileName:(NSString *)fileName;
@property (nonatomic, weak) id<BDSKTeXTaskDelegate> delegate;
Modified: trunk/bibdesk/BDSKTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTemplate.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTemplate.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -96,8 +96,8 @@
+ (BDSKTemplate *)templateForStyle:(NSString *)styleName;
+ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL fileType:(NSString *)fileType;
-+ (id)templateWithString:(NSString *)string fileType:(NSString *)fileType;
-+ (id)templateWithAttributedString:(NSAttributedString *)attributedString
fileType:(NSString *)fileType;
++ (BDSKTemplate *)templateWithString:(NSString *)string fileType:(NSString
*)fileType;
++ (BDSKTemplate *)templateWithAttributedString:(NSAttributedString
*)attributedString fileType:(NSString *)fileType;
// service templates
@property (class, nonatomic, readonly) BDSKTemplate *templateForCiteService;
@@ -137,7 +137,7 @@
// other methods
- (BOOL)addChildWithURL:(NSURL *)fileURL role:(NSString *)role;
-- (id)childForRole:(NSString *)role;
+- (instancetype)childForRole:(NSString *)role;
@end
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.h
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -54,7 +54,7 @@
+ (NSData *)dataByParsingTemplate:(BDSKTemplate *)template
withObject:(id)anObject publications:(NSArray *)items;
+ (NSData *)dataByParsingTemplate:(BDSKTemplate *)template
withObject:(id)anObject publications:(NSArray *)items
publicationsContext:(NSArray *)itemsContext;
-- (id)initWithObject:(id)anObject publications:(NSArray *)items
publicationsContext:(NSArray *)itemsContext template:(BDSKTemplate *)aTemplate;
+- (instancetype)initWithObject:(id)anObject publications:(NSArray *)items
publicationsContext:(NSArray *)itemsContext template:(BDSKTemplate *)aTemplate;
@property (nonatomic, readonly) NSArray *publications;
@property (nonatomic, readonly) id publicationsUsingTemplate;
Modified: trunk/bibdesk/BDSKTemplateTag.h
===================================================================
--- trunk/bibdesk/BDSKTemplateTag.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTemplateTag.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -71,7 +71,7 @@
NSString *keyPath;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath;
@property (nonatomic, readonly) NSString *keyPath;
@@ -84,7 +84,7 @@
BDSKAttributeTemplate *linkTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes;
@property (nonatomic, readonly) NSDictionary *attributes;
@@ -101,7 +101,7 @@
NSArray *separatorTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath itemTemplateString:(NSString
*)anItemTemplateString separatorTemplateString:(NSString
*)aSeparatorTemplateString;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateString:(NSString *)anItemTemplateString
separatorTemplateString:(NSString *)aSeparatorTemplateString;
@property (nonatomic, readonly) NSArray *itemTemplate;
@property (nonatomic, readonly) NSArray *separatorTemplate;
@@ -117,7 +117,7 @@
NSArray *separatorTemplate;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString;
@property (nonatomic, readonly) NSArray *itemTemplate;
@property (nonatomic, readonly) NSArray *separatorTemplate;
@@ -132,7 +132,7 @@
NSArray *matchStrings;
}
-- (id)initWithKeyPath:(NSString *)aKeyPath
matchType:(BDSKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates;
+- (instancetype)initWithKeyPath:(NSString *)aKeyPath
matchType:(BDSKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates;
@property (nonatomic, readonly) BDSKTemplateTagMatchType matchType;
@property (nonatomic, readonly) NSArray *matchStrings;
@@ -153,7 +153,7 @@
NSString *text;
}
-- (id)initWithText:(NSString *)aText;
+- (instancetype)initWithText:(NSString *)aText;
@property (nonatomic, strong) NSString *text;
@@ -168,7 +168,7 @@
NSArray *linkTemplates;
}
-- (id)initWithAttributedText:(NSAttributedString *)anAttributedText;
+- (instancetype)initWithAttributedText:(NSAttributedString *)anAttributedText;
@property (nonatomic, strong) NSAttributedString *attributedText;
@@ -186,7 +186,7 @@
Class attributeClass;
}
-- (id)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass;
+- (instancetype)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass;
@property (nonatomic, readonly) NSArray *template;
Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKTextImportController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -96,7 +96,7 @@
NSResponder *savedFirstResponder;
}
-- (id)initForOwner:(id <BDSKOwner>)anOwner;
+- (instancetype)initForOwner:(id <BDSKOwner>)anOwner;
@property (nonatomic, strong) IBOutlet NSTextView* sourceTextView;
@property (nonatomic, strong) IBOutlet BDSKTextImportItemTableView*
itemTableView;
Modified: trunk/bibdesk/BDSKTextUndoManager.h
===================================================================
--- trunk/bibdesk/BDSKTextUndoManager.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTextUndoManager.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -42,5 +42,5 @@
@interface BDSKTextUndoManager : NSUndoManager {
NSUndoManager *nextUndoManager;
}
-- (id)initWithNextUndoManager:(NSUndoManager *)undoManager;
+- (instancetype)initWithNextUndoManager:(NSUndoManager *)undoManager;
@end
Modified: trunk/bibdesk/BDSKToken.h
===================================================================
--- trunk/bibdesk/BDSKToken.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKToken.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -59,9 +59,9 @@
NSInteger italic;
}
-+ (id)tokenWithField:(NSString *)field;
++ (instancetype)tokenWithField:(NSString *)field;
-- (id)initWithTitle:(NSString *)aTitle;
+- (instancetype)initWithTitle:(NSString *)aTitle;
@property (nonatomic, readonly) BDSKTokenType type;
Modified: trunk/bibdesk/BDSKTouchBarButtonGroup.h
===================================================================
--- trunk/bibdesk/BDSKTouchBarButtonGroup.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKTouchBarButtonGroup.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -45,6 +45,6 @@
@property (nonatomic, readonly) NSArray *buttons;
-- (id)initByReferencingButtons:(NSArray *)refButtons;
+- (instancetype)initByReferencingButtons:(NSArray *)refButtons;
@end
Modified: trunk/bibdesk/BDSKTreeNode.h
===================================================================
--- trunk/bibdesk/BDSKTreeNode.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTreeNode.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -46,7 +46,7 @@
__weak BDSKTreeNode *parent;
}
-- (id)initWithColumnValues:(NSDictionary *)newColumnValues children:(NSArray
*)newChildren;
+- (instancetype)initWithColumnValues:(NSDictionary *)newColumnValues
children:(NSArray *)newChildren;
// uses isEqual:
- (NSArray *)children;
Modified: trunk/bibdesk/BDSKTypeInfo.h
===================================================================
--- trunk/bibdesk/BDSKTypeInfo.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTypeInfo.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -42,7 +42,7 @@
NSString *name;
}
-- (id)initWithName:(NSString *)newName;
+- (instancetype)initWithName:(NSString *)newName;
@property (nonatomic, readonly) NSString *name;
Modified: trunk/bibdesk/BDSKTypeTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKTypeTemplate.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -49,7 +49,7 @@
NSArray *itemTemplate;
}
-- (id)initWithPubType:(NSString *)aPubType requiredTokens:(NSArray *)required
optionalTokens:(NSArray *)optional;
+- (instancetype)initWithPubType:(NSString *)aPubType requiredTokens:(NSArray
*)required optionalTokens:(NSArray *)optional;
@property (nonatomic, strong) NSString *pubType;
Modified: trunk/bibdesk/BDSKURLGroup.h
===================================================================
--- trunk/bibdesk/BDSKURLGroup.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKURLGroup.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -50,8 +50,8 @@
BDSKDownload *download;
}
-- (id)initWithName:(NSString *)aName URL:(NSURL *)aURL;
-- (id)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithName:(NSString *)aName URL:(NSURL *)aURL;
+- (instancetype)initWithURL:(NSURL *)aURL;
@property (nonatomic, strong) NSURL *URL;
Modified: trunk/bibdesk/BDSKURLGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/BDSKURLGroupSheetController.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -52,7 +52,7 @@
CFArrayRef editors;
}
-- (id)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithURL:(NSURL *)aURL;
@property (nonatomic, strong) IBOutlet BDSKDragTextField *urlField;
@property (nonatomic, strong) IBOutlet NSObjectController *objectController;
Modified: trunk/bibdesk/BDSKVersionNumber.h
===================================================================
--- trunk/bibdesk/BDSKVersionNumber.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKVersionNumber.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -58,9 +58,9 @@
+ (NSComparisonResult)compareVersionString:(NSString *)versionString
toVersionString:(NSString *)otherVersionString;
-+ (id)versionNumberWithVersionString:(NSString *)versionString;
++ (instancetype)versionNumberWithVersionString:(NSString *)versionString;
-- (id)initWithVersionString:(NSString *)versionString;
+- (instancetype)initWithVersionString:(NSString *)versionString;
@property (nonatomic, readonly) NSString *originalVersionString;
@property (nonatomic, readonly) NSString *cleanVersionString;
Modified: trunk/bibdesk/BDSKWebParser.h
===================================================================
--- trunk/bibdesk/BDSKWebParser.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BDSKWebParser.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -76,7 +76,7 @@
// set at the end of -start, to know thereis not more coming, so we may finish
@property (nonatomic) BOOL finishedStarting;
-- (id)initWithDocument:(DOMDocument *)aDomDocument fromURL:(NSURL *)aURL;
+- (instancetype)initWithDocument:(DOMDocument *)aDomDocument fromURL:(NSURL
*)aURL;
- (void)startWithDelegate:(id<BDSKWebParserDelegate>)aDelegate;
- (void)cancel;
Modified: trunk/bibdesk/BibAuthor.h
===================================================================
--- trunk/bibdesk/BibAuthor.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BibAuthor.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -77,7 +77,7 @@
@property (class, nonatomic, readonly) BibAuthor *emptyAuthor;
+ (BibAuthor *)authorWithVCardRepresentation:(NSData *)vCard;
-- (id)initWithName:(NSString *)aName publication:(BibItem *)aPub
forField:(NSString *)aField;
+- (instancetype)initWithName:(NSString *)aName publication:(BibItem *)aPub
forField:(NSString *)aField;
- (NSComparisonResult)compare:(BibAuthor *)otherAuth;
- (BOOL)fuzzyEqual:(BibAuthor *)otherAuth;
Modified: trunk/bibdesk/BibItem.h
===================================================================
--- trunk/bibdesk/BibItem.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BibItem.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -181,7 +181,7 @@
@discussion This initializer should be used for a newly added BibItem
only, as it sets the created date. It calls the designated initializer.
@result The receiver, initialized to the default type, containing an an
empty pubFields fieldsDict, empty authors authArray, and with date created and
modified set to the current date.
*/
-- (id)init;
+- (instancetype)init;
/*!
@method initWithType:citeKey:pubFields:filesA:isNew:
@@ -194,11 +194,11 @@
@param isNew Boolean determines if the item is new for the BibTeX
document. Determines if the date-added should be set. Should be YES unless when
reading the BibTeX source file.
@result The receiver, initialized to type and containing authors
authArray.
*/
-- (id)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSDictionary *)fieldsDict files:(NSArray *)filesArray
isNew:(BOOL)isNew;
+- (instancetype)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSDictionary *)fieldsDict files:(NSArray *)filesArray
isNew:(BOOL)isNew;
-- (id)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSDictionary *)fieldsDict;
+- (instancetype)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSDictionary *)fieldsDict;
-- (id)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSMutableDictionary *)fieldsDict URLStrings:(NSArray *)urlsArray;
+- (instancetype)initWithType:(NSString *)type citeKey:(NSString *)key
pubFields:(NSMutableDictionary *)fieldsDict URLStrings:(NSArray *)urlsArray;
/*!
@method dealloc
Modified: trunk/bibdesk/BibPref_ScriptHooks.h
===================================================================
--- trunk/bibdesk/BibPref_ScriptHooks.h 2024-02-04 15:40:43 UTC (rev 28694)
+++ trunk/bibdesk/BibPref_ScriptHooks.h 2024-02-05 15:51:17 UTC (rev 28695)
@@ -63,7 +63,7 @@
NSString *name;
}
-- (id)initWithName:(NSString *)aName;
+- (instancetype)initWithName:(NSString *)aName;
@property (nonatomic, readonly) NSString *name;
@property (nonatomic, readonly) NSString *localizedName;
Modified: trunk/bibdesk/NSAttributedString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2024-02-04 15:40:43 UTC
(rev 28694)
+++ trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2024-02-05 15:51:17 UTC
(rev 28695)
@@ -41,9 +41,9 @@
@interface NSAttributedString (BDSKExtensions)
-- (id)initWithString:(NSString *)string attributeName:(NSString
*)attributeName attributeValue:(id)attributeValue;
+- (instancetype)initWithString:(NSString *)string attributeName:(NSString
*)attributeName attributeValue:(id)attributeValue;
-- (id)initWithTeXString:(NSString *)string attributes:(NSDictionary
*)attributes collapseWhitespace:(BOOL)collapse;
+- (instancetype)initWithTeXString:(NSString *)string attributes:(NSDictionary
*)attributes collapseWhitespace:(BOOL)collapse;
-
(NSComparisonResult)localizedCaseInsensitiveNonTeXNonArticleCompare:(NSAttributedString
*)other;
Modified: trunk/bibdesk/NSColor_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/NSColor_BDSKExtensions.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -63,7 +63,7 @@
@property (class, nonatomic, readonly) NSArray *labelNames;
+ (NSColor *)colorWithFourByteString:(NSString *)string;
-@property (nonatomic, readonly) id fourByteStringValue;
+@property (nonatomic, readonly) NSString *fourByteStringValue;
+ (NSString *)nameForFourByteString:(NSString *)string;
@@ -71,7 +71,7 @@
- (NSComparisonResult)colorCompare:(id)other;
-+ (id)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor *)descriptor;
++ (NSColor *)scriptingRgbaColorWithDescriptor:(NSAppleEventDescriptor
*)descriptor;
@property (nonatomic, readonly) id scriptingRgbaColorDescriptor;
@end
Modified: trunk/bibdesk/NSData_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSData_BDSKExtensions.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/NSData_BDSKExtensions.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -58,7 +58,7 @@
@property (nonatomic, readonly) NSData *sha1Signature;
-- (id)initWithHexString:(NSString *)hexString;
+- (instancetype)initWithHexString:(NSString *)hexString;
@property (nonatomic, readonly) NSString *hexString;
@property (nonatomic, readonly) BOOL mightBeCompressed;
@@ -65,7 +65,7 @@
@property (nonatomic, readonly) NSData *compressedData;
@property (nonatomic, readonly) NSData *decompressedData;
-+ (id)scriptingRtfWithDescriptor:(NSAppleEventDescriptor *)descriptor;
++ (NSData *)scriptingRtfWithDescriptor:(NSAppleEventDescriptor *)descriptor;
@property (nonatomic, readonly) id scriptingRtfDescriptor;
@end
Modified: trunk/bibdesk/NSError_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSError_BDSKExtensions.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/NSError_BDSKExtensions.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -76,13 +76,13 @@
@property (class, nonatomic, readonly) NSString *localErrorDomain;
// returns BibDesk-specific errors that don't allow valueForKey: and
setValue:forKey: usage
-+ (id)localErrorWithCode:(NSInteger)code localizedDescription:(NSString
*)description;
-+ (id)localErrorWithCode:(NSInteger)code localizedDescription:(NSString
*)description underlyingError:(NSError *)underlyingError;
++ (instancetype)localErrorWithCode:(NSInteger)code
localizedDescription:(NSString *)description;
++ (instancetype)localErrorWithCode:(NSInteger)code
localizedDescription:(NSString *)description underlyingError:(NSError
*)underlyingError;
// returns BibDesk-specific errors that can allow valueForKey: and
setValue:forKey: usage
-+ (id)mutableErrorWithDomain:(NSString *)domain code:(NSInteger)code
userInfo:(NSDictionary *)dict;
-+ (id)mutableLocalErrorWithCode:(NSInteger)code localizedDescription:(NSString
*)description;
-+ (id)mutableLocalErrorWithCode:(NSInteger)code localizedDescription:(NSString
*)description underlyingError:(NSError *)underlyingError;
++ (instancetype)mutableErrorWithDomain:(NSString *)domain code:(NSInteger)code
userInfo:(NSDictionary *)dict;
++ (instancetype)mutableLocalErrorWithCode:(NSInteger)code
localizedDescription:(NSString *)description;
++ (instancetype)mutableLocalErrorWithCode:(NSInteger)code
localizedDescription:(NSString *)description underlyingError:(NSError
*)underlyingError;
// see if it has our local domain
@property (nonatomic, readonly) BOOL isLocalError;
Modified: trunk/bibdesk/NSImage_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/NSImage_BDSKExtensions.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -78,12 +78,12 @@
- (NSImage *)dragImageWithCount:(NSInteger)count inside:(BOOL)inside
size:(NSSize)size;
// creates an image with a single bitmap image rep of the given size and scale
-- (id)initBitmapWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
+- (instancetype)initBitmapWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
// creates an image with a two bitmap image reps of the given size and scales
1 and 2
-- (id)initBitmapWithSize:(NSSize)size drawingHandler:(void (^)(NSRect
dstRect))drawingHandler;
+- (instancetype)initBitmapWithSize:(NSSize)size drawingHandler:(void
(^)(NSRect dstRect))drawingHandler;
// creates an image with a four bitmap image reps of sizes 32 and 16 and
scales 1 and 2
// note that dstRect will vary in the calls of the drawingHandler
-- (id)initSmallBitmapWithDrawingHandler:(void (^)(NSRect
dstRect))drawingHandler;
+- (instancetype)initSmallBitmapWithDrawingHandler:(void (^)(NSRect
dstRect))drawingHandler;
@end
@@ -90,7 +90,7 @@
@interface NSBitmapImageRep (BDSKExtensions)
-+ (id)imageRepWithSize:(NSSize)size scale:(CGFloat)scale drawingHandler:(void
(^)(NSRect dstRect))drawingHandler;
++ (instancetype)imageRepWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
@end
Modified: trunk/bibdesk/NSInvocation_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSInvocation_BDSKExtensions.h 2024-02-04 15:40:43 UTC (rev
28694)
+++ trunk/bibdesk/NSInvocation_BDSKExtensions.h 2024-02-05 15:51:17 UTC (rev
28695)
@@ -40,5 +40,5 @@
@interface NSInvocation (BDSKExtensions)
-+ (id)invocationWithTarget:(id)target selector:(SEL)selector;
++ (instancetype)invocationWithTarget:(id)target selector:(SEL)selector;
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
