gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #131 from triplef/fix-nslocale-instancetype

Browse source 
NSLocale improvements
This commit is contained in:
Fred Kiefer 2020-05-07 22:23:23 +02:00 committed by GitHub
commit 2a31a0d551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,4 +1,11 @@
2020-04-07 Frederik Seiffert <frederik@algoriddim.com>
2020-05-07 Frederik Seiffert <frederik@algoriddim.com>
* Headers/Foundation/NSLocale.h:
* Source/NSLocale.m:
Use "instancetype" for instance-returning methods. Fix method
signature of -displayNameForKey:value:.
2020-05-05 Frederik Seiffert <frederik@algoriddim.com>
* Headers/Foundation/NSXMLParser.h:
* Headers/GNUstepBase/GSXML.h:

10
Headers/Foundation/NSLocale.h
View file

@ -156,7 +156,7 @@ GS_EXPORT NSString * const NSISO8601Calendar;
/** Returns the current locale information.
*/
+ (id) currentLocale;
+ (instancetype) currentLocale;
/** Returns an array of NSString representing all known country codes.
*/
@ -190,7 +190,7 @@ GS_EXPORT NSString * const NSISO8601Calendar;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
/** Returns a locale initialised with the given locale identifier.
*/
+ (id) localeWithLocaleIdentifier:(NSString *)string;
+ (instancetype) localeWithLocaleIdentifier:(NSString *)string;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
@ -202,7 +202,7 @@ GS_EXPORT NSString * const NSISO8601Calendar;
/** Returns the the system locale.
*/
+ (id) systemLocale;
+ (instancetype) systemLocale;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
/** Returns the windows locale code corresponding to the staqndard locale
@ -216,12 +216,12 @@ GS_EXPORT NSString * const NSISO8601Calendar;
* on the basis that it represents information whose type is specified by
* the key.
*/
- (NSString *) displayNameForKey: (id)key value: (id)value;
- (NSString *) displayNameForKey: (NSString *)key value: (id)value;
/** Initialises the receiver to be the locale specified by the identifier.
* This may result in replacement of the receiver by an existing locale.
*/
- (id) initWithLocaleIdentifier: (NSString *)string;
- (instancetype) initWithLocaleIdentifier: (NSString *)string;
/** Returns the canonical identifier for the receiver (which
* may differ from the identifgier used to create the receiver

2
Source/NSLocale.m
View file

@ -691,7 +691,7 @@ static NSRecursiveLock *classLock = nil;
#endif
}
- (NSString *) displayNameForKey: (id) key value: (id) value
- (NSString *) displayNameForKey: (NSString *) key value: (id) value
{
#if GS_USE_ICU == 1
int32_t length = 0;