Revision: 28497
http://sourceforge.net/p/bibdesk/svn/28497
Author: hofman
Date: 2024-01-01 11:03:44 +0000 (Mon, 01 Jan 2024)
Log Message:
-----------
don't bother with zone
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController+Scripting.m
trunk/bibdesk/BDSKBookmark+Scripting.m
trunk/bibdesk/BDSKCategoryGroup.m
trunk/bibdesk/BDSKComplexString.m
trunk/bibdesk/BDSKCondition+Scripting.m
trunk/bibdesk/BDSKField.m
trunk/bibdesk/BDSKFieldInfo.m
trunk/bibdesk/BDSKFileSearch.m
trunk/bibdesk/BDSKGroup+Scripting.m
trunk/bibdesk/BDSKImagePopUpButtonCell.m
trunk/bibdesk/BDSKInfo.m
trunk/bibdesk/BDSKLinkedFile.m
trunk/bibdesk/BDSKMacro.m
trunk/bibdesk/BDSKPubMedXMLParser.m
trunk/bibdesk/BDSKScriptGroup.m
trunk/bibdesk/BDSKScriptHook+Scripting.m
trunk/bibdesk/BDSKSearchBookmark+Scripting.m
trunk/bibdesk/BDSKTask.m
trunk/bibdesk/BDSKTypeInfo.m
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/BDSKZoomableTextView.m
trunk/bibdesk/BibAuthor+Scripting.m
trunk/bibdesk/BibDocument+Scripting.m
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/BibItem+Scripting.m
trunk/bibdesk/BibItem.m
trunk/bibdesk/NSArray_BDSKExtensions.m
trunk/bibdesk/NSAttributedString+Scripting.m
trunk/bibdesk/NSMenu_BDSKExtensions.m
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKAppController+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKAppController+Scripting.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKAppController+Scripting.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -85,7 +85,7 @@
- (id)clipboard {
NSScriptClassDescription *containerClassDescription = [NSApp
scriptClassDescription];
- return [[[NSPropertySpecifier allocWithZone: [self zone]]
+ return [[[NSPropertySpecifier alloc]
initWithContainerClassDescription: containerClassDescription
containerSpecifier: nil // the application is the
null container
key: @"clipboard"] autorelease];
Modified: trunk/bibdesk/BDSKBookmark+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKBookmark+Scripting.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKBookmark+Scripting.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -53,7 +53,7 @@
} else {
containerClassDescription = [NSScriptClassDescription
classDescriptionForClass:[NSApp class]];
}
- return [[[NSIndexSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:containerRef key:@"bookmarks" index:idx] autorelease];
+ return [[[NSIndexSpecifier alloc]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:containerRef key:@"bookmarks" index:idx] autorelease];
} else {
return nil;
}
Modified: trunk/bibdesk/BDSKCategoryGroup.m
===================================================================
--- trunk/bibdesk/BDSKCategoryGroup.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKCategoryGroup.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -56,9 +56,8 @@
// designated initializer
- (id)initWithName:(id)aName key:(NSString *)aKey {
if (aName == nil) {
- NSZone *zone = [self zone];
[self release];
- self = [BDSKEmptyGroup allocWithZone:zone];
+ self = [BDSKEmptyGroup alloc];
aName = [aKey isPersonField] ? [BibAuthor emptyAuthor] : @"";
}
self = [super initWithName:aName];
Modified: trunk/bibdesk/BDSKComplexString.m
===================================================================
--- trunk/bibdesk/BDSKComplexString.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKComplexString.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -336,7 +336,7 @@
BDSKASSERT([nodesArray count] > 0);
self = [super init];
if (self) {
- nodes = [nodesArray copyWithZone:[self zone]];
+ nodes = [nodesArray copy];
// we don't retain, as the macroResolver might retain us as a macro
value
macroResolver = (aMacroResolver == [BDSKMacroResolver
defaultMacroResolver]) ? nil : aMacroResolver;
isComplex = aIsComplex;
Modified: trunk/bibdesk/BDSKCondition+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKCondition+Scripting.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKCondition+Scripting.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -234,7 +234,7 @@
NSUInteger idx = [conditions indexOfObjectIdenticalTo:self];
if ([self group] && idx != NSNotFound) {
NSScriptObjectSpecifier *containerRef = [(id)[self group]
objectSpecifier];
- return [[[NSIndexSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"conditions" index:idx] autorelease];
+ return [[[NSIndexSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"conditions" index:idx] autorelease];
} else {
return nil;
}
Modified: trunk/bibdesk/BDSKField.m
===================================================================
--- trunk/bibdesk/BDSKField.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKField.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -71,7 +71,7 @@
- (NSScriptObjectSpecifier *) objectSpecifier {
if ([self name] && bibItem) {
NSScriptObjectSpecifier *containerRef = [bibItem objectSpecifier];
- return [[[NSNameSpecifier allocWithZone: [self zone]]
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription: [containerRef
keyClassDescription]
containerSpecifier:
containerRef
key: @"bibFields"
Modified: trunk/bibdesk/BDSKFieldInfo.m
===================================================================
--- trunk/bibdesk/BDSKFieldInfo.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKFieldInfo.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -62,7 +62,7 @@
- (NSScriptObjectSpecifier *) objectSpecifier {
if ([self name]) {
NSScriptClassDescription *containerClassDescription = [NSApp
scriptClassDescription];
- return [[[NSNameSpecifier allocWithZone: [self zone]]
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription: containerClassDescription
containerSpecifier: nil
key: @"fieldInfos"
Modified: trunk/bibdesk/BDSKFileSearch.m
===================================================================
--- trunk/bibdesk/BDSKFileSearch.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKFileSearch.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -299,8 +299,8 @@
- (BOOL)changeIndexSize:(size_t)size;
{
if ((!ids && !scores) || indexSize < size) {
- ids = (SKDocumentID *)NSZoneRealloc([self zone], ids, size *
sizeof(SKDocumentID));
- scores = (float *)NSZoneRealloc([self zone], scores, size *
sizeof(float));
+ ids = (SKDocumentID *)NSZoneRealloc(NULL, ids, size *
sizeof(SKDocumentID));
+ scores = (float *)NSZoneRealloc(NULL, scores, size * sizeof(float));
indexSize = size;
}
return NULL != scores && NULL != ids;
@@ -309,7 +309,7 @@
- (BOOL)changeResultSize:(size_t)size;
{
if (!docs || resultSize < size) {
- docs = (SKDocumentRef *)NSZoneRealloc([self zone], docs, size *
sizeof(SKDocumentRef));
+ docs = (SKDocumentRef *)NSZoneRealloc(NULL, docs, size *
sizeof(SKDocumentRef));
resultSize = size;
}
return NULL != docs;
Modified: trunk/bibdesk/BDSKGroup+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKGroup+Scripting.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKGroup+Scripting.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -71,7 +71,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"groups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"groups" uniqueID:[self uniqueID]]
autorelease];
}
- (id)newScriptingObjectOfClass:(Class)class forValueForKey:(NSString *)key
withContentsValue:(id)contentsValue properties:(NSDictionary *)properties {
@@ -263,7 +263,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"libraryGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"libraryGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (NSArray *)scriptingPublications {
@@ -304,7 +304,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"staticGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"staticGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (NSArray *)scriptingPublications {
@@ -338,7 +338,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"lastImportGroups" uniqueID:[self
uniqueID]] autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"lastImportGroups" uniqueID:[self
uniqueID]] autorelease];
}
- (void)setAsName:(NSString *)newName {
@@ -368,7 +368,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"smartGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"smartGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (id)newScriptingObjectOfClass:(Class)class forValueForKey:(NSString *)key
withContentsValue:(id)contentsValue properties:(NSDictionary *)properties {
@@ -420,7 +420,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"fieldGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"fieldGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (void)insertObject:(BibItem *)pub
inScriptingPublicationsAtIndex:(NSUInteger)idx {
@@ -477,7 +477,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"externalFileGroups" uniqueID:[self
uniqueID]] autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"externalFileGroups" uniqueID:[self
uniqueID]] autorelease];
}
- (NSString *)URLString {
@@ -508,7 +508,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"scriptGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"scriptGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (NSURL *)scriptURL {
@@ -540,7 +540,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"searchGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"searchGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (NSString *)scriptingSearchTerm {
@@ -588,7 +588,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"sharedGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"sharedGroups" uniqueID:[self uniqueID]]
autorelease];
}
@end
@@ -600,7 +600,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
BibDocument *doc = (BibDocument *)[self document];
NSScriptObjectSpecifier *containerRef = [doc objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"webGroups" uniqueID:[self uniqueID]]
autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"webGroups" uniqueID:[self uniqueID]]
autorelease];
}
- (NSString *)URLString {
Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKImagePopUpButtonCell.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKImagePopUpButtonCell.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -45,7 +45,7 @@
@implementation BDSKImagePopUpButtonCell
- (void)makeButtonCell {
- buttonCell = [[NSButtonCell allocWithZone:[self zone]] initTextCell:@""];
+ buttonCell = [[NSButtonCell alloc] initTextCell:@""];
[buttonCell setBordered: NO];
[buttonCell setHighlightsBy:NSContentsCellMask];
[buttonCell setImagePosition:NSImageOnly];
Modified: trunk/bibdesk/BDSKInfo.m
===================================================================
--- trunk/bibdesk/BDSKInfo.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKInfo.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -60,7 +60,7 @@
- (NSScriptObjectSpecifier *) objectSpecifier {
if ([self name] && document) {
NSScriptObjectSpecifier *containerRef = [document objectSpecifier];
- return [[[NSNameSpecifier allocWithZone: [self zone]]
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription: [containerRef
keyClassDescription]
containerSpecifier: containerRef
key: @"info"
Modified: trunk/bibdesk/BDSKLinkedFile.m
===================================================================
--- trunk/bibdesk/BDSKLinkedFile.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKLinkedFile.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -592,7 +592,7 @@
- (void)setFileRef:(FSRef *)aRef {
BDSKZONEDESTROY(fileRef);
if (aRef != NULL) {
- FSRef *newRef = (FSRef *)NSZoneMalloc([self zone], sizeof(FSRef));
+ FSRef *newRef = (FSRef *)NSZoneMalloc(NULL, sizeof(FSRef));
if (newRef) {
bcopy(aRef, newRef, sizeof(FSRef));
fileRef = newRef;
Modified: trunk/bibdesk/BDSKMacro.m
===================================================================
--- trunk/bibdesk/BDSKMacro.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKMacro.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -78,7 +78,7 @@
} else {
containerClassDescription = [NSApp scriptClassDescription];
}
- return [[[NSNameSpecifier allocWithZone: [self zone]]
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription:
containerClassDescription
containerSpecifier:
containerRef
key: @"macros"
Modified: trunk/bibdesk/BDSKPubMedXMLParser.m
===================================================================
--- trunk/bibdesk/BDSKPubMedXMLParser.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKPubMedXMLParser.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -357,7 +357,7 @@
// for debugging
if (_addXMLStringToAnnote) addStringToDictionaryIfNotNil([article
XMLStringWithOptions:NSXMLNodePrettyPrint], BDSKAnnoteString, pubFields);
- BibItem *pub = [[BibItem allocWithZone:[self zone]]
initWithType:BDSKArticleString
+ BibItem *pub = [[BibItem alloc] initWithType:BDSKArticleString
citeKey:nil
pubFields:pubFields];
[pubs addObject:pub];
@@ -370,7 +370,7 @@
+ (NSArray *)itemsFromString:(NSString *)itemString error:(NSError **)outError;
{
- NSXMLDocument *doc = [[NSXMLDocument allocWithZone:[self zone]]
initWithXMLString:itemString options:NSXMLNodeOptionsNone error:outError];
+ NSXMLDocument *doc = [[NSXMLDocument alloc] initWithXMLString:itemString
options:NSXMLNodeOptionsNone error:outError];
doc = [doc autorelease];
return doc ? [self _itemsFromDocument:doc error:outError] : nil;
}
@@ -377,7 +377,7 @@
+ (NSArray *)itemsFromData:(NSData *)itemData error:(NSError **)outError;
{
- NSXMLDocument *doc = [[NSXMLDocument allocWithZone:[self zone]]
initWithData:itemData options:NSXMLNodeOptionsNone error:outError];
+ NSXMLDocument *doc = [[NSXMLDocument alloc] initWithData:itemData
options:NSXMLNodeOptionsNone error:outError];
doc = [doc autorelease];
return doc ? [self _itemsFromDocument:doc error:outError] : nil;
}
Modified: trunk/bibdesk/BDSKScriptGroup.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroup.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKScriptGroup.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -357,9 +357,9 @@
NSFileHandle *outputFileHandle = [[currentTask standardOutput]
fileHandleForReading];
[nc removeObserver:self
name:NSFileHandleReadToEndOfFileCompletionNotification object:outputFileHandle];
- NSString *outputString = [[NSString allocWithZone:[self zone]]
initWithData:stdoutData encoding:NSUTF8StringEncoding];
+ NSString *outputString = [[NSString alloc] initWithData:stdoutData
encoding:NSUTF8StringEncoding];
if(outputString == nil)
- outputString = [[NSString allocWithZone:[self zone]]
initWithData:stdoutData encoding:[NSString defaultCStringEncoding]];
+ outputString = [[NSString alloc] initWithData:stdoutData
encoding:[NSString defaultCStringEncoding]];
[outputString autorelease];
NSInteger terminationStatus = [currentTask terminationStatus];
@@ -406,7 +406,7 @@
// ignore SIGPIPE, as it causes a crash (seems to happen if the binaries
don't exist and you try writing to the pipe)
(void) signal(SIGPIPE, SIG_IGN);
- currentTask = [[BDSKTask allocWithZone:[self zone]] init];
+ currentTask = [[BDSKTask alloc] init];
[currentTask setStandardError:[NSFileHandle fileHandleWithStandardError]];
[currentTask setLaunchPath:[scriptPath stringByStandardizingPath]];
[currentTask setCurrentDirectoryPath:workingDirPath];
Modified: trunk/bibdesk/BDSKScriptHook+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKScriptHook+Scripting.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKScriptHook+Scripting.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -50,7 +50,7 @@
if (uniqueID) {
// this is necessary as our container is the application
NSScriptClassDescription *containerClassDescription = [NSApp
scriptClassDescription];
- return [[[NSUniqueIDSpecifier allocWithZone: [self zone]]
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:
containerClassDescription
containerSpecifier:
nil // the application is the null container
key: @"scriptHooks"
Modified: trunk/bibdesk/BDSKSearchBookmark+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark+Scripting.m 2023-12-31 17:05:19 UTC
(rev 28496)
+++ trunk/bibdesk/BDSKSearchBookmark+Scripting.m 2024-01-01 11:03:44 UTC
(rev 28497)
@@ -56,7 +56,7 @@
} else {
containerClassDescription = [NSScriptClassDescription
classDescriptionForClass:[NSApp class]];
}
- return [[[NSIndexSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:containerRef key:@"searchBookmarks" index:idx] autorelease];
+ return [[[NSIndexSpecifier alloc]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:containerRef key:@"searchBookmarks" index:idx] autorelease];
} else {
return nil;
}
Modified: trunk/bibdesk/BDSKTask.m
===================================================================
--- trunk/bibdesk/BDSKTask.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKTask.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -90,7 +90,7 @@
{
self = [super init];
if (self) {
- _internal = NSZoneCalloc([self zone], 1, sizeof(struct
BDSKTaskInternal));
+ _internal = NSZoneCalloc(NULL, 1, sizeof(struct BDSKTaskInternal));
memset(&_internal->_event, 0, sizeof(struct kevent));
pthread_mutex_init(&_internal->_lock, NULL);
_internal->_canNotify = 1;
@@ -245,7 +245,7 @@
char *workingDir =
__BDSKCopyFileSystemRepresentation(_currentDirectoryPath);
// fill with pointers to copied C strings
- char **args = NSZoneCalloc([self zone], (argCount + 2), sizeof(char *));
+ char **args = NSZoneCalloc(NULL, (argCount + 2), sizeof(char *));
NSUInteger i;
args[0] = __BDSKCopyFileSystemRepresentation(_launchPath);
for (i = 0; i < argCount; i++) {
@@ -259,7 +259,7 @@
NSDictionary *environment = [self environment];
if (environment) {
// fill with pointers to copied C strings
- env = NSZoneCalloc([self zone], [environment count] + 1, sizeof(char
*));
+ env = NSZoneCalloc(NULL, [environment count] + 1, sizeof(char *));
NSString *key;
NSUInteger envIndex = 0;
for (key in environment) {
@@ -485,7 +485,7 @@
{
ASSERT_LAUNCH;
while ([self isRunning]) {
- NSDate *next = [[NSDate allocWithZone:[self zone]]
initWithTimeIntervalSinceNow:0.1];
+ NSDate *next = [[NSDate alloc] initWithTimeIntervalSinceNow:0.1];
[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
beforeDate:next];
[next release];
}
Modified: trunk/bibdesk/BDSKTypeInfo.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfo.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKTypeInfo.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -63,7 +63,7 @@
- (NSScriptObjectSpecifier *) objectSpecifier {
if ([self name]) {
NSScriptClassDescription *containerClassDescription = [NSApp
scriptClassDescription];
- return [[[NSNameSpecifier allocWithZone: [self zone]]
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription: containerClassDescription
containerSpecifier: nil
key: @"typeInfos"
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -234,7 +234,7 @@
if (scalePopUpButton == nil) {
// create it
- scalePopUpButton = [[NSPopUpButton allocWithZone:[self zone]]
initWithFrame:NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown:NO];
+ scalePopUpButton = [[NSPopUpButton alloc]
initWithFrame:NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown:NO];
[[scalePopUpButton cell] setControlSize:NSControlSizeSmall];
[scalePopUpButton setBordered:NO];
Modified: trunk/bibdesk/BDSKZoomableTextView.m
===================================================================
--- trunk/bibdesk/BDSKZoomableTextView.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BDSKZoomableTextView.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -108,7 +108,7 @@
NSScrollView *scrollView = [self enclosingScrollView];
// create it
- scalePopUpButton = [[NSPopUpButton allocWithZone:[self zone]]
initWithFrame:NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown:NO];
+ scalePopUpButton = [[NSPopUpButton alloc]
initWithFrame:NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown:NO];
[[scalePopUpButton cell] setControlSize:NSControlSizeSmall];
[scalePopUpButton setBordered:NO];
[scalePopUpButton setEnabled:YES];
Modified: trunk/bibdesk/BibAuthor+Scripting.m
===================================================================
--- trunk/bibdesk/BibAuthor+Scripting.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BibAuthor+Scripting.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -94,9 +94,9 @@
if ([field isEqualToString:BDSKEditorString])
key = @"scriptingEditors";
else if ([field isEqualToString:BDSKAuthorString] == NO)
- containerRef = [[[NSNameSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"bibFields" name:field] autorelease];
+ containerRef = [[[NSNameSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"bibFields" name:field] autorelease];
- return [[[NSNameSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:key name:[self normalizedName]]
autorelease];
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:key name:[self normalizedName]]
autorelease];
}
- (NSArray *)scriptingPublications {
Modified: trunk/bibdesk/BibDocument+Scripting.m
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/BibDocument+Scripting.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -697,7 +697,7 @@
- (id)clipboard {
NSScriptClassDescription *containerClassDescription = [NSApp
scriptClassDescription];
- return [[[NSPropertySpecifier allocWithZone: [self zone]]
+ return [[[NSPropertySpecifier alloc]
initWithContainerClassDescription: containerClassDescription
containerSpecifier: nil // the application is the
null container
key: @"clipboard"] autorelease];
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BibDocument_Groups.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -1359,10 +1359,10 @@
- (NSArray *)mergeInPublications:(NSArray *)items{
// first construct a set of current items to compare based on BibItem
equality callbacks
CFIndex countOfItems = [publications count];
- BibItem **pubs = (BibItem **)NSZoneMalloc([self zone], sizeof(BibItem *) *
countOfItems);
+ BibItem **pubs = (BibItem **)NSZoneMalloc(NULL, sizeof(BibItem *) *
countOfItems);
[publications getObjects:pubs range:NSMakeRange(0, countOfItems)];
NSSet *currentPubs = [(NSSet *)CFSetCreate(CFAllocatorGetDefault(), (const
void **)pubs, countOfItems, &kBDSKBibItemEquivalenceSetCallBacks) autorelease];
- NSZoneFree([self zone], pubs);
+ NSZoneFree(NULL, pubs);
NSMutableArray *newPubs = [NSMutableArray arrayWithCapacity:[items count]];
@@ -1626,10 +1626,10 @@
- (void)setImported:(BOOL)flag forPublications:(NSArray *)pubs
inGroup:(BDSKExternalGroup *)aGroup{
CFIndex countOfItems = [pubs count];
- BibItem **items = (BibItem **)NSZoneMalloc([self zone], sizeof(BibItem *)
* countOfItems);
+ BibItem **items = (BibItem **)NSZoneMalloc(NULL, sizeof(BibItem *) *
countOfItems);
[pubs getObjects:items range:NSMakeRange(0, countOfItems)];
NSSet *pubSet = (NSSet *)CFSetCreate(CFAllocatorGetDefault(), (const void
**)items, countOfItems, &kBDSKBibItemEquivalenceSetCallBacks);
- NSZoneFree([self zone], items);
+ NSZoneFree(NULL, items);
NSArray *groupsToTest = aGroup ? @[aGroup] : [[groups externalParent]
children];
Modified: trunk/bibdesk/BibItem+Scripting.m
===================================================================
--- trunk/bibdesk/BibItem+Scripting.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BibItem+Scripting.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -70,7 +70,7 @@
// only items belonging to an owner are scriptable
if ([self owner]) {
NSScriptObjectSpecifier *containerRef = [(id)[self owner]
objectSpecifier];
- return [[[NSUniqueIDSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"scriptingPublications" uniqueID:[self
uniqueID]] autorelease];
+ return [[[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"scriptingPublications" uniqueID:[self
uniqueID]] autorelease];
} else {
return nil;
}
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2023-12-31 17:05:19 UTC (rev 28496)
+++ trunk/bibdesk/BibItem.m 2024-01-01 11:03:44 UTC (rev 28497)
@@ -3848,7 +3848,7 @@
if ((document = [[PDFDocument alloc] initWithURL:fileURL])) {
metadata = [document documentAttributes];
if ([metadata count]){
- item = [[[self allocWithZone:[self zone]] init] autorelease];
+ item = [[[self alloc] init] autorelease];
NSString *value = nil;
Modified: trunk/bibdesk/NSArray_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSArray_BDSKExtensions.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/NSArray_BDSKExtensions.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -455,7 +455,7 @@
}
// for multiple sort descriptors; finds ranges of objects compare
NSOrderedSame (concept from GNUStep's NSSortDescriptor)
-static inline NSRange * __BDFindEqualRanges(BDSortCacheValue *buf, NSRange
searchRange, NSRange *equalRanges, NSUInteger *numRanges, NSZone *zone)
+static inline NSRange * __BDFindEqualRanges(BDSortCacheValue *buf, NSRange
searchRange, NSRange *equalRanges, NSUInteger *numRanges)
{
NSUInteger i = searchRange.location, j;
NSUInteger bufLen = NSMaxRange(searchRange);
@@ -465,7 +465,7 @@
for(j = i + 1; j < bufLen && __BDCompareSortCacheValues(&buf[i],
&buf[j]) == 0; j++);
if(j - i > 1){
(*numRanges)++;
- equalRanges = (NSRange *)NSZoneRealloc(zone, equalRanges,
(*numRanges) * sizeof(NSRange));
+ equalRanges = (NSRange *)NSZoneRealloc(NULL, equalRanges,
(*numRanges) * sizeof(NSRange));
equalRanges[(*numRanges) - 1].location = i;
equalRanges[(*numRanges) - 1].length = j - i;
// NSLog(@"equalityRange of %@",
NSStringFromRange(NSMakeRange(i, j-i)));
@@ -514,17 +514,16 @@
{
// we use a static cache, so this is not thread safe
BDSKASSERT([NSThread isMainThread]);
- NSZone *zone = [self zone];
size_t count = [self count];
size_t size = sizeof(BDSortCacheValue);
- BDSortCacheValue *cache = (BDSortCacheValue *)NSZoneMalloc(zone, count *
size);
+ BDSortCacheValue *cache = (BDSortCacheValue *)NSZoneMalloc(NULL, count *
size);
BDSortCacheValue aValue;
NSUInteger i, sortIdx = 0, numberOfDescriptors = [sortDescriptors count];
// first "equal range" is considered to be the entire array
- NSRange *equalRanges = (NSRange *)NSZoneMalloc(zone, 1 * sizeof(NSRange));
+ NSRange *equalRanges = (NSRange *)NSZoneMalloc(NULL, 1 * sizeof(NSRange));
equalRanges[0].location = 0;
equalRanges[0].length = count;
NSUInteger numberOfEqualRanges = 1;
@@ -576,9 +575,9 @@
// don't check the entire array; only previously equal ranges (of
course, for the second sort descriptor, this will still cover the entire array)
for(rangeIdx = 0; rangeIdx < numberOfEqualRanges; rangeIdx++)
- newEqualRanges = __BDFindEqualRanges(cache,
equalRanges[rangeIdx], newEqualRanges, &newNumberOfRanges, zone);
+ newEqualRanges = __BDFindEqualRanges(cache,
equalRanges[rangeIdx], newEqualRanges, &newNumberOfRanges);
- NSZoneFree(zone, equalRanges);
+ NSZoneFree(NULL, equalRanges);
equalRanges = newEqualRanges;
numberOfEqualRanges = newNumberOfRanges;
}
@@ -586,7 +585,7 @@
__BDClearStatics();
}
- if(equalRanges) NSZoneFree(zone, equalRanges);
+ if(equalRanges) NSZoneFree(NULL, equalRanges);
// our array of structures is now sorted correctly, so we just loop
through it and create an array with the contents
[self removeAllObjects];
@@ -596,7 +595,7 @@
[aValue.object release];
}
- NSZoneFree(zone, cache);
+ NSZoneFree(NULL, cache);
}
@end
Modified: trunk/bibdesk/NSAttributedString+Scripting.m
===================================================================
--- trunk/bibdesk/NSAttributedString+Scripting.m 2023-12-31 17:05:19 UTC
(rev 28496)
+++ trunk/bibdesk/NSAttributedString+Scripting.m 2024-01-01 11:03:44 UTC
(rev 28497)
@@ -52,7 +52,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
NSScriptClassDescription *containerClassDescription =
[NSScriptClassDescription classDescriptionForClass:[NSApp class]];
- return [[[NSNameSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
+ return [[[NSNameSpecifier alloc]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
}
- (NSScriptObjectSpecifier *)richTextSpecifier {
Modified: trunk/bibdesk/NSMenu_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSMenu_BDSKExtensions.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/NSMenu_BDSKExtensions.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -68,9 +68,8 @@
{
NSUInteger i, count = [other numberOfItems];
NSMenuItem *anItem;
- NSZone *zone = [self zone];
for(i = 0; i < count; i++){
- anItem = [[other itemAtIndex:i] copyWithZone:zone];
+ anItem = [[other itemAtIndex:i] copy];
[self addItem:anItem];
[anItem release];
}
@@ -78,7 +77,7 @@
- (NSMenuItem *)insertItemWithTitle:(NSString *)itemTitle submenu:(NSMenu
*)submenu atIndex:(NSUInteger)idx;
{
- NSMenuItem *item = [[NSMenuItem allocWithZone:[self zone]]
initWithTitle:itemTitle action:NULL keyEquivalent:@""];
+ NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:itemTitle action:NULL
keyEquivalent:@""];
[item setSubmenu:submenu];
[self insertItem:item atIndex:idx];
[item release];
@@ -92,8 +91,8 @@
- (NSMenuItem *)insertItemWithTitle:(NSString *)itemTitle
submenuTitle:(NSString *)submenuTitle submenuDelegate:(id)delegate
atIndex:(NSUInteger)idx;
{
- NSMenuItem *item = [[NSMenuItem allocWithZone:[self zone]]
initWithTitle:itemTitle action:NULL keyEquivalent:@""];
- NSMenu *submenu = [[NSMenu allocWithZone:[self zone]]
initWithTitle:submenuTitle];
+ NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:itemTitle action:NULL
keyEquivalent:@""];
+ NSMenu *submenu = [[NSMenu alloc] initWithTitle:submenuTitle];
[submenu setDelegate:delegate];
[item setSubmenu:submenu];
[self insertItem:item atIndex:idx];
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2023-12-31 17:05:19 UTC (rev
28496)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-01 11:03:44 UTC (rev
28497)
@@ -253,7 +253,7 @@
- (NSString *)initWithContentsOfURL:(NSURL *)fileURL
guessedEncoding:(NSStringEncoding)encoding;
{
- NSData *data = [[NSData allocWithZone:[self zone]]
initWithContentsOfURL:fileURL options:NSMappedRead error:NULL];
+ NSData *data = [[NSData alloc] initWithContentsOfURL:fileURL
options:NSMappedRead error:NULL];
NSString *string = nil;
Class stringClass = [self isKindOfClass:[NSMutableString class]] ?
[NSMutableString class] : [NSString class];
@@ -260,9 +260,9 @@
// if we're guessing, try the reliable encodings first
if(dataHasUnicodeByteOrderMark(data) && encoding !=
NSUnicodeStringEncoding)
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:NSUnicodeStringEncoding];
+ string = [[stringClass alloc] initWithData:data
encoding:NSUnicodeStringEncoding];
if(nil == string && encoding != NSUTF8StringEncoding)
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:NSUTF8StringEncoding];
+ string = [[stringClass alloc] initWithData:data
encoding:NSUTF8StringEncoding];
// read com.apple.TextEncoding on Leopard, or when reading a Tiger file
saved on Leopard
if(nil == string) {
@@ -269,21 +269,21 @@
// don't clobber the encoding parameter in case this fails...
NSStringEncoding xattrEncoding = [[NSFileManager defaultManager]
appleStringEncodingAtURL:fileURL error:NULL];
if (xattrEncoding > 0)
- string = [[stringClass allocWithZone:[self zone]]
initWithData:data encoding:xattrEncoding];
+ string = [[stringClass alloc] initWithData:data
encoding:xattrEncoding];
}
// try the encoding passed as a parameter, if non-zero (zero encoding is
never valid)
if(nil == string && encoding > 0)
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:encoding];
+ string = [[stringClass alloc] initWithData:data encoding:encoding];
// now we just try a few wild guesses
if(nil == string && encoding != [NSString defaultCStringEncoding])
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:[NSString defaultCStringEncoding]];
+ string = [[stringClass alloc] initWithData:data encoding:[NSString
defaultCStringEncoding]];
if(nil == string && encoding != [BDSKStringEncodingManager
defaultEncoding])
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:[BDSKStringEncodingManager defaultEncoding]];
+ string = [[stringClass alloc] initWithData:data
encoding:[BDSKStringEncodingManager defaultEncoding]];
// final fallback is Mac Roman (gapless)
if(nil == string && encoding != NSMacOSRomanStringEncoding)
- string = [[stringClass allocWithZone:[self zone]] initWithData:data
encoding:NSMacOSRomanStringEncoding];
+ string = [[stringClass alloc] initWithData:data
encoding:NSMacOSRomanStringEncoding];
[data release];
[[self init] release];
@@ -893,7 +893,7 @@
- (NSString *)lossyASCIIString{
NSData *asciiData = [self dataUsingEncoding:NSASCIIStringEncoding];
if (asciiData == nil) {
- NSMutableString *ms = [self mutableCopyWithZone:[self zone]];
+ NSMutableString *ms = [self mutableCopy];
// do as much transliteration as possible, then strip all combining
marks; works with ideographs as well
CFStringTransform((CFMutableStringRef)ms, NULL,
kCFStringTransformToLatin, FALSE);
CFStringTransform((CFMutableStringRef)ms, NULL,
kCFStringTransformStripCombiningMarks, FALSE);
@@ -1452,7 +1452,7 @@
CFStringInitInlineBuffer(theString, &inlineBuffer, CFRangeMake(0, length));
UniChar ch;
-#define DELETE_CHARACTERS(n)
do{if((void*)self==theString){theString=(void*)[[self mutableCopyWithZone:[self
zone]] autorelease];};CFStringDelete(theString, CFRangeMake(delIdx, n));}
while(0)
+#define DELETE_CHARACTERS(n)
do{if((void*)self==theString){theString=(void*)[[self mutableCopy]
autorelease];};CFStringDelete(theString, CFRangeMake(delIdx, n));} while(0)
// idx is current index into the inline buffer, and delIdx is current
index in the mutable string
CFIndex idx = 0, delIdx = 0;
@@ -1616,7 +1616,7 @@
NSInteger length;
length = [self length];
- ptr = NSZoneMalloc([self zone], length * sizeof(unichar));
+ ptr = NSZoneMalloc(NULL, length * sizeof(unichar));
void *originalPtr = ptr;
end = ptr + length;
[self getCharacters:ptr];
@@ -1652,7 +1652,7 @@
ptr++;
}
APPEND_PREVIOUS();
- NSZoneFree([self zone], originalPtr);
+ NSZoneFree(NULL, originalPtr);
return result;
}
@@ -1673,7 +1673,7 @@
BOOL isQuoted, needsSpace;
length = [self length];
- ptr = NSZoneMalloc([self zone], length * sizeof(unichar));
+ ptr = NSZoneMalloc(NULL, length * sizeof(unichar));
void *originalPtr = ptr;
end = ptr + length;
[self getCharacters:ptr];
@@ -1682,7 +1682,7 @@
needsSpace = NO;
if(isQuoted == NO && [self rangeOfCharacterFromSet:[NSCharacterSet
characterSetWithCharactersInString:@"\n\r\t\","]].length == 0) {
- NSZoneFree([self zone], originalPtr);
+ NSZoneFree(NULL, originalPtr);
return self;
}
@@ -1714,7 +1714,7 @@
[result insertString:@"\"" atIndex:0];
[result appendString:@"\""];
}
- NSZoneFree([self zone], originalPtr);
+ NSZoneFree(NULL, originalPtr);
return result;
}
@@ -1730,7 +1730,7 @@
BOOL needsSpace;
length = [self length];
- ptr = NSZoneMalloc([self zone], length * sizeof(unichar));
+ ptr = NSZoneMalloc(NULL, length * sizeof(unichar));
void *originalPtr = ptr;
end = ptr + length;
[self getCharacters:ptr];
@@ -1757,7 +1757,7 @@
ptr++;
}
APPEND_PREVIOUS();
- NSZoneFree([self zone], originalPtr);
+ NSZoneFree(NULL, originalPtr);
return result;
}
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
