mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Update NSString header to use "instancetype".
This commit is contained in:
parent
3bc05ad580
commit
20152fc291
1 changed files with 81 additions and 81 deletions
|
@ -474,55 +474,55 @@ typedef NSUInteger NSStringEncodingConversionOptions;
|
|||
GS_EXPORT_CLASS
|
||||
@interface NSString :NSObject <NSCoding, NSCopying, NSMutableCopying>
|
||||
|
||||
+ (id) string;
|
||||
+ (id) stringWithCharacters: (const unichar*)chars
|
||||
length: (NSUInteger)length;
|
||||
+ (instancetype) string;
|
||||
+ (instancetype) stringWithCharacters: (const unichar*)chars
|
||||
length: (NSUInteger)length;
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4,GS_API_LATEST) && GS_API_VERSION( 10200,GS_API_LATEST)
|
||||
+ (id) stringWithCString: (const char*)byteString
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
+ (instancetype) stringWithCString: (const char*)byteString
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
#endif
|
||||
+ (id) stringWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
+ (id) stringWithCString: (const char*)byteString;
|
||||
+ (id) stringWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
+ (id) stringWithContentsOfFile:(NSString *)path;
|
||||
+ (instancetype) stringWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
+ (instancetype) stringWithCString: (const char*)byteString;
|
||||
+ (instancetype) stringWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
+ (instancetype) stringWithContentsOfFile:(NSString *)path;
|
||||
|
||||
// Initializing Newly Allocated Strings
|
||||
- (id) init;
|
||||
- (instancetype) init;
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4,GS_API_LATEST) && GS_API_VERSION( 10200,GS_API_LATEST)
|
||||
- (id) initWithBytes: (const void*)bytes
|
||||
length: (NSUInteger)length
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (id) initWithBytesNoCopy: (void*)bytes
|
||||
length: (NSUInteger)length
|
||||
encoding: (NSStringEncoding)encoding
|
||||
freeWhenDone: (BOOL)flag;
|
||||
- (instancetype) initWithBytes: (const void*)bytes
|
||||
length: (NSUInteger)length
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (instancetype) initWithBytesNoCopy: (void*)bytes
|
||||
length: (NSUInteger)length
|
||||
encoding: (NSStringEncoding)encoding
|
||||
freeWhenDone: (BOOL)flag;
|
||||
#endif
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4,GS_API_LATEST)
|
||||
+ (id) stringWithContentsOfFile: (NSString*)path
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
- (id) initWithContentsOfFile: (NSString*)path
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
+ (id) stringWithContentsOfFile: (NSString*)path
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
- (id) initWithContentsOfFile: (NSString*)path
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
+ (id) stringWithContentsOfURL: (NSURL*)url
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
- (id) initWithContentsOfURL: (NSURL*)url
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
+ (id) stringWithContentsOfURL: (NSURL*)url
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
- (id) initWithContentsOfURL: (NSURL*)url
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
+ (instancetype) stringWithContentsOfFile: (NSString*)path
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
- (instancetype) initWithContentsOfFile: (NSString*)path
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
+ (instancetype) stringWithContentsOfFile: (NSString*)path
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
- (instancetype) initWithContentsOfFile: (NSString*)path
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
+ (instancetype) stringWithContentsOfURL: (NSURL*)url
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
- (instancetype) initWithContentsOfURL: (NSURL*)url
|
||||
usedEncoding: (NSStringEncoding*)enc
|
||||
error: (NSError**)error;
|
||||
+ (instancetype) stringWithContentsOfURL: (NSURL*)url
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
- (instancetype) initWithContentsOfURL: (NSURL*)url
|
||||
encoding: (NSStringEncoding)enc
|
||||
error: (NSError**)error;
|
||||
- (BOOL) writeToFile: (NSString*)path
|
||||
atomically: (BOOL)atomically
|
||||
encoding: (NSStringEncoding)enc
|
||||
|
@ -542,24 +542,24 @@ GS_EXPORT_CLASS
|
|||
- (NSString*) stringByReplacingCharactersInRange: (NSRange)aRange
|
||||
withString: (NSString*)by;
|
||||
#endif
|
||||
- (id) initWithCharactersNoCopy: (unichar*)chars
|
||||
length: (NSUInteger)length
|
||||
freeWhenDone: (BOOL)flag;
|
||||
- (id) initWithCharacters: (const unichar*)chars
|
||||
length: (NSUInteger)length;
|
||||
- (id) initWithCStringNoCopy: (char*)byteString
|
||||
length: (NSUInteger)length
|
||||
freeWhenDone: (BOOL)flag;
|
||||
- (id) initWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
- (id) initWithCString: (const char*)byteString;
|
||||
- (id) initWithString: (NSString*)string;
|
||||
- (id) initWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
arguments: (va_list)argList NS_FORMAT_FUNCTION(1,0);
|
||||
- (id) initWithData: (NSData*)data
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (id) initWithContentsOfFile: (NSString*)path;
|
||||
- (instancetype) initWithCharactersNoCopy: (unichar*)chars
|
||||
length: (NSUInteger)length
|
||||
freeWhenDone: (BOOL)flag;
|
||||
- (instancetype) initWithCharacters: (const unichar*)chars
|
||||
length: (NSUInteger)length;
|
||||
- (instancetype) initWithCStringNoCopy: (char*)byteString
|
||||
length: (NSUInteger)length
|
||||
freeWhenDone: (BOOL)flag;
|
||||
- (instancetype) initWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
- (instancetype) initWithCString: (const char*)byteString;
|
||||
- (instancetype) initWithString: (NSString*)string;
|
||||
- (instancetype) initWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
- (instancetype) initWithFormat: (NSString*)format
|
||||
arguments: (va_list)argList NS_FORMAT_FUNCTION(1,0);
|
||||
- (instancetype) initWithData: (NSData*)data
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (instancetype) initWithContentsOfFile: (NSString*)path;
|
||||
|
||||
// Getting a String's Length
|
||||
- (NSUInteger) length;
|
||||
|
@ -650,8 +650,8 @@ GS_EXPORT_CLASS
|
|||
- (BOOL) getCString: (char*)buffer
|
||||
maxLength: (NSUInteger)maxLength
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (id) initWithCString: (const char*)byteString
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (instancetype) initWithCString: (const char*)byteString
|
||||
encoding: (NSStringEncoding)encoding;
|
||||
- (NSUInteger) lengthOfBytesUsingEncoding: (NSStringEncoding)encoding;
|
||||
- (NSUInteger) maximumLengthOfBytesUsingEncoding: (NSStringEncoding)encoding;
|
||||
#endif
|
||||
|
@ -960,16 +960,16 @@ GS_EXPORT_CLASS
|
|||
+ (NSString*) localizedStringWithFormat: (NSString*)format, ...
|
||||
NS_FORMAT_FUNCTION(1,2);
|
||||
|
||||
+ (id) stringWithString: (NSString*)aString;
|
||||
+ (id) stringWithContentsOfURL: (NSURL*)url;
|
||||
+ (id) stringWithUTF8String: (const char*)bytes;
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)locale, ... NS_FORMAT_FUNCTION(1,3);
|
||||
- (id) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)locale
|
||||
arguments: (va_list)argList NS_FORMAT_FUNCTION(1,0);
|
||||
- (id) initWithUTF8String: (const char *)bytes;
|
||||
- (id) initWithContentsOfURL: (NSURL*)url;
|
||||
+ (instancetype) stringWithString: (NSString*)aString;
|
||||
+ (instancetype) stringWithContentsOfURL: (NSURL*)url;
|
||||
+ (instancetype) stringWithUTF8String: (const char*)bytes;
|
||||
- (instancetype) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)locale, ... NS_FORMAT_FUNCTION(1,3);
|
||||
- (instancetype) initWithFormat: (NSString*)format
|
||||
locale: (NSDictionary*)locale
|
||||
arguments: (va_list)argList NS_FORMAT_FUNCTION(1,0);
|
||||
- (instancetype) initWithUTF8String: (const char *)bytes;
|
||||
- (instancetype) initWithContentsOfURL: (NSURL*)url;
|
||||
- (NSString*) substringWithRange: (NSRange)aRange;
|
||||
- (NSComparisonResult) caseInsensitiveCompare: (NSString*)aString;
|
||||
- (NSComparisonResult) compare: (NSString*)string
|
||||
|
@ -1056,18 +1056,18 @@ GS_EXPORT_CLASS
|
|||
@interface NSMutableString : NSString
|
||||
|
||||
// Creating Temporary Strings
|
||||
+ (id) string;
|
||||
+ (id) stringWithCharacters: (const unichar*)characters
|
||||
length: (NSUInteger)length;
|
||||
+ (id) stringWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
+ (id) stringWithCString: (const char*)byteString;
|
||||
+ (id) stringWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
+ (id) stringWithContentsOfFile: (NSString*)path;
|
||||
+ (instancetype) string;
|
||||
+ (instancetype) stringWithCharacters: (const unichar*)characters
|
||||
length: (NSUInteger)length;
|
||||
+ (instancetype) stringWithCString: (const char*)byteString
|
||||
length: (NSUInteger)length;
|
||||
+ (instancetype) stringWithCString: (const char*)byteString;
|
||||
+ (instancetype) stringWithFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
+ (instancetype) stringWithContentsOfFile: (NSString*)path;
|
||||
+ (NSMutableString*) stringWithCapacity: (NSUInteger)capacity;
|
||||
|
||||
// Initializing Newly Allocated Strings
|
||||
- (id) initWithCapacity: (NSUInteger)capacity;
|
||||
- (instancetype) initWithCapacity: (NSUInteger)capacity;
|
||||
|
||||
// Modify A String
|
||||
- (void) appendFormat: (NSString*)format, ... NS_FORMAT_FUNCTION(1,2);
|
||||
|
|
Loading…
Reference in a new issue