Revision: 28404
http://sourceforge.net/p/bibdesk/svn/28404
Author: hofman
Date: 2023-10-13 09:42:38 +0000 (Fri, 13 Oct 2023)
Log Message:
-----------
use number literals
Modified Paths:
--------------
trunk/bibdesk/BDSKColorCell.m
trunk/bibdesk/BDSKColorLabelWell.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKFileMatcher.m
trunk/bibdesk/BDSKMergeController.m
trunk/bibdesk/BDSKPasswordController.m
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTemplateParser.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/BibPref_Defaults.m
trunk/bibdesk/NSAppleEventDescriptor_BDSKExtensions.m
trunk/bibdesk/NSPasteboard_BDSKExtensions.m
trunk/bibdesk/NSScanner_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKColorCell.m
===================================================================
--- trunk/bibdesk/BDSKColorCell.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKColorCell.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -124,7 +124,7 @@
} else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
return [self accessibilityValue];
} else if ([attribute isEqualToString:NSAccessibilityEnabledAttribute]) {
- return [NSNumber numberWithBool:NO];
+ return @NO;
} else {
return [super accessibilityAttributeValue:attribute];
}
Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKColorLabelWell.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -363,7 +363,7 @@
- (void)viewWillMoveToWindow:(NSWindow *)window {
[super viewWillMoveToWindow:window];
[labelCell setStringValue:@""];
- [[matrix cells] setValue:[NSNumber numberWithBool:NO] forKey:@"hovered"];
+ [[matrix cells] setValue:@NO forKey:@"hovered"];
}
- (void)mouseEntered:(NSEvent *)event {
@@ -372,7 +372,7 @@
NSUInteger i = [trackingAreas indexOfObject:area];
if (i != NSNotFound) {
if ([self isEnabled]) {
- [[matrix cells] setValue:[NSNumber numberWithBool:NO]
forKey:@"hovered"];
+ [[matrix cells] setValue:@NO forKey:@"hovered"];
[[matrix cellAtRow:0 column:i] setHovered:YES];
[matrix setNeedsDisplay:YES];
if (labelCell) {
@@ -401,7 +401,7 @@
NSUInteger i = [trackingAreas indexOfObject:area];
if (i != NSNotFound) {
if ([self isEnabled]) {
- [[matrix cells] setValue:[NSNumber numberWithBool:NO]
forKey:@"hovered"];
+ [[matrix cells] setValue:@NO forKey:@"hovered"];
[matrix setNeedsDisplay:YES];
if (labelCell) {
[labelCell setStringValue:@""];
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKEditor.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -1336,7 +1336,7 @@
if (editorFlags.isEditable) {
NSIndexSet *selectedIndexes = [fileView selectionIndexes];
- if ([[[[publication files] objectsAtIndexes:selectedIndexes]
valueForKey:@"isFileURL"] containsObject:[NSNumber numberWithInteger:1]]) {
+ if ([[[[publication files] objectsAtIndexes:selectedIndexes]
valueForKey:@"isFileURL"] containsObject:@1]) {
i = [menu indexOfItemWithTag:FVRemoveMenuItemTag];
item = [menu insertItemWithTitle:NSLocalizedString(@"Move To
Trash", @"Menu item title")
action:@selector(trashLinkedFiles:)
Modified: trunk/bibdesk/BDSKFileMatcher.m
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKFileMatcher.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -562,7 +562,7 @@
CFMutableDictionaryRef opts = CFDictionaryCreateMutable(NULL, 0,
&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
// we generally shouldn't need to index the (default) first 2000 terms
just to get title and author
- CFDictionaryAddValue(opts, kSKMaximumTerms, (CFNumberRef)[NSNumber
numberWithInteger:200]);
+ CFDictionaryAddValue(opts, kSKMaximumTerms, (CFNumberRef)@200);
// kSKProximityIndexing is unused for now, since it slows things down and
caused a crash on one of my files rdar://problem/4988691 (fixed in 10.5)
CFDictionaryAddValue(opts, kSKProximityIndexing, kCFBooleanTrue);
Modified: trunk/bibdesk/BDSKMergeController.m
===================================================================
--- trunk/bibdesk/BDSKMergeController.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKMergeController.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -238,10 +238,10 @@
[item setObject:field forKey:FIELD_COLUMNID];
[item setObject:newValue forKey:PASTED_COLUMNID];
if ([NSString isEmptyAsComplexString:oldValue]) {
- [item setObject:[NSNumber numberWithBool:YES]
forKey:SELECTED_COLUMNID];
+ [item setObject:@YES forKey:SELECTED_COLUMNID];
[addedDict setObject:item forKey:field];
} else {
- [item setObject:[NSNumber numberWithBool:NO]
forKey:SELECTED_COLUMNID];
+ [item setObject:@NO forKey:SELECTED_COLUMNID];
[item setObject:oldValue forKey:CURRENT_COLUMNID];
[overwriteDict setObject:item forKey:field];
}
@@ -255,10 +255,10 @@
[item setObject:BDSKCiteKeyString forKey:FIELD_COLUMNID];
[item setObject:[mergedPublication citeKey]
forKey:PASTED_COLUMNID];
if ([publication hasEmptyOrDefaultCiteKey]) {
- [item setObject:[NSNumber numberWithBool:YES]
forKey:SELECTED_COLUMNID];
+ [item setObject:@YES forKey:SELECTED_COLUMNID];
[addedDict setObject:item forKey:BDSKCiteKeyString];
} else {
- [item setObject:[NSNumber numberWithBool:NO]
forKey:SELECTED_COLUMNID];
+ [item setObject:@NO forKey:SELECTED_COLUMNID];
[item setObject:[publication citeKey] forKey:CURRENT_COLUMNID];
[overwriteDict setObject:item forKey:BDSKCiteKeyString];
}
@@ -268,7 +268,7 @@
if ([[mergedPublication pubType] isEqualToString:[publication
pubType]] == NO) {
NSMutableDictionary *item = [[NSMutableDictionary alloc] init];
[item setObject:BDSKPubTypeString forKey:FIELD_COLUMNID];
- [item setObject:[NSNumber numberWithBool:NO]
forKey:SELECTED_COLUMNID];
+ [item setObject:@NO forKey:SELECTED_COLUMNID];
[item setObject:[publication pubType] forKey:CURRENT_COLUMNID];
[item setObject:[mergedPublication pubType]
forKey:PASTED_COLUMNID];
[overwriteDict setObject:item forKey:BDSKPubTypeString];
@@ -325,7 +325,7 @@
if ([files count] > 0) {
for (NSURL *aURL in files) {
NSMutableDictionary *item = [[NSMutableDictionary alloc] init];
- [item setObject:[NSNumber numberWithBool:YES]
forKey:SELECTED_COLUMNID];
+ [item setObject:@YES forKey:SELECTED_COLUMNID];
[item setObject:[aURL isFileURL] ? BDSKLocalFileString :
BDSKRemoteURLString forKey:FIELD_COLUMNID];
[item setObject:[aURL isFileURL] ? [aURL path] : [aURL
absoluteString] forKey:PASTED_COLUMNID];
[addedFields addObject:item];
@@ -408,7 +408,7 @@
}
- (void)mergeOverwriting {
- [overwriteFields setValue:[NSNumber numberWithBool:YES]
forKey:SELECTED_COLUMNID];
+ [overwriteFields setValue:@YES forKey:SELECTED_COLUMNID];
[self merge];
}
Modified: trunk/bibdesk/BDSKPasswordController.m
===================================================================
--- trunk/bibdesk/BDSKPasswordController.m 2023-10-13 09:38:24 UTC (rev
28403)
+++ trunk/bibdesk/BDSKPasswordController.m 2023-10-13 09:42:38 UTC (rev
28404)
@@ -59,7 +59,7 @@
NSMutableDictionary *query = [NSMutableDictionary dictionary];
[query setObject:(NSString *)kSecClassGenericPassword forKey:(NSString
*)kSecClass];
- [query setObject:[NSNumber numberWithBool:YES] forKey:(NSString
*)kSecReturnData];
+ [query setObject:@YES forKey:(NSString *)kSecReturnData];
[query setObject:service forKey:(NSString *)kSecAttrService];
if (account)
[query setObject:account forKey:(NSString *)kSecAttrAccount];
@@ -143,7 +143,7 @@
NSMutableDictionary *query = [NSMutableDictionary dictionary];
[query setObject:(NSString *)kSecClassInternetPassword forKey:(NSString
*)kSecClass];
- [query setObject:[NSNumber numberWithBool:YES] forKey:(NSString
*)kSecReturnData];
+ [query setObject:@YES forKey:(NSString *)kSecReturnData];
[query setObject:server forKey:(NSString *)kSecAttrServer];
[query setObject:account forKey:(NSString *)kSecAttrAccount];
if (port != 0)
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2023-10-13 09:38:24 UTC (rev
28403)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2023-10-13 09:42:38 UTC (rev
28404)
@@ -383,7 +383,7 @@
}
[typeTemplates setValue:nil forKey:@"itemTemplate"];
- [typeTemplates setValue:[NSNumber numberWithBool:NO]
forKey:@"included"];
+ [typeTemplates setValue:@NO forKey:@"included"];
for (type in types) {
NSUInteger currentIndex = [currentTypes indexOfObject:type];
Modified: trunk/bibdesk/BDSKTemplateParser.m
===================================================================
--- trunk/bibdesk/BDSKTemplateParser.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BDSKTemplateParser.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -945,7 +945,7 @@
@implementation NSNumber (BDSKTemplateParser)
- (BOOL)isNotEmpty {
- return [self isEqualToNumber:[NSNumber numberWithBool:NO]] == NO && [self
isEqualToNumber:[NSNumber numberWithInteger:0]] == NO;
+ return [self isEqualToNumber:@NO] == NO && [self isEqualToNumber:@0] == NO;
}
@end
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2023-10-13 09:38:24 UTC (rev
28403)
+++ trunk/bibdesk/BibDocument_DataSource.m 2023-10-13 09:42:38 UTC (rev
28404)
@@ -1149,7 +1149,7 @@
item = [[[NSPasteboardItem alloc] init] autorelease];
[item setDataProvider:searchGroup forTypes:@[(NSString
*)kPasteboardTypeFileURLPromise, (NSString
*)kPasteboardTypeFilePromiseContent]];
if (([NSEvent standardModifierFlags] & NSAlternateKeyMask) != 0)
- [item setPropertyList:[NSNumber numberWithBool:YES]
forType:@"net.sourceforge.bibdesk.bdsksearch.includepassword"];
+ [item setPropertyList:@YES
forType:@"net.sourceforge.bibdesk.bdsksearch.includepassword"];
}
if (nil == item || NO == [pboard writeObjects:@[item]])
success = [pubs count] > 0;
Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m 2023-10-13 09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/BibPref_Defaults.m 2023-10-13 09:42:38 UTC (rev 28404)
@@ -157,7 +157,7 @@
// Add any remaining Textual default fields at the beginning
type = [NSNumber numberWithInteger:BDSKStringType];
- isDefault = [NSNumber numberWithBool:YES];
+ isDefault = @YES;
for (field in [defaultFields reverseObjectEnumerator]){
if([customFieldsSet containsObject:field])
continue;
@@ -589,7 +589,7 @@
if ([sender selectedSegment] == 0) { // add
NSInteger row = [customFieldsArray count];
- NSMutableDictionary *newDict = [NSMutableDictionary
dictionaryWithObjectsAndKeys: @"Field", FIELD_KEY, [NSNumber
numberWithInteger:BDSKStringType], TYPE_KEY, [NSNumber numberWithBool:NO],
DEFAULT_KEY, nil]; // do not localize
+ NSMutableDictionary *newDict = [NSMutableDictionary
dictionaryWithObjectsAndKeys: @"Field", FIELD_KEY, [NSNumber
numberWithInteger:BDSKStringType], TYPE_KEY, @NO, DEFAULT_KEY, nil]; // do not
localize
[customFieldsArray addObject:newDict];
[defaultFieldsTableView reloadData];
[defaultFieldsTableView selectRowIndexes:[NSIndexSet
indexSetWithIndex:row] byExtendingSelection:NO];
@@ -758,12 +758,12 @@
([customFieldsSet containsObject:BDSKLocalUrlString] == NO ||
[customFieldsSet containsObject:BDSKUrlString] == NO)) {
NSMutableDictionary *newDict;
if ([customFieldsSet containsObject:BDSKLocalUrlString] == NO) {
- newDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
BDSKLocalUrlString, FIELD_KEY, [NSNumber numberWithInteger:BDSKLocalFileType],
TYPE_KEY, [NSNumber numberWithBool:NO], DEFAULT_KEY, nil];
+ newDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
BDSKLocalUrlString, FIELD_KEY, [NSNumber numberWithInteger:BDSKLocalFileType],
TYPE_KEY, @NO, DEFAULT_KEY, nil];
[customFieldsArray addObject:newDict];
[customFieldsSet addObject:BDSKLocalUrlString];
}
if ([customFieldsSet containsObject:BDSKUrlString] == NO) {
- newDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
BDSKUrlString, FIELD_KEY, [NSNumber numberWithInteger:BDSKRemoteURLType],
TYPE_KEY, [NSNumber numberWithBool:NO], DEFAULT_KEY, nil];
+ newDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
BDSKUrlString, FIELD_KEY, [NSNumber numberWithInteger:BDSKRemoteURLType],
TYPE_KEY, @NO, DEFAULT_KEY, nil];
[customFieldsArray addObject:newDict];
[customFieldsSet addObject:BDSKUrlString];
}
Modified: trunk/bibdesk/NSAppleEventDescriptor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSAppleEventDescriptor_BDSKExtensions.m 2023-10-13
09:38:24 UTC (rev 28403)
+++ trunk/bibdesk/NSAppleEventDescriptor_BDSKExtensions.m 2023-10-13
09:42:38 UTC (rev 28404)
@@ -324,7 +324,7 @@
+ (void)load {
if (BOOLNumberClass == Nil) {
- BOOLNumberClass = [[NSNumber numberWithBool:NO] class];
+ BOOLNumberClass = [@NO class];
if (BOOLNumberClass == [[NSNumber numberWithChar:0] class])
BOOLNumberClass = Nil;
}
Modified: trunk/bibdesk/NSPasteboard_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2023-10-13 09:38:24 UTC (rev
28403)
+++ trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2023-10-13 09:42:38 UTC (rev
28404)
@@ -122,7 +122,7 @@
}
- (BOOL)canReadFileURLOfTypes:(NSArray *)types {
- if ([self canReadObjectForClasses:@[[NSURL class]] options:[NSDictionary
dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES],
NSPasteboardURLReadingFileURLsOnlyKey, types,
NSPasteboardURLReadingContentsConformToTypesKey, nil]])
+ if ([self canReadObjectForClasses:@[[NSURL class]] options:[NSDictionary
dictionaryWithObjectsAndKeys:@YES, NSPasteboardURLReadingFileURLsOnlyKey,
types, NSPasteboardURLReadingContentsConformToTypesKey, nil]])
return YES;
if ([[self types] containsObject:NSFilenamesPboardType]) {
if (types == nil)
@@ -136,7 +136,7 @@
}
- (NSArray *)readFileURLsOfTypes:(NSArray *)types {
- NSArray *fileURLs = [self readObjectsForClasses:@[[NSURL class]]
options:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber
numberWithBool:YES], NSPasteboardURLReadingFileURLsOnlyKey, types,
NSPasteboardURLReadingContentsConformToTypesKey, nil]];
+ NSArray *fileURLs = [self readObjectsForClasses:@[[NSURL class]]
options:[NSDictionary dictionaryWithObjectsAndKeys:@YES,
NSPasteboardURLReadingFileURLsOnlyKey, types,
NSPasteboardURLReadingContentsConformToTypesKey, nil]];
if ([fileURLs count] == 0) {
fileURLs = nil;
if ([[self types] containsObject:NSFilenamesPboardType]) {
Modified: trunk/bibdesk/NSScanner_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSScanner_BDSKExtensions.m 2023-10-13 09:38:24 UTC (rev
28403)
+++ trunk/bibdesk/NSScanner_BDSKExtensions.m 2023-10-13 09:42:38 UTC (rev
28404)
@@ -171,10 +171,10 @@
}
} else if ([self scanString:@"true" intoString:NULL]) {
// boolean
- tmpObject = [NSNumber numberWithBool:YES];
+ tmpObject = @YES;
} else if ([self scanString:@"false" intoString:NULL]) {
// boolean
- tmpObject = [NSNumber numberWithBool:NO];
+ tmpObject = @NO;
} else { // or should we raise an exception?
// unquoted string, just scan up to the next character in the stopset
NSString *s = nil;
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
