Revision: 28802
http://sourceforge.net/p/bibdesk/svn/28802
Author: hofman
Date: 2024-02-23 10:39:56 +0000 (Fri, 23 Feb 2024)
Log Message:
-----------
use pointer functions from category
Modified Paths:
--------------
trunk/bibdesk/BDSKPublicationsArray.m
Modified: trunk/bibdesk/BDSKPublicationsArray.m
===================================================================
--- trunk/bibdesk/BDSKPublicationsArray.m 2024-02-23 10:28:18 UTC (rev
28801)
+++ trunk/bibdesk/BDSKPublicationsArray.m 2024-02-23 10:39:56 UTC (rev
28802)
@@ -40,21 +40,13 @@
#import "BibItem.h"
#import "BibAuthor.h"
#import "NSString_BDSKExtensions.h"
-#import "CFString_BDSKExtensions.h"
#import "BDSKItemSearchIndexes.h"
#import "BDSKStringConstants.h"
+#import "NSPointerFunctions_BDSKExtensions.h"
static char BDSKPublicationArrayDefaultsObservationContext;
-static BOOL caseInsensitiveStringEqual(const void *item1, const void *item2,
NSUInteger (*size)(const void *item)) {
- return CFStringCompare(item1, item2, kCFCompareCaseInsensitive |
kCFCompareNonliteral) == kCFCompareEqualTo;
-}
-static NSUInteger caseInsensitiveStringHash(const void *item, NSUInteger
(*size)(const void *item)) {
- return BDCaseInsensitiveStringHash(item);
-}
-
-
@interface BDSKPublicationsArray ()
- (instancetype)initTemporaryWithArray:(NSArray *)anArray
itemsForCiteKey:(NSMapTable *)anItemsForCiteKey NS_DESIGNATED_INITIALIZER;
@end
@@ -98,9 +90,7 @@
if (self) {
publications = [[NSMutableArray alloc] initWithArray:anArray];
itemsForIdentifierURLs = [[NSMutableDictionary alloc] init];
- NSPointerFunctions *keyPointerFunctions = [NSPointerFunctions
pointerFunctionsWithOptions:NSPointerFunctionsStrongMemory |
NSPointerFunctionsObjectPersonality];
- [keyPointerFunctions setIsEqualFunction:&caseInsensitiveStringEqual];
- [keyPointerFunctions setHashFunction:&caseInsensitiveStringHash];
+ NSPointerFunctions *keyPointerFunctions = [NSPointerFunctions
caseInsensitiveStringPointerFunctions];
NSPointerFunctions *valuePointerFunctions = [NSPointerFunctions
pointerFunctionsWithOptions:NSPointerFunctionsStrongMemory |
NSPointerFunctionsObjectPersonality];
itemsForCiteKeys = [[NSMapTable alloc]
initWithKeyPointerFunctions:keyPointerFunctions
valuePointerFunctions:valuePointerFunctions capacity:0];
searchIndexes = [[BDSKItemSearchIndexes alloc] init];
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
