From 3fdb17626af4f94d94dab65b7ae78421b0c53a08 Mon Sep 17 00:00:00 2001 From: David Ayers Date: Mon, 22 Nov 2004 16:54:54 +0000 Subject: [PATCH] * GSWeb.framework/GSWApplication+Defaults.m (TAKEVALUEFORKEY): New macro to use new setValue:forKey: instead of takeValue:forKey: on Cocoa systems until it is implemented for GNUstep. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@20369 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ GSWeb.framework/GSWApplication+Defaults.m | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a38e9e..625f06f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-22 David Ayers + + * GSWeb.framework/GSWApplication+Defaults.m (TAKEVALUEFORKEY): + New macro to use new setValue:forKey: instead of takeValue:forKey: + on Cocoa systems until it is implemented for GNUstep. + 2004-11-12 David Ayers * GSWeb.framework/GSWApplication.m (GSWApplicationMainReal): diff --git a/GSWeb.framework/GSWApplication+Defaults.m b/GSWeb.framework/GSWApplication+Defaults.m index 9796688..b1836e6 100644 --- a/GSWeb.framework/GSWApplication+Defaults.m +++ b/GSWeb.framework/GSWApplication+Defaults.m @@ -514,34 +514,42 @@ GSWeb_DestroyGlobalAppDefaultOptions(void) (_userDefaults ? _userDefaults \ : (_userDefaults = [NSUserDefaults standardUserDefaults])) +/* FIXME: Once setValue:forKey: is implemented in -base we should use + use it unconditionally. */ +#ifdef GNUSTEP +#define TAKEVALUEFORKEY [self takeValue: val forKey: key] +#else +#define TAKEVALUEFORKEY [self setValue: val forKey: key] +#endif + /* These two macros are seperate for experimental reasons. They may be merged later. */ #define INIT_DFLT_OBJ(name,opt) \ if (_dflt_init_##name == NO) { \ id key = [NSString stringWithCString: #name]; \ id val = [NSUSERDEFAULTS objectForKey: opt]; \ - [self takeValue: val forKey: key]; } + TAKEVALUEFORKEY; } #define INIT_DFLT_BOOL(name, opt) \ if (_dflt_init_##name == NO) { \ id key = [NSString stringWithCString: #name]; \ BOOL v = [NSUSERDEFAULTS boolForKey: opt]; \ id val = [NSNumber numberWithBool: v]; \ - [self takeValue: val forKey: key]; } + TAKEVALUEFORKEY; } #define INIT_DFLT_INT(name, opt) \ if (_dflt_init_##name == NO) { \ id key = [NSString stringWithCString: #name]; \ int v = [NSUSERDEFAULTS integerForKey: opt]; \ id val = [NSNumber numberWithInt: v]; \ - [self takeValue: val forKey: key]; } + TAKEVALUEFORKEY; } #define INIT_DFLT_FLT(name, opt) \ if (_dflt_init_##name == NO) { \ id key = [NSString stringWithCString: #name]; \ float v = [NSUSERDEFAULTS floatForKey: opt]; \ id val = [NSNumber numberWithFloat: v]; \ - [self takeValue: val forKey: key]; } + TAKEVALUEFORKEY; } @implementation GSWApplication (GSWApplicationDefaults) //--------------------------------------------------------------------