Updates for 10.5 API changes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27962 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-02-23 20:42:32 +00:00
parent 0b528e776c
commit 30cf8bf35b
138 changed files with 2094 additions and 1536 deletions

View file

@ -174,7 +174,7 @@ static SEL appSel;
*/
- (id) initWithObjects: (id*)objects
forKeys: (id*)keys
count: (unsigned)count
count: (NSUInteger)count
{
self = [self init];
return self;
@ -184,7 +184,7 @@ static SEL appSel;
* Returns an unsigned integer which is the number of elements
* stored in the dictionary.
*/
- (unsigned) count
- (NSUInteger) count
{
[self subclassResponsibility: _cmd];
return 0;
@ -405,13 +405,13 @@ static SEL appSel;
*/
+ (id) dictionaryWithObjects: (id*)objects
forKeys: (id*)keys
count: (unsigned)count
count: (NSUInteger)count
{
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithObjects: objects forKeys: keys count: count]);
}
- (unsigned) hash
- (NSUInteger) hash
{
return [self count];
}
@ -877,7 +877,7 @@ compareIt(id o1, id o2, void* context)
struct foo *f = (struct foo*)context;
o1 = (*f->i)(f->d, @selector(objectForKey:), o1);
o2 = (*f->i)(f->d, @selector(objectForKey:), o2);
return (int)(intptr_t)[o1 performSelector: f->s withObject: o2];
return (NSInteger)(intptr_t)[o1 performSelector: f->s withObject: o2];
}
/**
@ -1081,7 +1081,7 @@ compareIt(id o1, id o2, void* context)
* items are listed is undefined.
*/
- (NSString*) descriptionWithLocale: (NSDictionary*)locale
indent: (unsigned int)level
indent: (NSUInteger)level
{
NSMutableString *result = nil;
@ -1185,7 +1185,7 @@ compareIt(id o1, id o2, void* context)
* and needs to be re-implemented in subclasses in order to have all
* other initialisers work.
*/
- (id) initWithCapacity: (unsigned)numItems
- (id) initWithCapacity: (NSUInteger)numItems
{
self = [self init];
return self;
@ -1218,7 +1218,7 @@ compareIt(id o1, id o2, void* context)
* added, this can avoid the reallocate-and-copy process if the size of the
* ultimate contents is known in advance.
*/
+ (id) dictionaryWithCapacity: (unsigned)numItems
+ (id) dictionaryWithCapacity: (NSUInteger)numItems
{
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithCapacity: numItems]);
@ -1233,7 +1233,7 @@ compareIt(id o1, id o2, void* context)
*/
- (id) initWithObjects: (id*)objects
forKeys: (id*)keys
count: (unsigned)count
count: (NSUInteger)count
{
self = [self initWithCapacity: count];
if (self != nil)