gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop using OS_API_VERSION() in .m files.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31934 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Stefan Bidigaray 2011-01-23 18:03:09 +00:00
parent 93bdb7cca2
commit ffa1863308
4 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,14 +1,20 @@
2011-01-23 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSDateFormatter.m:
* Source/NSNumberFormatter.m:
* Source/NSCalendar.m: Remove use of OS_API_VERSION() in .m files.
2011-01-23 15:42 David Chisnall <theraven@gna.org> 2011-01-23 15:42 David Chisnall <theraven@gna.org>
* libs/base/trunk/Source/NSNumberFormatter.m: Some small fixes in * libs/base/trunk/Source/NSNumberFormatter.m: Some small fixes in
NSNumberFormatter. Mostly stop using == to compare C strings. NSNumberFormatter. Mostly stop using == to compare C strings.
2011-01-22 Stefan Bidigaray <stefanbidi@gmail.com> 2011-01-23 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSDateFormatter.m: Initialize UDateFormat before using it. * Source/NSDateFormatter.m: Initialize UDateFormat before using it.
* Source/NSCalendar.m: Implement -components:fromDate:. * Source/NSCalendar.m: Implement -components:fromDate:.
2011-01-22 Stefan Bidigaray <stefanbidi@gmail.com> 2011-01-23 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSDateFormatter.m: Implemented a few more methods. * Source/NSDateFormatter.m: Implemented a few more methods.

4
Source/NSCalendar.m
View file

@ -182,7 +182,6 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
_identifier = NSIslamicCivilCalendar; _identifier = NSIslamicCivilCalendar;
else if ([string isEqualToString: NSJapaneseCalendar]) else if ([string isEqualToString: NSJapaneseCalendar])
_identifier = NSJapaneseCalendar; _identifier = NSJapaneseCalendar;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
else if ([string isEqualToString: NSRepublicOfChinaCalendar]) else if ([string isEqualToString: NSRepublicOfChinaCalendar])
_identifier = NSRepublicOfChinaCalendar; _identifier = NSRepublicOfChinaCalendar;
else if ([string isEqualToString: NSPersianCalendar]) else if ([string isEqualToString: NSPersianCalendar])
@ -191,7 +190,6 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
_identifier = NSIndianCalendar; _identifier = NSIndianCalendar;
else if ([string isEqualToString: NSISO8601Calendar]) else if ([string isEqualToString: NSISO8601Calendar])
_identifier = NSISO8601Calendar; _identifier = NSISO8601Calendar;
#endif
else else
{ {
RELEASE(self); RELEASE(self);
@ -600,9 +598,7 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
_week = NSUndefinedDateComponent; _week = NSUndefinedDateComponent;
_weekday = NSUndefinedDateComponent; _weekday = NSUndefinedDateComponent;
_weekdayOrdinal = NSUndefinedDateComponent; _weekdayOrdinal = NSUndefinedDateComponent;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
_quarter = NSUndefinedDateComponent; _quarter = NSUndefinedDateComponent;
#endif
return self; return self;
} }

2
Source/NSDateFormatter.m
View file

@ -92,7 +92,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
/* According to Apple docs, default behavior is NSDateFormatterBehavior10_4 on /* According to Apple docs, default behavior is NSDateFormatterBehavior10_4 on
10.5 and later. Yeah, go figure. */ 10.5 and later. Yeah, go figure. */
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST) && GS_USE_ICU == 1 #if GS_USE_ICU == 1
err = U_ZERO_ERROR; err = U_ZERO_ERROR;
length = length =

20
Source/NSNumberFormatter.m
View file

@ -309,18 +309,13 @@ static NSUInteger _defaultBehavior = 0;
- (NSString*) decimalSeparator - (NSString*) decimalSeparator
{ {
if (_behavior == NSNumberFormatterBehavior10_4 if (_behavior == NSNumberFormatterBehavior10_4
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
|| _behavior == NSNumberFormatterBehaviorDefault) || _behavior == NSNumberFormatterBehaviorDefault)
#endif
{ {
#if GS_USE_ICU == 1 #if GS_USE_ICU == 1
return [self _getSymbol: UNUM_DECIMAL_SEPARATOR_SYMBOL]; return [self _getSymbol: UNUM_DECIMAL_SEPARATOR_SYMBOL];
#endif #endif
} }
else if (_behavior == NSNumberFormatterBehavior10_0 else if (_behavior == NSNumberFormatterBehavior10_0)
#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
|| _behavior == NSNumberFormatterBehaviorDefault)
#endif
{ {
if (_decimalSeparator == 0) if (_decimalSeparator == 0)
return @""; return @"";
@ -613,18 +608,13 @@ static NSUInteger _defaultBehavior = 0;
- (void) setDecimalSeparator: (NSString*)newSeparator - (void) setDecimalSeparator: (NSString*)newSeparator
{ {
if (_behavior == NSNumberFormatterBehavior10_4 if (_behavior == NSNumberFormatterBehavior10_4
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
|| _behavior == NSNumberFormatterBehaviorDefault) || _behavior == NSNumberFormatterBehaviorDefault)
#endif
{ {
#if GS_USE_ICU == 1 #if GS_USE_ICU == 1
[self _setSymbol: newSeparator : UNUM_DECIMAL_SEPARATOR_SYMBOL]; [self _setSymbol: newSeparator : UNUM_DECIMAL_SEPARATOR_SYMBOL];
#endif #endif
} }
else if (_behavior == NSNumberFormatterBehavior10_0 else if (_behavior == NSNumberFormatterBehavior10_0)
#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
|| _behavior == NSNumberFormatterBehaviorDefault)
#endif
{ {
if ([newSeparator length] > 0) if ([newSeparator length] > 0)
_decimalSeparator = [newSeparator characterAtIndex: 0]; _decimalSeparator = [newSeparator characterAtIndex: 0];
@ -722,9 +712,7 @@ static NSUInteger _defaultBehavior = 0;
- (NSString*) stringForObjectValue: (id)anObject - (NSString*) stringForObjectValue: (id)anObject
{ {
if (_behavior == NSNumberFormatterBehavior10_4 if (_behavior == NSNumberFormatterBehavior10_4
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
|| _behavior == NSNumberFormatterBehaviorDefault) || _behavior == NSNumberFormatterBehaviorDefault)
#endif
{ {
#if GS_USE_ICU == 1 #if GS_USE_ICU == 1
@ -795,10 +783,6 @@ static NSUInteger _defaultBehavior = 0;
#endif #endif
} }
else if (_behavior == NSNumberFormatterBehavior10_0 else if (_behavior == NSNumberFormatterBehavior10_0
#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
|| _behavior == NSNumberFormatterBehaviorDefault)
#endif
// FIXME: Should this method even work for OS X < 10.4?
{ {
NSMutableDictionary *locale; NSMutableDictionary *locale;
NSCharacterSet *formattingCharacters; NSCharacterSet *formattingCharacters;