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

Updates to reduce global namespace pollution. Plenty more remaining.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23795 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-10-09 14:00:01 +00:00
parent 4874117588
commit 31342aef09
85 changed files with 1090 additions and 1277 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/NSString.m
View file

@ -566,8 +566,8 @@ handle_printf_atsign (FILE *stream,
gcrSel = @selector(getCharacters:range:);
ranSel = @selector(rangeOfComposedCharacterSequenceAtIndex:);
_DefaultStringEncoding = GetDefEncoding();
_ByteEncodingOk = GSIsByteEncoding(_DefaultStringEncoding);
_DefaultStringEncoding = [_GSPrivate defaultCStringEncoding];
_ByteEncodingOk = [_GSPrivate isByteEncoding: _DefaultStringEncoding];
NSStringClass = self;
[self setVersion: 1];
@ -1057,7 +1057,6 @@ handle_printf_atsign (FILE *stream,
locale: (NSDictionary*)locale
arguments: (va_list)argList
{
extern void GSStrExternalize();
unsigned char buf[2048];
GSStr_t f;
unichar fbuf[1024];
@ -2685,7 +2684,7 @@ handle_printf_atsign (FILE *stream,
*/
+ (NSStringEncoding*) availableStringEncodings
{
return GetAvailableEncodings();
return [_GSPrivate availableEncodings];
}
/**
@ -2703,7 +2702,7 @@ handle_printf_atsign (FILE *stream,
*/
ourbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
ourname = GetEncodingName(encoding);
ourname = [_GSPrivate encodingName: encoding];
return [ourbundle localizedStringForKey: ourname
value: ourname
table: nil];
@ -4151,7 +4150,7 @@ static NSFileManager *fm = nil;
}
else
{
dict = GSUserDefaultsDictionaryRepresentation();
dict = [_GSPrivate userDefaultsDictionaryRepresentation];
ret = AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithFormat: format locale: dict arguments: ap]);
}
@ -4203,7 +4202,7 @@ static NSFileManager *fm = nil;
*/
- (NSComparisonResult) localizedCompare: (NSString *)string
{
NSDictionary *dict = GSUserDefaultsDictionaryRepresentation();
NSDictionary *dict = [_GSPrivate userDefaultsDictionaryRepresentation];
return [self compare: string
options: 0
@ -4217,7 +4216,7 @@ static NSFileManager *fm = nil;
*/
- (NSComparisonResult) localizedCaseInsensitiveCompare: (NSString *)string
{
NSDictionary *dict = GSUserDefaultsDictionaryRepresentation();
NSDictionary *dict = [_GSPrivate userDefaultsDictionaryRepresentation];
return [self compare: string
options: NSCaseInsensitiveSearch