Rename description to userDescription to get rid of obj-c reserved word

JimLiu · May 4, 2015 · e2bad62 · e2bad62
1 parent 672f050
commit e2bad62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/WeiboSDK/Models/User.h b/src/WeiboSDK/Models/User.h
@@ -30,7 +30,7 @@ typedef enum {
 @property (nonatomic, copy) NSString *province; //用户所在省级
 @property (nonatomic, copy) NSString *city; //用户所在城市
 @property (nonatomic, copy) NSString *location; //用户所在地
-@property (nonatomic, copy) NSString *description; //用户个人描述
+@property (nonatomic, copy) NSString *userDescription; //用户个人描述
 @property (nonatomic, copy) NSString *url; //用户博客地址
 @property (nonatomic, copy) NSString *profileImageUrl; //用户头像地址
 @property (nonatomic, copy) NSString *profileLargeImageUrl; //用户大头像地址

diff --git a/src/WeiboSDK/Models/User.m b/src/WeiboSDK/Models/User.m
@@ -25,7 +25,7 @@ - (void)encodeWithCoder:(NSCoder *)encoder
     [encoder encodeObject:self.province forKey:@"province"];
     [encoder encodeObject:self.city forKey:@"city"];
     [encoder encodeObject:self.location forKey:@"location"];
-    [encoder encodeObject:self.description forKey:@"description"];
+    [encoder encodeObject:self.userDescription forKey:@"description"];
     [encoder encodeObject:self.url forKey:@"url"];
     [encoder encodeObject:self.profileImageUrl forKey:@"profileImageUrl"];
     [encoder encodeObject:self.profileLargeImageUrl forKey:@"profileLargeImageUrl"];
@@ -59,7 +59,7 @@ - (id)initWithCoder:(NSCoder *)decoder
         self.province = [decoder decodeObjectForKey:@"province"];
         self.city = [decoder decodeObjectForKey:@"city"];
         self.location = [decoder decodeObjectForKey:@"location"];
-        self.description = [decoder decodeObjectForKey:@"description"];
+        self.userDescription = [decoder decodeObjectForKey:@"description"];
         self.url = [decoder decodeObjectForKey:@"url"];
         self.profileImageUrl = [decoder decodeObjectForKey:@"profileImageUrl"];
         self.profileLargeImageUrl = [decoder decodeObjectForKey:@"profileLargeImageUrl"];
@@ -97,7 +97,7 @@ - (id)initWithJsonDictionary:(NSDictionary*)dic
         self.province = [Resources getProvinceName:provinceId];
         self.city = [Resources getCityNameWithProvinceId:provinceId withCityId:cityId];
         self.location = [dic stringValueForKey:@"location"];
-        self.description = [dic stringValueForKey:@"description"];
+        self.userDescription = [dic stringValueForKey:@"description"];
         self.url = [dic stringValueForKey:@"url"];
         self.profileImageUrl = [dic stringValueForKey:@"profile_image_url"];
         self.profileLargeImageUrl = [dic stringValueForKey:@"avatar_large"];