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

Fix typos.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32344 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
thebeing 2011-02-24 12:34:21 +00:00
parent bb271d0efd
commit 209cee49f5
3 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-02-24 Niels Grewe <niels.grewe@halbordnung.de>
* Source/NSUserDefaults.m
* Source/NSKeyValueObserving.m:
Fix typos.
2011-02-23 Richard Frith-Macdonald <rfm@gnu.org> 2011-02-23 Richard Frith-Macdonald <rfm@gnu.org>
* Source\NSCalendarDate.m: * Source\NSCalendarDate.m:

22
Source/NSKeyValueObserving.m
View file

@ -554,7 +554,7 @@ replacementForClass(Class c)
{ {
imp = [[GSKVOSetter class] imp = [[GSKVOSetter class]
instanceMethodForSelector: @selector(setterRect:)]; instanceMethodForSelector: @selector(setterRect:)];
} }
else else
{ {
imp = 0; imp = 0;
@ -613,12 +613,12 @@ replacementForClass(Class c)
} }
NSEndHashTableEnumeration(&dependentKeyEnum); NSEndHashTableEnumeration(&dependentKeyEnum);
} }
NSEndMapTableEnumeration(&enumerator); NSEndMapTableEnumeration(&enumerator);
} }
if (!found) if (!found)
{ {
NSDebugLLog(@"KVC", @"class %@ not KVC complient for %@", NSDebugLLog(@"KVC", @"class %@ not KVC compliant for %@",
original, aKey); original, aKey);
/* /*
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
@ -959,7 +959,7 @@ replacementForClass(Class c)
observations = [NSMutableArray new]; observations = [NSMutableArray new];
return self; return self;
} }
- (void) notifyForKey: (NSString *)aKey ofInstance: (id)instance prior: (BOOL)f - (void) notifyForKey: (NSString *)aKey ofInstance: (id)instance prior: (BOOL)f
{ {
unsigned count; unsigned count;
@ -1180,7 +1180,7 @@ replacementForClass(Class c)
} }
/* /*
* removes the observer * removes the observer
*/ */
- (void) removeObserver: (NSObject*)anObserver forKeyPath: (NSString*)aPath - (void) removeObserver: (NSObject*)anObserver forKeyPath: (NSString*)aPath
{ {
@ -1327,7 +1327,7 @@ replacementForClass(Class c)
} }
if (observedObjectForForwarding) if (observedObjectForForwarding)
{ {
[observedObjectForForwarding removeObserver: self forKeyPath: [observedObjectForForwarding removeObserver: self forKeyPath:
keyForForwarding]; keyForForwarding];
} }
DESTROY(self); DESTROY(self);
@ -1347,7 +1347,7 @@ replacementForClass(Class c)
change: (NSDictionary *)change change: (NSDictionary *)change
context: (void *)context context: (void *)context
{ {
if (anObject == observedObjectForUpdate) if (anObject == observedObjectForUpdate)
{ {
[self keyPathChanged: nil]; [self keyPathChanged: nil];
} }
@ -1381,8 +1381,8 @@ replacementForClass(Class c)
{ {
NSMutableDictionary *change; NSMutableDictionary *change;
change = [NSMutableDictionary dictionaryWithObject: change = [NSMutableDictionary dictionaryWithObject:
[NSNumber numberWithInt: 1] [NSNumber numberWithInt: 1]
forKey: NSKeyValueChangeKindKey]; forKey: NSKeyValueChangeKindKey];
if (observedObjectForForwarding != nil) if (observedObjectForForwarding != nil)
@ -1391,7 +1391,7 @@ replacementForClass(Class c)
oldValue oldValue
= [observedObjectForForwarding valueForKey: keyForForwarding]; = [observedObjectForForwarding valueForKey: keyForForwarding];
[observedObjectForForwarding removeObserver: self forKeyPath: [observedObjectForForwarding removeObserver: self forKeyPath:
keyForForwarding]; keyForForwarding];
if (oldValue) if (oldValue)
{ {
@ -1663,7 +1663,7 @@ replacementForClass(Class c)
if (pathInfo->recursion++ == 0) if (pathInfo->recursion++ == 0)
{ {
id old = [pathInfo->change objectForKey: NSKeyValueChangeNewKey]; id old = [pathInfo->change objectForKey: NSKeyValueChangeNewKey];
if (old != nil) if (old != nil)
{ {
/* We have set a value for this key already, so the value /* We have set a value for this key already, so the value

42
Source/NSUserDefaults.m
View file

@ -311,7 +311,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
if (sharedDefaults != nil) if (sharedDefaults != nil)
{ {
NSDictionary *regDefs; NSDictionary *regDefs;
/* To ensure that we don't try to synchronise the old defaults to disk /* To ensure that we don't try to synchronise the old defaults to disk
* after creating the new ones, remove as housekeeping notification * after creating the new ones, remove as housekeeping notification
* observer. * observer.
@ -323,7 +323,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
*/ */
[sharedDefaults synchronize]; [sharedDefaults synchronize];
DESTROY(sharedDefaults->_changedDomains); DESTROY(sharedDefaults->_changedDomains);
regDefs = RETAIN([sharedDefaults->_tempDomains regDefs = RETAIN([sharedDefaults->_tempDomains
objectForKey: NSRegistrationDomain]); objectForKey: NSRegistrationDomain]);
setSharedDefaults = NO; setSharedDefaults = NO;
@ -491,7 +491,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
* We need to lock and check again before CREATING sharedDefaults if it doesn't exist, * We need to lock and check again before CREATING sharedDefaults if it doesn't exist,
* so that two threads can't create it at once (or call resetStandardUserDefaults at * so that two threads can't create it at once (or call resetStandardUserDefaults at
* the same time). * the same time).
* By not locking here, we avoid a deadlock that can occur between classLock and _lock. */ * By not locking here, we avoid a deadlock that can occur between classLock and _lock. */
if (setSharedDefaults == YES) if (setSharedDefaults == YES)
{ {
IF_NO_GC([sharedDefaults retain];) IF_NO_GC([sharedDefaults retain];)
@ -520,7 +520,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
{ {
NSString *path = GSDefaultsRootForUser(NSUserName()); NSString *path = GSDefaultsRootForUser(NSUserName());
NSRange r = [path rangeOfString: @":REGISTRY:"]; NSRange r = [path rangeOfString: @":REGISTRY:"];
if (r.length > 0) if (r.length > 0)
{ {
sharedDefaults = [[NSUserDefaultsWin32 alloc] init]; sharedDefaults = [[NSUserDefaultsWin32 alloc] init];
@ -580,22 +580,22 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
* *
* We iterate over <language>, and for each <language> we iterate over GNUSTEP_LIBRARY. * We iterate over <language>, and for each <language> we iterate over GNUSTEP_LIBRARY.
*/ */
{ {
/* These variables are reused for all languages so we set them up /* These variables are reused for all languages so we set them up
* once here and then reuse them. * once here and then reuse them.
*/ */
NSFileManager *fm = [NSFileManager defaultManager]; NSFileManager *fm = [NSFileManager defaultManager];
NSString *tail = [[[[[@"Libraries" NSString *tail = [[[[[@"Libraries"
stringByAppendingPathComponent: @"gnustep-base"] stringByAppendingPathComponent: @"gnustep-base"]
stringByAppendingPathComponent: @"Versions"] stringByAppendingPathComponent: @"Versions"]
stringByAppendingPathComponent: stringByAppendingPathComponent:
OBJC_STRINGIFY(GNUSTEP_BASE_MAJOR_VERSION.GNUSTEP_BASE_MINOR_VERSION)] OBJC_STRINGIFY(GNUSTEP_BASE_MAJOR_VERSION.GNUSTEP_BASE_MINOR_VERSION)]
stringByAppendingPathComponent: @"Resources"] stringByAppendingPathComponent: @"Resources"]
stringByAppendingPathComponent: @"Languages"]; stringByAppendingPathComponent: @"Languages"];
NSArray *paths = NSSearchPathForDirectoriesInDomains NSArray *paths = NSSearchPathForDirectoriesInDomains
(NSLibraryDirectory, NSAllDomainsMask, YES); (NSLibraryDirectory, NSAllDomainsMask, YES);
added_lang = NO; added_lang = NO;
added_locale = NO; added_locale = NO;
enumerator = [uL objectEnumerator]; enumerator = [uL objectEnumerator];
@ -616,7 +616,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
break; break;
} }
} }
if (path != nil) if (path != nil)
{ {
dict = [NSDictionary dictionaryWithContentsOfFile: path]; dict = [NSDictionary dictionaryWithContentsOfFile: path];
@ -637,7 +637,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
* C library. * C library.
*/ */
NSString *locale = nil; NSString *locale = nil;
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#ifdef LC_MESSAGES #ifdef LC_MESSAGES
locale = GSSetLocale(LC_MESSAGES, nil); locale = GSSetLocale(LC_MESSAGES, nil);
@ -659,13 +659,13 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
* later on. * later on.
*/ */
added_locale = YES; added_locale = YES;
dict = GSDomainFromDefaultLocale (); dict = GSDomainFromDefaultLocale ();
if (dict != nil) if (dict != nil)
{ {
[sharedDefaults setVolatileDomain: dict [sharedDefaults setVolatileDomain: dict
forName: lang]; forName: lang];
/* We do not set added_lang to YES here /* We do not set added_lang to YES here
* because we want the basic hardcoded defaults * because we want the basic hardcoded defaults
* to be used in that case. * to be used in that case.
@ -676,7 +676,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
} }
} }
} }
if (added_lang == NO) if (added_lang == NO)
{ {
/* No language information found ... probably because the base /* No language information found ... probably because the base
@ -981,7 +981,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
{ {
desc = [NSMutableString stringWithFormat: @"%@", [super description]]; desc = [NSMutableString stringWithFormat: @"%@", [super description]];
[desc appendFormat: @" SearchList: %@", _searchList]; [desc appendFormat: @" SearchList: %@", _searchList];
[desc appendFormat: @" Persistant: %@", _persDomains]; [desc appendFormat: @" Persistent: %@", _persDomains];
[desc appendFormat: @" Temporary: %@", _tempDomains]; [desc appendFormat: @" Temporary: %@", _tempDomains];
[_lock unlock]; [_lock unlock];
} }
@ -1110,7 +1110,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
while ((dN = (*nImp)(enumerator, nextObjectSel)) != nil) while ((dN = (*nImp)(enumerator, nextObjectSel)) != nil)
{ {
NSDictionary *dict; NSDictionary *dict;
dict = (*pImp)(_persDomains, objectForKeySel, dN); dict = (*pImp)(_persDomains, objectForKeySel, dN);
if (dict != nil && (object = [dict objectForKey: defaultName])) if (dict != nil && (object = [dict objectForKey: defaultName]))
break; break;
@ -1662,7 +1662,7 @@ NSLog(@"Creating empty user defaults database");
NS_HANDLER NS_HANDLER
{ {
NSLog(@"Warning ... someone broke our lock (%@) ... and may have" NSLog(@"Warning ... someone broke our lock (%@) ... and may have"
@" interfered with updating defaults data in file.", @" interfered with updating defaults data in file.",
[_defaultsDatabase stringByAppendingPathExtension: @"lck"]); [_defaultsDatabase stringByAppendingPathExtension: @"lck"]);
} }
NS_ENDHANDLER NS_ENDHANDLER
@ -1714,7 +1714,7 @@ NSLog(@"Creating empty user defaults database");
* If we haven't changed anything, we only need to synchronise if * If we haven't changed anything, we only need to synchronise if
* the on-disk database has been changed by someone else. * the on-disk database has been changed by someone else.
*/ */
if (_changedDomains == nil) if (_changedDomains == nil)
{ {
if ([self wantToReadDefaultsSince: _lastSync] == NO) if ([self wantToReadDefaultsSince: _lastSync] == NO)
@ -1729,15 +1729,15 @@ NSLog(@"Creating empty user defaults database");
{ {
invalidatedLanguages = YES; invalidatedLanguages = YES;
} }
if ([self lockDefaultsFile: &wasLocked] == NO) if ([self lockDefaultsFile: &wasLocked] == NO)
{ {
[_lock unlock]; [_lock unlock];
NS_VALRETURN(NO); NS_VALRETURN(NO);
} }
newDict = [self readDefaults]; newDict = [self readDefaults];
if (newDict == nil) if (newDict == nil)
{ {
if (wasLocked == NO) if (wasLocked == NO)
@ -2084,7 +2084,7 @@ NSLog(@"Creating empty user defaults database");
{ {
plist_val = val; plist_val = val;
} }
[argDict setObject: plist_val forKey: key]; [argDict setObject: plist_val forKey: key];
if (old != nil) if (old != nil)
{ {