Changeset 1248

Show
Ignore:
Timestamp:
01/09/10 20:53:49 (2 months ago)
Author:
astrange
Message:

Simplify -getBoolFromKey/-getUnsignedIntFromKey.

The other key-reading methods could be simplified
if the prefpane used CommonUtils?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CPFPerianPrefPaneController.m

    r1247 r1248  
    6868- (BOOL)getBoolFromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(BOOL)defaultValue 
    6969{ 
    70         CFPropertyListRef value; 
    71         BOOL ret = defaultValue; 
    72          
    73         value = CFPreferencesCopyAppValue(key, appID); 
    74         if(value && CFGetTypeID(value) == CFBooleanGetTypeID()) 
    75                 ret = CFBooleanGetValue(value); 
    76          
    77         if(value) 
    78                 CFRelease(value); 
    79          
    80         return ret; 
     70        Boolean ret, exists = FALSE; 
     71         
     72        ret = CFPreferencesGetAppBooleanValue(key, appID, &exists); 
     73         
     74        return exists ? ret : defaultValue; 
    8175} 
    8276 
    …… 
    110104- (unsigned int)getUnsignedIntFromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(int)defaultValue 
    111105{ 
    112         CFPropertyListRef value; 
    113         unsigned int ret = defaultValue; 
    114          
    115         value = CFPreferencesCopyAppValue(key, appID); 
    116         if(value && CFGetTypeID(value) == CFNumberGetTypeID()) 
    117                 CFNumberGetValue(value, kCFNumberIntType, &ret); 
    118          
    119         if(value) 
    120                 CFRelease(value); 
    121          
    122         return ret; 
     106        int ret; Boolean exists = FALSE; 
     107         
     108        ret = CFPreferencesGetAppIntegerValue(key, appID, &exists); 
     109         
     110        return exists ? ret : defaultValue; 
    123111} 
    124112