Revision: 28512
http://sourceforge.net/p/bibdesk/svn/28512
Author: hofman
Date: 2024-01-02 16:57:48 +0000 (Tue, 02 Jan 2024)
Log Message:
-----------
add more simple __bridge
Modified Paths:
--------------
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-02 16:03:03 UTC (rev
28511)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-02 16:57:48 UTC (rev
28512)
@@ -216,7 +216,7 @@
CFStringEncoding cfEnc = CFStringConvertNSStringEncodingToEncoding(enc);
NSString *encName = nil;
if (kCFStringEncodingInvalidId != cfEnc)
- encName = (NSString *)CFStringConvertEncodingToIANACharSetName(cfEnc);
+ encName = (__bridge NSString
*)CFStringConvertEncodingToIANACharSetName(cfEnc);
return encName;
}
@@ -226,7 +226,7 @@
CFStringEncoding cfEnc = kCFStringEncodingInvalidId;
if (name)
- cfEnc = CFStringConvertIANACharSetNameToEncoding((CFStringRef)name);
+ cfEnc = CFStringConvertIANACharSetNameToEncoding((__bridge
CFStringRef)name);
if (kCFStringEncodingInvalidId != cfEnc)
nsEnc = CFStringConvertEncodingToNSStringEncoding(cfEnc);
@@ -408,13 +408,13 @@
{
CFStringInlineBuffer inlineBuffer;
- CFIndex length = CFStringGetLength((CFStringRef)self);
+ CFIndex length = CFStringGetLength((__bridge CFStringRef)self);
CFIndex startLoc = range.location;
CFIndex endLoc = NSMaxRange(range);
CFIndex cnt;
BOOL matchFound = NO;
- CFStringInitInlineBuffer((CFStringRef)self, &inlineBuffer, CFRangeMake(0,
length));
+ CFStringInitInlineBuffer((__bridge CFStringRef)self, &inlineBuffer,
CFRangeMake(0, length));
UniChar ch;
NSInteger nesting = 0;
UniChar leftBracket = CFStringGetCharacterFromInlineBuffer(&inlineBuffer,
startLoc);
@@ -542,7 +542,7 @@
- (NSRange)rangeOfTeXCommandInRange:(NSRange)searchRange;
{
CFRange cfSearchRange = CFRangeMake(searchRange.location == NSNotFound ?
kCFNotFound : searchRange.location, searchRange.length);
- CFRange range = BDRangeOfTeXCommand((CFStringRef)self, cfSearchRange);
+ CFRange range = BDRangeOfTeXCommand((__bridge CFStringRef)self,
cfSearchRange);
return NSMakeRange(range.location == kCFNotFound ? NSNotFound :
range.location, range.length);
}
@@ -894,8 +894,8 @@
if (asciiData == nil) {
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);
+ CFStringTransform((__bridge CFMutableStringRef)ms, NULL,
kCFStringTransformToLatin, FALSE);
+ CFStringTransform((__bridge CFMutableStringRef)ms, NULL,
kCFStringTransformStripCombiningMarks, FALSE);
// final step to guarantee ASCII
asciiData = [ms dataUsingEncoding:NSASCIIStringEncoding
allowLossyConversion:YES];
[ms release];
@@ -930,7 +930,7 @@
- (NSString *)stringByRemovingTeXAndStopWords;
{
- CFMutableStringRef modifiedSelf =
CFStringCreateMutableCopy(CFAllocatorGetDefault(),
CFStringGetLength((CFStringRef)self), (CFStringRef)self);
+ CFMutableStringRef modifiedSelf =
CFStringCreateMutableCopy(CFAllocatorGetDefault(), CFStringGetLength((__bridge
CFStringRef)self), (__bridge CFStringRef)self);
BDDeleteArticlesForSorting(modifiedSelf);
BDDeleteTeXForSorting(modifiedSelf);
return [(id)modifiedSelf autorelease];
@@ -943,8 +943,8 @@
NSParameterAssert(otherString != nil);
CFAllocatorRef allocator = CFAllocatorGetDefault();
- CFMutableStringRef modifiedSelf = CFStringCreateMutableCopy(allocator,
CFStringGetLength((CFStringRef)self), (CFStringRef)self);
- CFMutableStringRef modifiedOther = CFStringCreateMutableCopy(allocator,
CFStringGetLength((CFStringRef)otherString), (CFStringRef)otherString);
+ CFMutableStringRef modifiedSelf = CFStringCreateMutableCopy(allocator,
CFStringGetLength((__bridge CFStringRef)self), (__bridge CFStringRef)self);
+ CFMutableStringRef modifiedOther = CFStringCreateMutableCopy(allocator,
CFStringGetLength((__bridge CFStringRef)otherString), (__bridge
CFStringRef)otherString);
BDDeleteArticlesForSorting(modifiedSelf);
BDDeleteArticlesForSorting(modifiedOther);
@@ -1044,14 +1044,14 @@
if(subRange.location == NSNotFound)
return NO;
- CFIndex wordLength = [aWord length];
- CFIndex myLength = [self length];
+ NSInteger wordLength = [aWord length];
+ NSInteger myLength = [self length];
// trivial case; we contain the word, and have the same length
if(myLength == wordLength)
return YES;
- CFIndex beforeIndex, afterIndex;
+ NSInteger beforeIndex, afterIndex;
beforeIndex = subRange.location - 1;
afterIndex = NSMaxRange(subRange);
@@ -1089,7 +1089,7 @@
if(prefix == nil || length > [self length])
return NO;
- return (CFStringCompareWithOptions((CFStringRef)self,(CFStringRef)prefix,
CFRangeMake(0, length), kCFCompareCaseInsensitive) == kCFCompareEqualTo ? YES :
NO);
+ return (CFStringCompareWithOptions((__bridge CFStringRef)self,(__bridge
CFStringRef)prefix, CFRangeMake(0, length), kCFCompareCaseInsensitive) ==
kCFCompareEqualTo ? YES : NO);
}
#pragma mark -
@@ -1096,7 +1096,7 @@
- (NSArray *)componentsSeparatedByCharactersInSet:(NSCharacterSet *)charSet
trimWhitespace:(BOOL)trim;
{
- return
[(id)BDStringCreateComponentsSeparatedByCharacterSetTrimWhitespace(CFAllocatorGetDefault(),
(CFStringRef)self, (CFCharacterSetRef)charSet, trim) autorelease];
+ return
[(id)BDStringCreateComponentsSeparatedByCharacterSetTrimWhitespace(CFAllocatorGetDefault(),
(__bridge CFStringRef)self, (__bridge CFCharacterSetRef)charSet, trim)
autorelease];
}
- (NSArray *)componentsSeparatedByFieldSeparators;
@@ -1110,7 +1110,7 @@
- (NSArray *)componentsSeparatedByAnd;
{
- return
[(id)BDStringCreateComponentsBySeparatingByAnd(CFAllocatorGetDefault(),
(CFStringRef)self) autorelease];
+ return
[(id)BDStringCreateComponentsBySeparatingByAnd(CFAllocatorGetDefault(),
(__bridge CFStringRef)self) autorelease];
}
- (NSArray *)componentsSeparatedByComma;
@@ -1120,17 +1120,17 @@
- (NSString *)stringByCollapsingCharactersInSet:(NSCharacterSet *)charSet;
{
- return
[(id)BDStringCreateByCollapsingCharactersInSet(CFAllocatorGetDefault(),
(CFStringRef)self, (CFCharacterSetRef)charSet) autorelease];
+ return
[(id)BDStringCreateByCollapsingCharactersInSet(CFAllocatorGetDefault(),
(__bridge CFStringRef)self, (CFCharacterSetRef)charSet) autorelease];
}
- (NSString *)stringByCollapsingAndTrimmingCharactersInSet:(NSCharacterSet
*)charSet;
{
- return
[(id)BDStringCreateByCollapsingAndTrimmingCharactersInSet(CFAllocatorGetDefault(),
(CFStringRef)self, (CFCharacterSetRef)charSet) autorelease];
+ return
[(id)BDStringCreateByCollapsingAndTrimmingCharactersInSet(CFAllocatorGetDefault(),
(__bridge CFStringRef)self, (__bridge CFCharacterSetRef)charSet) autorelease];
}
- (NSString *)stringByNormalizingSpacesAndLineBreaks;
{
- return
[(id)BDStringCreateByNormalizingWhitespaceAndNewlines(CFAllocatorGetDefault(),
(CFStringRef)self) autorelease];
+ return
[(id)BDStringCreateByNormalizingWhitespaceAndNewlines(CFAllocatorGetDefault(),
(__bridge CFStringRef)self) autorelease];
}
- (NSString *)stringByAppendingEllipsis{
@@ -1200,7 +1200,7 @@
- (NSString *)titlecaseString;
{
CFAllocatorRef alloc = CFGetAllocator((CFStringRef)self);
- CFMutableStringRef mutableString = CFStringCreateMutableCopy(alloc, 0,
(CFStringRef)self);
+ CFMutableStringRef mutableString = CFStringCreateMutableCopy(alloc, 0,
(__bridge CFStringRef)self);
CFLocaleRef locale = CFLocaleCopyCurrent();
CFStringCapitalize(mutableString, locale);
CFRelease(locale);
@@ -1244,7 +1244,7 @@
NSString *toReturn = nil;
if (words) {
- toReturn = (NSString *)CFStringCreateByCombiningStrings(alloc,
(CFArrayRef)words, CFSTR(" "));
+ toReturn = (NSString *)CFStringCreateByCombiningStrings(alloc,
(__bridge CFArrayRef)words, CFSTR(" "));
[words release];
}
return [toReturn autorelease];
@@ -1442,16 +1442,16 @@
- (NSString *)stringByRemovingAliens {
// make a mutable copy only if needed
- CFMutableStringRef theString = (void *)self;
+ CFMutableStringRef theString = NULL;
CFStringInlineBuffer inlineBuffer;
CFIndex length = CFStringGetLength(theString);
// use the current mutable string with the inline buffer, but make a new
mutable copy if needed
- CFStringInitInlineBuffer(theString, &inlineBuffer, CFRangeMake(0, length));
+ CFStringInitInlineBuffer((__bridge CFStringRef)self, &inlineBuffer,
CFRangeMake(0, length));
UniChar ch;
-#define DELETE_CHARACTERS(n)
do{if((void*)self==theString){theString=(void*)[[self mutableCopy]
autorelease];};CFStringDelete(theString, CFRangeMake(delIdx, n));} while(0)
+#define DELETE_CHARACTERS(n)
do{if(NULL==theString){theString=CFStringCreateMutable(NULL, (__bridge
CFStringRef)self);};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;
@@ -1492,7 +1492,7 @@
idx++;
}
- return (id)theString;
+ return [(id)theString autorelease] ?: self;
}
#pragma mark Paths
@@ -1597,7 +1597,7 @@
- (NSString *)stringByEscapingBasicXMLEntitiesUsingUTF8;
{
- return [(NSString
*)BDXMLCreateStringWithEntityReferencesInCFEncoding((CFStringRef)self,
kCFStringEncodingUTF8) autorelease];
+ return [(NSString
*)BDXMLCreateStringWithEntityReferencesInCFEncoding((__bridge CFStringRef)self,
kCFStringEncodingUTF8) autorelease];
}
#define APPEND_PREVIOUS() \
@@ -1998,7 +1998,7 @@
BOOL isMutable = YES;
@try{
unichar ch = 'X';
- CFStringAppendCharacters((CFMutableStringRef)self, &ch, 1);
+ CFStringAppendCharacters((__bridge CFMutableStringRef)self, &ch, 1);
}
@catch(NSException *localException){
if([[localException name] isEqual:NSInvalidArgumentException])
@@ -2015,19 +2015,19 @@
}
- (void)deleteCharactersInCharacterSet:(NSCharacterSet *)characterSet {
- BDDeleteCharactersInCharacterSet((CFMutableStringRef)self,
(CFCharacterSetRef)characterSet);
+ BDDeleteCharactersInCharacterSet((__bridge CFMutableStringRef)self,
(CFCharacterSetRef)characterSet);
}
- (void)deleteUnescapedCharactersInCharacterSet:(NSCharacterSet *)characterSet
{
- BDDeleteUnescapedCharactersInCharacterSet((CFMutableStringRef)self,
(CFCharacterSetRef)characterSet);
+ BDDeleteUnescapedCharactersInCharacterSet((__bridge
CFMutableStringRef)self, (CFCharacterSetRef)characterSet);
}
- (void)replaceOccurrencesOfCharactersInSet:(NSCharacterSet *)set
withString:(NSString *)replaceString {
- BDReplaceCharactersInCharacterSet((CFMutableStringRef)self,
(CFCharacterSetRef)set, (CFStringRef)replaceString);
+ BDReplaceCharactersInCharacterSet((__bridge CFMutableStringRef)self,
(CFCharacterSetRef)set, (CFStringRef)replaceString);
}
- (void)replaceComposedCharacters {
- BDReplaceComposedCharacters((CFMutableStringRef)self);
+ BDReplaceComposedCharacters((__bridge CFMutableStringRef)self);
}
// This method is copied from NSMutableString-OFStringExtensions.m
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
