Changeset 1248

Timestamp:

01/09/10 20:53:49 (8 months ago)

Author:

astrange

Message:

Simplify -getBoolFromKey/-getUnsignedIntFromKey.

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

Files:

• trunk/CPFPerianPrefPaneController.m (modified) (2 diffs)

trunk/CPFPerianPrefPaneController.m

@@ -68 +68 @@
 - (BOOL)getBoolFromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(BOOL)defaultValue
 {
-        CFPropertyListRef value;
-        BOOL ret = defaultValue;
-        
-        value = CFPreferencesCopyAppValue(key, appID);
-        if(value && CFGetTypeID(value) == CFBooleanGetTypeID())
-                ret = CFBooleanGetValue(value);
-        
-        if(value)
-                CFRelease(value);
-        
-        return ret;
+        Boolean ret, exists = FALSE;
+        
+        ret = CFPreferencesGetAppBooleanValue(key, appID, &exists);
+        
+        return exists ? ret : defaultValue;
 }
 
@@ -110 +104 @@
 - (unsigned int)getUnsignedIntFromKey:(CFStringRef)key forAppID:(CFStringRef)appID withDefault:(int)defaultValue
 {
-        CFPropertyListRef value;
-        unsigned int ret = defaultValue;
-        
-        value = CFPreferencesCopyAppValue(key, appID);
-        if(value && CFGetTypeID(value) == CFNumberGetTypeID())
-                CFNumberGetValue(value, kCFNumberIntType, &ret);
-        
-        if(value)
-                CFRelease(value);
-        
-        return ret;
+        int ret; Boolean exists = FALSE;
+        
+        ret = CFPreferencesGetAppIntegerValue(key, appID, &exists);
+        
+        return exists ? ret : defaultValue;
 }