Author: stefanbidi
Date: Tue Jun 23 21:54:12 2015
New Revision: 38674
URL: http://svn.gna.org/viewcvs/gnustep?rev=38674&view=rev
Log:
* Source/CFBundle.m,
* Source/NSCFData.m,
* Source/NSCFError.m,
* Source/NSCFLocale.m,
* Source/NSCFString.m: Cast between NS and CF types to avoid compiler warnings.
Modified:
libs/corebase/trunk/ChangeLog
libs/corebase/trunk/Source/CFBundle.m
libs/corebase/trunk/Source/NSCFData.m
libs/corebase/trunk/Source/NSCFError.m
libs/corebase/trunk/Source/NSCFLocale.m
libs/corebase/trunk/Source/NSCFString.m
Modified: libs/corebase/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/ChangeLog?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/ChangeLog (original)
+++ libs/corebase/trunk/ChangeLog Tue Jun 23 21:54:12 2015
@@ -1,17 +1,25 @@
-2014-03-13 Stefan Bidigaray <[email protected]>
+2015-06-23 Stefan Bidigaray <[email protected]>
+ * Source/CFBundle.m,
+ * Source/NSCFData.m,
+ * Source/NSCFError.m,
+ * Source/NSCFLocale.m,
+ * Source/NSCFString.m: Cast between NS and CF types to avoid compiler
+ warnings.
+
+2015-03-13 Stefan Bidigaray <[email protected]>
* Headers/CoreFoundation/CFBase.h.in,
* Headers/CoreFoundation/CFError.h: Do not define CF types as Objective
C
objects.
-2014-02-20 Stefan Bidigaray <[email protected]>
+2015-02-20 Stefan Bidigaray <[email protected]>
* Source/CFRuntime.c: Do nothing if CFRetain/CFRelease are
called on small objects.
* Source/GSObjCRuntime.h: Cast to unsigned int to avoid warning.
-2014-02-19 Stefan Bidigaray <[email protected]>
+2015-02-19 Stefan Bidigaray <[email protected]>
* Source/GSObjCRuntime.h: Check for small objects.
-2014-02-19 Stefan Bidigaray <[email protected]>
+2015-02-19 Stefan Bidigaray <[email protected]>
* Headers/CoreFoundation/CFArray.h,
* Headers/CoreFoundation/CFBag.h,
* Headers/CoreFoundation/CFData.h,
@@ -26,23 +34,23 @@
* Source/NSCFData.m,
* Source/NSCFError.m: Explicitly cast NS to CF objects.
-2014-02-16 Stefan Bidigaray <[email protected]>
+2015-02-16 Stefan Bidigaray <[email protected]>
* Source/NSCFDictionary.m: Add category to match class definition.
* Source/NSCFType.m: Use correct number of classes to register.
-2014-02-14 Stefan Bidigaray <[email protected]>
+2015-02-14 Stefan Bidigaray <[email protected]>
* Headers/CoreFoundation/GSCharacter.h: Fix minor compare bug.
-2014-02-13 Stefan Bidigaray <[email protected]>
+2015-02-13 Stefan Bidigaray <[email protected]>
* Source/GSUnicode.c: Completed isnan/isinf functions for long double.
-2014-02-12 Stefan Bidigaray <[email protected]>
+2015-02-12 Stefan Bidigaray <[email protected]>
* Source/config.h.in,
* configure,
* configure.ac: Correctly handle existence of compatible GCD library.
* Source/GSUnicode.c: Temperarily disable 96-bit long double error.
-2014-01-30 Stefan Bidigaray <[email protected]>
+2015-01-30 Stefan Bidigaray <[email protected]>
* Source/config.h.in,
* configure,
* configure.ac: Disable check for GCD as it is broken.
Modified: libs/corebase/trunk/Source/CFBundle.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/CFBundle.m?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/Source/CFBundle.m (original)
+++ libs/corebase/trunk/Source/CFBundle.m Tue Jun 23 21:54:12 2015
@@ -83,7 +83,7 @@
{
#if !defined(_WIN32)
[(NSBundle*)bundle load];
- return dlsym(RTLD_DEFAULT, [functionName UTF8String]);
+ return dlsym(RTLD_DEFAULT, [(NSString *) functionName UTF8String]);
#else
return NULL;
#endif
@@ -94,7 +94,7 @@
{
#if !defined(_WIN32)
[(NSBundle*)bundle load];
- return dlsym(RTLD_DEFAULT, [functionName UTF8String]);
+ return dlsym(RTLD_DEFAULT, [(NSString *) functionName UTF8String]);
#else
return NULL;
#endif
Modified: libs/corebase/trunk/Source/NSCFData.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/NSCFData.m?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/Source/NSCFData.m (original)
+++ libs/corebase/trunk/Source/NSCFData.m Tue Jun 23 21:54:12 2015
@@ -54,55 +54,55 @@
- (const void *) bytes
{
- return CFDataGetBytePtr ((CFDataRef)self);
+ return CFDataGetBytePtr ((CFDataRef) self);
}
- (NSString *) description
{
- return AUTORELEASE(CFCopyDescription(self));
+ return AUTORELEASE((id) CFCopyDescription(self));
}
- (void) getBytes: (void *) buffer range: (NSRange) range
{
- CFDataGetBytes ((CFDataRef)self, CFRangeMake(range.location, range.length),
+ CFDataGetBytes ((CFDataRef) self, CFRangeMake(range.location, range.length),
buffer);
}
- (BOOL) isEqualToData: (NSData *) other
{
- return (BOOL)CFEqual ((CFDataRef)self, other);
+ return (BOOL)CFEqual ((CFDataRef) self, other);
}
- (NSUInteger) length
{
- return (NSUInteger)CFDataGetLength((CFMutableDataRef)self);
+ return (NSUInteger)CFDataGetLength((CFMutableDataRef) self);
}
- (void) increaseLengthBy: (NSUInteger) extraLength
{
- CFDataIncreaseLength ((CFMutableDataRef)self, (CFIndex)extraLength);
+ CFDataIncreaseLength ((CFMutableDataRef) self, (CFIndex)extraLength);
}
- (void) setLength: (NSUInteger) length
{
- CFDataSetLength ((CFMutableDataRef)self, (CFIndex)length);
+ CFDataSetLength ((CFMutableDataRef) self, (CFIndex)length);
}
- (void *) mutableBytes
{
- return CFDataGetMutableBytePtr ((CFMutableDataRef)self);
+ return CFDataGetMutableBytePtr ((CFMutableDataRef) self);
}
- (void) appendBytes: (const void *) buffer length: (NSUInteger) size
{
- CFDataAppendBytes ((CFMutableDataRef)self, buffer, size);
+ CFDataAppendBytes ((CFMutableDataRef) self, buffer, size);
}
- (void) replaceBytesInRange: (NSRange) range
withBytes: (const void *) bytes
length: (NSUInteger) length
{
- CFDataReplaceBytes ((CFMutableDataRef)self,
+ CFDataReplaceBytes ((CFMutableDataRef) self,
CFRangeMake(range.location, range.length), bytes,
(CFIndex)length);
}
Modified: libs/corebase/trunk/Source/NSCFError.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/NSCFError.m?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/Source/NSCFError.m (original)
+++ libs/corebase/trunk/Source/NSCFError.m Tue Jun 23 21:54:12 2015
@@ -62,12 +62,12 @@
- (NSString *) localizedDescription
{
- return AUTORELEASE(CFErrorCopyDescription (self));
+ return AUTORELEASE((id) CFErrorCopyDescription ((CFErrorRef) self));
}
- (NSString *) localizedFailureReason
{
- return AUTORELEASE(CFErrorCopyFailureReason (self));
+ return AUTORELEASE((id) CFErrorCopyFailureReason ((CFErrorRef) self));
}
- (NSArray *) localizedRecoveryOptions
@@ -77,7 +77,7 @@
- (NSString *) localizedRecoverySuggestion
{
- return AUTORELEASE(CFErrorCopyRecoverySuggestion (self));
+ return AUTORELEASE((id) CFErrorCopyRecoverySuggestion ((CFErrorRef) self));
}
- (id) recoveryAttempter
@@ -87,17 +87,17 @@
- (NSInteger) code
{
- return (NSInteger)CFErrorGetCode (self);
+ return (NSInteger)CFErrorGetCode ((CFErrorRef) self);
}
- (NSString*) domain
{
- return CFErrorGetDomain (self);
+ return (NSString *) CFErrorGetDomain ((CFErrorRef) self);
}
- (NSDictionary*) userInfo
{
- return (NSDictionary*)CFErrorCopyUserInfo ((CFErrorRef)self);
+ return (NSDictionary*)CFErrorCopyUserInfo ((CFErrorRef) self);
}
@end
Modified: libs/corebase/trunk/Source/NSCFLocale.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/NSCFLocale.m?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/Source/NSCFLocale.m (original)
+++ libs/corebase/trunk/Source/NSCFLocale.m Tue Jun 23 21:54:12 2015
@@ -101,8 +101,9 @@
- (NSString*) displayNameForKey:(id)key value:(id)value
{
CFStringRef cfKey = NSLocaleKeyToCFLocaleKey(key);
- return (NSString*) CFLocaleCopyDisplayNameForPropertyValue(
- (CFLocaleRef) self, cfKey, value);
+ return (NSString*)
+ CFLocaleCopyDisplayNameForPropertyValue((CFLocaleRef) self, cfKey,
+ (CFStringRef) value);
}
@end
Modified: libs/corebase/trunk/Source/NSCFString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/NSCFString.m?rev=38674&r1=38673&r2=38674&view=diff
==============================================================================
--- libs/corebase/trunk/Source/NSCFString.m (original)
+++ libs/corebase/trunk/Source/NSCFString.m Tue Jun 23 21:54:12 2015
@@ -126,8 +126,8 @@
RELEASE(self);
- self = (NSCFString*)CFStringCreateWithSubstring (alloc, string,
- CFRangeMake(0, CFStringGetLength(string)));
+ self = (NSCFString*)CFStringCreateWithSubstring (alloc, (CFStringRef) string,
+ CFRangeMake(0, CFStringGetLength((CFStringRef) string)));
return self;
}
@@ -192,26 +192,27 @@
- (NSUInteger) length
{
- return (NSUInteger)CFStringGetLength (self);
+ return (NSUInteger)CFStringGetLength ((CFStringRef) self);
}
- (unichar) characterAtIndex: (NSUInteger) index
{
- return (unichar)CFStringGetCharacterAtIndex (self, index);
+ return (unichar)CFStringGetCharacterAtIndex ((CFStringRef) self, index);
}
- (void) getCharacters: (unichar*) buffer
range: (NSRange) aRange
{
CFRange cfRange = CFRangeMake (aRange.location, aRange.length);
- CFStringGetCharacters (self, cfRange, buffer);
+ CFStringGetCharacters ((CFStringRef) self, cfRange, buffer);
}
- (NSArray*) componentsSeparatedByString: (NSString*) separator
{
return (NSArray*)
CFStringCreateArrayBySeparatingStrings (CFAllocatorGetDefault(),
- self, separator);
+ (CFStringRef) self,
+ (CFStringRef) separator);
}
- (NSRange) rangeOfCharacterFromSet: (NSCharacterSet*) aSet
@@ -221,9 +222,9 @@
CFRange cfRange = CFRangeMake (aRange.location, aRange.length);
CFRange ret;
- if (!CFStringFindCharacterFromSet (self,
- (CFCharacterSetRef)aSet, cfRange, (CFStringCompareFlags)mask,
- &ret))
+ if (!CFStringFindCharacterFromSet ((CFStringRef) self,
+ (CFCharacterSetRef)aSet, cfRange,
+ (CFStringCompareFlags) mask, &ret))
ret = CFRangeMake (kCFNotFound, 0);
return NSMakeRange (ret.location, ret.length);
@@ -237,9 +238,10 @@
CFRange cfRange = CFRangeMake (searchRange.location, searchRange.length);
CFRange ret;
- if (!CFStringFindWithOptionsAndLocale (self,
- aString, cfRange, (CFStringCompareFlags)mask,
- (CFLocaleRef)locale, &ret))
+ if (!CFStringFindWithOptionsAndLocale ((CFStringRef) self,
+ (CFStringRef) aString, cfRange,
+ (CFStringCompareFlags) mask,
+ (CFLocaleRef) locale, &ret))
ret = CFRangeMake (kCFNotFound, 0);
return NSMakeRange (ret.location, ret.length);
@@ -274,43 +276,45 @@
{
locale = [NSLocale currentLocale];
}
- return (NSComparisonResult)CFStringCompareWithOptionsAndLocale (self,
- string, cfRange, (CFStringCompareFlags)mask,
- (CFLocaleRef)locale);
+ return (NSComparisonResult)
+ CFStringCompareWithOptionsAndLocale ((CFStringRef) self,
+ (CFStringRef) string, cfRange,
+ (CFStringCompareFlags)mask,
+ (CFLocaleRef) locale);
}
- (BOOL) hasPrefix: (NSString*) aString
{
- return CFStringHasPrefix (self, aString);
+ return CFStringHasPrefix ((CFStringRef) self, (CFStringRef) aString);
}
- (BOOL) hasSuffix: (NSString*) aString
{
- return CFStringHasSuffix (self, aString);
+ return CFStringHasSuffix ((CFStringRef) self, (CFStringRef) aString);
}
- (NSString*) capitalizedString
{
CFMutableStringRef copy;
- copy = CFStringCreateMutableCopy (NULL, 0, self);
+ copy = CFStringCreateMutableCopy (NULL, 0, (CFStringRef) self);
CFStringCapitalize (copy, NULL);
- return (NSString*) AUTORELEASE(copy);
+ return (NSString*) AUTORELEASE((NSString *) copy);
}
- (NSString*) lowercaseString
{
CFMutableStringRef copy;
- copy = CFStringCreateMutableCopy (NULL, 0, self);
+ copy = CFStringCreateMutableCopy (NULL, 0, (CFStringRef) self);
CFStringLowercase (copy, NULL);
- return (NSString*)AUTORELEASE(copy);
+ return (NSString*)AUTORELEASE((NSString *) copy);
}
- (NSString*) uppercaseString
{
CFMutableStringRef copy;
- copy = CFStringCreateMutableCopy (NULL, 0, self);
+ copy = CFStringCreateMutableCopy (NULL, 0, (CFStringRef) self);
CFStringUppercase (copy, NULL);
- return (NSString*)AUTORELEASE(copy);
+ return (NSString*)AUTORELEASE((NSString *) copy);
}
- (BOOL) getCString: (char*) buffer
@@ -318,7 +322,7 @@
encoding: (NSStringEncoding) encoding
{
CFStringEncoding enc = CFStringConvertEncodingToNSStringEncoding (encoding);
- return (BOOL)CFStringGetCString (self, buffer, maxLength, enc);
+ return (BOOL)CFStringGetCString ((CFStringRef) self, buffer, maxLength, enc);
}
- (NSUInteger) lengthOfBytesUsingEncoding: (NSStringEncoding) encoding
@@ -338,32 +342,35 @@
{
CFStringEncoding enc = CFStringConvertEncodingToNSStringEncoding (encoding);
return (NSData*)CFStringCreateExternalRepresentation (NULL,
- self, enc, flag ? '?' : 0);
+ (CFStringRef) self,
+ enc, flag ? '?' : 0);
}
- (NSStringEncoding) fastestEncoding
{
- CFStringEncoding enc = CFStringGetFastestEncoding (self);
+ CFStringEncoding enc = CFStringGetFastestEncoding ((CFStringRef) self);
return CFStringConvertEncodingToNSStringEncoding (enc);
}
- (NSStringEncoding) smallestEncoding
{
- CFStringEncoding enc = CFStringGetSmallestEncoding (self);
+ CFStringEncoding enc = CFStringGetSmallestEncoding ((CFStringRef) self);
return CFStringConvertEncodingToNSStringEncoding (enc);
}
- (BOOL) getFileSystemRepresentation: (char*) buffer
maxLength: (NSUInteger) size
{
- return (BOOL)CFStringGetFileSystemRepresentation (self, buffer, size);
+ return (BOOL)
+ CFStringGetFileSystemRepresentation ((CFStringRef) self, buffer, size);
}
- (NSString*) substringWithRange: (NSRange) aRange
{
CFRange cfRange = CFRangeMake (aRange.location, aRange.length);
- return (NSString*)CFStringCreateWithSubstring (NULL, self, cfRange);
+ return (NSString*)
+ CFStringCreateWithSubstring (NULL, (CFStringRef) self, cfRange);
}
+ (NSStringEncoding*) availableStringEncodings
@@ -400,8 +407,8 @@
forRange: (NSRange) aRange
{
CFRange cfRange = CFRangeMake (aRange.location, aRange.length);
- CFStringGetLineBounds (self, cfRange, (CFIndex*)startIndex,
- (CFIndex*)lineEndIndex, (CFIndex*)contentsEndIndex);
+ CFStringGetLineBounds ((CFStringRef) self, cfRange, (CFIndex*)startIndex,
+ (CFIndex*)lineEndIndex, (CFIndex*)contentsEndIndex);
}
- (NSString*) stringByPaddingToLength: (NSUInteger)newLength
@@ -409,9 +416,9 @@
startingAtIndex: (NSUInteger)padIndex
{
CFMutableStringRef copy;
- copy = CFStringCreateMutableCopy(NULL, 0, self);
- CFStringPad(copy, padString, newLength, padIndex);
- return copy;
+ copy = CFStringCreateMutableCopy(NULL, 0, (CFStringRef) self);
+ CFStringPad(copy, (CFStringRef) padString, newLength, padIndex);
+ return (NSString *) copy;
}
@@ -421,8 +428,8 @@
forRange: (NSRange)range
{
CFRange cfRange = CFRangeMake (range.location, range.length);
- CFStringGetParagraphBounds (self, cfRange, (CFIndex*)startPtr,
- (CFIndex*)parEndPtr, (CFIndex*)contentsEndPtr);
+ CFStringGetParagraphBounds ((CFStringRef) self, cfRange, (CFIndex*)startPtr,
+ (CFIndex*)parEndPtr, (CFIndex*)contentsEndPtr);
}
- (NSRange) rangeOfComposedCharacterSequencesForRange: (NSRange)range
@@ -453,32 +460,32 @@
[NSException raise: NSInvalidArgumentException format: @"format is nil."];
va_start(args, format);
- CFStringAppendFormatAndArguments (self, NULL,
- format, args);
+ CFStringAppendFormatAndArguments ((CFMutableStringRef) self, NULL,
+ (CFStringRef) format, args);
va_end (args);
}
- (void) appendString: (NSString*) aString
{
- CFStringAppend (self, aString);
+ CFStringAppend ((CFMutableStringRef) self, (CFStringRef) aString);
}
- (void) deleteCharactersInRange: (NSRange) range
{
CFRange cfRange = CFRangeMake (range.location, range.length);
- CFStringDelete (self, cfRange);
+ CFStringDelete ((CFMutableStringRef) self, cfRange);
}
- (void) insertString: (NSString*) aString atIndex: (NSUInteger) loc
{
- CFStringInsert (self, loc, aString);
+ CFStringInsert ((CFMutableStringRef) self, loc, (CFStringRef) aString);
}
- (void) replaceCharactersInRange: (NSRange) range
withString: (NSString*) aString
{
CFRange cfRange = CFRangeMake (range.location, range.length);
- CFStringReplace (self, cfRange, NULL);
+ CFStringReplace ((CFMutableStringRef) self, cfRange, (CFStringRef) aString);
}
- (NSUInteger) replaceOccurrencesOfString: (NSString*) replace
@@ -495,13 +502,14 @@
format: @"Replacement is nil."];
/* FIXME: raise exception for out of range */
- return CFStringFindAndReplace (self, replace,
- by, cfRange, (CFOptionFlags)opts);
+ return CFStringFindAndReplace ((CFMutableStringRef) self,
+ (CFStringRef) replace, (CFStringRef) by,
+ cfRange, (CFOptionFlags)opts);
}
- (void) setString: (NSString*) aString
{
- CFStringReplaceAll (self, aString);
+ CFStringReplaceAll ((CFMutableStringRef) self, (CFStringRef) aString);
}
@end
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
