From 3cb98ad576418a9d17ba09c38c0ece66d1211924 Mon Sep 17 00:00:00 2001 From: CaS Date: Tue, 13 Nov 2001 07:44:57 +0000 Subject: [PATCH] Minor MacOS-X compatibility change git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11388 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 ++ Documentation/gsdoc/NSUserDefaults.gsdoc | 8 ++ Documentation/gsdoc/NSUserDefaults.html | 137 ++++++++++++----------- Headers/gnustep/base/NSUserDefaults.h | 4 +- Source/NSUser.m | 2 +- Source/NSUserDefaults.m | 2 +- 6 files changed, 94 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 079a1e134..321bc3f23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-11-13 Richard Frith-Macdonald + + * Source/NSUser.m: + * Headers/Foundation/NSUserDefaults.h: + * Documentation/gsdoc/NSUserDefaults.gsdoc: + * Source/NSUserDefaults.m: Changed the method name +resetUserDefaults + to be +resetStandardUserDefaults for compatibility with MacOS-X, which + has now implemented an equivalent for the GNUstep method. + 2001-11-12 Richard Frith-Macdonald * Source/NSNumber.m: describe char and unsigned char as numbers diff --git a/Documentation/gsdoc/NSUserDefaults.gsdoc b/Documentation/gsdoc/NSUserDefaults.gsdoc index 3639e7edb..4983ccb67 100644 --- a/Documentation/gsdoc/NSUserDefaults.gsdoc +++ b/Documentation/gsdoc/NSUserDefaults.gsdoc @@ -82,6 +82,14 @@ environment variable.

+ + resetStandardUserDefaults + + Resets the shared user defaults object to reflect the current + user ID. Needed by setuid processes whiich change the user they + are running as. + + standardUserDefaults diff --git a/Documentation/gsdoc/NSUserDefaults.html b/Documentation/gsdoc/NSUserDefaults.html index 65a045ff4..f57a9acaf 100644 --- a/Documentation/gsdoc/NSUserDefaults.html +++ b/Documentation/gsdoc/NSUserDefaults.html @@ -100,48 +100,57 @@

Methods

Class Methods

-

standardUserDefaults

+

resetStandardUserDefaults

++ (void) resetStandardUserDefaults;
+ + Resets the shared user defaults object to reflect the current + user ID. Needed by setuid processes whiich change the user they + are running as. + +
+

standardUserDefaults

+ (NSUserDefaults*) standardUserDefaults;
Returns a shared instance of the class containing the standard defaults for the process.
-

userLanguages

+

userLanguages

+ (NSArray*) userLanguages;
Standards: GNUstep NotMacOS-X NotOpenStep
@@ -151,7 +160,7 @@ Standards: GNUstep NotMacOS-X NotOpenStep
(in particular, uses the LANGUAGES environment variable).
-

setUserLanguages:

+

setUserLanguages:

+ (void) setUserLanguages: (NSArray*)languages;
Standards: GNUstep NotMacOS-X NotOpenStep
@@ -160,155 +169,155 @@ Standards: GNUstep NotMacOS-X NotOpenStep

Instances Methods

-

arrayForKey:

+

arrayForKey:

- (NSArray*) arrayForKey: (NSString*)defaultName;
Looks up a value for a specified default, checks that it is an array. Returns nil if it is not.
-

boolForKey:

+

boolForKey:

- (BOOL) boolForKey: (NSString*)defaultName;
Looks up a value for a specified default, checks that it is a boolean. Returns NO if it is not present.
-

dataForKey:

+

dataForKey:

- (NSData*) dataForKey: (NSString*)defaultName;
Looks up a value for a specified default, checks that it is an NSData object. Returns nil if it is not.
-

dictionaryForKey:

+

dictionaryForKey:

- (NSDictionary*) dictionaryForKey: (NSString*)defaultName;
Looks up a value for a specified default, checks that it is an NSDictionary object. Returns nil if it is not.
-

dictionaryRepresentation

+

dictionaryRepresentation

- (NSDictionary*) dictionaryRepresentation;
-

floatForKey:

+

floatForKey:

- (float) floatForKey: (NSString*)defaultName;
-

init

+

init

- (id) init;
-

initWithUser:

