Revision: 25411
http://sourceforge.net/p/bibdesk/svn/25411
Author: hofman
Date: 2021-01-16 15:23:26 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
No need for custom set callbacks
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVPriorityQueue.mm
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVPriorityQueue.mm
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVPriorityQueue.mm
2021-01-16 10:54:59 UTC (rev 25410)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVPriorityQueue.mm
2021-01-16 15:23:26 UTC (rev 25411)
@@ -126,7 +126,7 @@
// queue does not retain its objects, so always add/remove from the
set last
- _set = CFSetCreateMutable(CFAllocatorGetDefault(), 0,
&FVNSObjectSetCallBacks);
+ _set = CFSetCreateMutable(CFAllocatorGetDefault(), 0,
&kCFTypeSetCallBacks);
capacity = __FVPriorityQueueRoundUpCapacity(capacity);
_values = (id *)NSZoneCalloc([self zone], capacity, sizeof(id));
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.h 2021-01-16
10:54:59 UTC (rev 25410)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.h 2021-01-16
15:23:26 UTC (rev 25411)
@@ -43,17 +43,6 @@
__BEGIN_DECLS
-/** @file FVUtilities.h Various useful functions. */
-
-/** @internal @var FVNSObjectSetCallBacks
- For NSObject subclasses in a CFSet. Compatible with toll-free bridging. */
-FV_EXTERN const CFSetCallBacks FVNSObjectSetCallBacks;
-
-
-/** @internal @var FVNSObjectPointerSetCallBacks
- For NSObject subclasses in a CFSet using pointer equality. Compatible with
toll-free bridging. */
-FV_EXTERN const CFSetCallBacks FVNSObjectPointerSetCallBacks;
-
/** @internal @brief Nonretaining timer.
Creates a timer that does not retain its target; does not schedule the timer
in a runloop.
@param interval Fire interval.
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.m 2021-01-16
10:54:59 UTC (rev 25410)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVUtilities.m 2021-01-16
15:23:26 UTC (rev 25411)
@@ -39,15 +39,6 @@
#import "FVUtilities.h"
#import "zlib.h"
-static CFStringRef __FVObjectCopyDescription(const void *value) { return
(CFStringRef)[[(id)value description] copy]; }
-static CFHashCode __FVObjectHash(const void *value) { return [(id)value hash];
}
-static Boolean __FVObjectEqual(const void *value1, const void *value2) {
return (Boolean)[(id)value1 isEqual:(id)value2]; }
-static const void * __FVObjectRetain(CFAllocatorRef alloc, const void *value)
{ return [(id)value retain]; }
-static void __FVObjectRelease(CFAllocatorRef alloc, const void *value) {
[(id)value release]; }
-
-const CFSetCallBacks FVNSObjectSetCallBacks = { 0, __FVObjectRetain,
__FVObjectRelease, __FVObjectCopyDescription, __FVObjectEqual, __FVObjectHash };
-const CFSetCallBacks FVNSObjectPointerSetCallBacks = { 0, __FVObjectRetain,
__FVObjectRelease, __FVObjectCopyDescription, NULL, NULL };
-
#pragma mark Timer
// Object that can be retained and released by the timer, but does not retain
its ivars
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
