use the MR_RETAIN/MR_RELEASE/MR_AUTORELEASE macros everywhere

zwaldowski · Dec 6, 2011 · d1af005 · d1af005
1 parent 1ad46a7
commit d1af005
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/Source/Categories/NSManagedObjectContext+MagicalRecord.m b/Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -31,10 +31,8 @@ + (NSManagedObjectContext *)MR_defaultContext
 
 + (void) MR_setDefaultContext:(NSManagedObjectContext *)moc
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [moc retain];
-    [defaultManageObjectContext_ release];
-#endif
+    MR_RETAIN(moc);
+    MR_RELEASE(defaultManageObjectContext_);
     defaultManageObjectContext_ = moc;
 }
 

diff --git a/Source/Categories/NSManagedObjectModel+MagicalRecord.m b/Source/Categories/NSManagedObjectModel+MagicalRecord.m
@@ -25,10 +25,8 @@ + (NSManagedObjectModel *) MR_defaultManagedObjectModel
 
 + (void) MR_setDefaultManagedObjectModel:(NSManagedObjectModel *)newDefaultModel
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [newDefaultModel retain];
-    [defaultManagedObjectModel_ release];
-#endif
+    MR_RETAIN(newDefaultModel);
+    MR_RELEASE(defaultManagedObjectModel_);
 	defaultManagedObjectModel_ = newDefaultModel;
 }
 

diff --git a/Source/Categories/NSPersistentStore+MagicalRecord.m b/Source/Categories/NSPersistentStore+MagicalRecord.m
@@ -22,10 +22,8 @@ + (NSPersistentStore *) MR_defaultPersistentStore
 
 + (void) MR_setDefaultPersistentStore:(NSPersistentStore *) store
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [store retain];
-    [defaultPersistentStore_ release];
-#endif
+    MR_RETAIN(store);
+    MR_RELEASE(defaultPersistentStore_);
 	defaultPersistentStore_ = store;
 }
 

diff --git a/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m b/Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
@@ -29,10 +29,8 @@ + (NSPersistentStoreCoordinator *) MR_defaultStoreCoordinator
 
 + (void) MR_setDefaultStoreCoordinator:(NSPersistentStoreCoordinator *)coordinator
 {
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [coordinator retain];
-    [defaultCoordinator_ release];
-#endif
+    MR_RETAIN(coordinator);
+    MR_RELEASE(defaultCoordinator_);
 	defaultCoordinator_ = coordinator;
 
     if (defaultCoordinator_ != nil)

diff --git a/Source/MagicalRecordHelpers.m b/Source/MagicalRecordHelpers.m
@@ -417,9 +417,7 @@ BOOL addMagicalRecordShortHandMethodToPrefixedClassMethod(Class klass, SEL origi
     [formatter setDateFormat:format];
 
     NSDate *parsedDate = [formatter dateFromString:value];
-#ifndef NS_AUTOMATED_REFCOUNT_UNAVAILABLE
-    [formatter autorelease];
-#endif
+    MR_AUTORELEASE(formatter);
 
     return parsedDate;
 }