+

initWithUser:

- (id) initWithUser: (NSString*)username;
-

integerForKey:

+

integerForKey:

- (int) integerForKey: (NSString*)defaultName;
-

objectForKey:

+

objectForKey:

- (id) objectForKey: (NSString*)defaultName;
-

persistentDomainForName:

+

persistentDomainForName:

- (NSDictionary*) persistentDomainForName: (NSString*)domainName;
-

persistentDomainNames

+

persistentDomainNames

- (NSArray*) persistentDomainNames;
-

registerDefaults:

+

registerDefaults:

- (void) registerDefaults: (NSDictionary*)dictionary;
-

removeObjectForKey:

+

removeObjectForKey:

- (void) removeObjectForKey: (NSString*)defaultName;
-

removePersistentDomainForName:

+

removePersistentDomainForName:

- (void) removePersistentDomainForName: (NSString*)domainName;
-

removeVolatileDomainForName:

+

removeVolatileDomainForName:

- (void) removeVolatileDomainForName: (NSString*)domainName;
-

searchList

+

searchList

- (NSArray*) searchList;
-

setBool:forKey:

+

setBool:forKey:

- (void) setBool: (BOOL)value forKey: (NSString*)defaultName;
-

setFloat:forKey:

+

setFloat:forKey:

- (void) setFloat: (float)value forKey: (NSString*)defaultName;
-

setInteger:forKey:

+

setInteger:forKey:

- (void) setInteger: (int)value forKey: (NSString*)defaultName;
-

setObject:forKey:

+

setObject:forKey:

- (void) setObject: (id)value forKey: (NSString*)defaultName;
-

setPersistentDomain:forName:

+

setPersistentDomain:forName:

- (void) setPersistentDomain: (NSDictionary*)domain forName: (NSString*)domainName;
-

setSearchList:

+

setSearchList:

- (void) setSearchList: (NSArray*)array;
-

setVolatileDomain:forName:

+

setVolatileDomain:forName:

- (void) setVolatileDomain: (NSDictionary*)domain forName: (NSString*)domainName;
-

stringArrayForKey:

+

stringArrayForKey:

- (NSArray*) stringArrayForKey: (NSString*)defaultName;
-

stringForKey:

+

stringForKey:

- (NSString*) stringForKey: (NSString*)defaultName;
-

synchronize

+

synchronize

- (BOOL) synchronize;
-

volatileDomainForName:

+

volatileDomainForName:

- (NSDictionary*) volatileDomainForName: (NSString*)domainName;
-

volatileDomainNames

+

volatileDomainNames

- (NSArray*) volatileDomainNames;
diff --git a/Headers/gnustep/base/NSUserDefaults.h b/Headers/gnustep/base/NSUserDefaults.h index fd201e091..a95b0354a 100644 --- a/Headers/gnustep/base/NSUserDefaults.h +++ b/Headers/gnustep/base/NSUserDefaults.h @@ -132,12 +132,12 @@ GS_EXPORT NSString* const NSLocale; /* Getting the Shared Instance */ + (NSUserDefaults*) standardUserDefaults; -#ifndef NO_GNUSTEP +#ifndef STRICT_OPENSTEP /* * Called by GSSetUserName() to get the defaults system to use the defaults * of a new user. */ -+ (void) resetUserDefaults; ++ (void) resetStandardUserDefaults; #endif + (NSArray*) userLanguages; + (void) setUserLanguages: (NSArray*)languages; diff --git a/Source/NSUser.m b/Source/NSUser.m index e4d999cc9..77674c073 100644 --- a/Source/NSUser.m +++ b/Source/NSUser.m @@ -61,7 +61,7 @@ GSSetUserName(NSString* name) else if ([theUserName isEqualToString: name] == NO) { ASSIGN(theUserName, name); - [NSUserDefaults resetUserDefaults]; + [NSUserDefaults resetStandardUserDefaults]; } } diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m index 07ba18382..94cdec8d4 100644 --- a/Source/NSUserDefaults.m +++ b/Source/NSUserDefaults.m @@ -130,7 +130,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */ } } -+ (void) resetUserDefaults ++ (void) resetStandardUserDefaults { [classLock lock]; if (sharedDefaults != nil)