Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Remove trailing semicolons from implementations. #371

Closed
wants to merge 1 commit into from

2 participants

@modocache

No description provided.

@casademora
Owner

You should try doing this, it works, and makes working with header and implementation files a bit easier. I'm keeping these :)

@modocache

@casademora Interesting! What makes them easier to work with? Or does this simply allow you to copy-paste the method declarations from the header file?

@modocache modocache closed this
@modocache

In that case, though, would you consider a pull request which adds them to the methods that do not have trailing semicolons? It's inconsistent at the moment.

@casademora
Owner
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 8, 2013
  1. @modocache
This page is out of date. Refresh to see the latest.
Showing with 78 additions and 78 deletions.
  1. +2 −2 MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
  2. +2 −2 MagicalRecord/Categories/DataImport/NSEntityDescription+MagicalDataImport.m
  3. +1 −1  MagicalRecord/Categories/DataImport/NSObject+MagicalDataImport.m
  4. +1 −1  MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.m
  5. +1 −1  MagicalRecord/Categories/DataImport/NSString+MagicalDataImport.m
  6. +5 −5 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m
  7. +4 −4 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
  8. +4 −4 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.m
  9. +1 −1  MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.m
  10. +4 −4 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m
  11. +13 −13 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
  12. +8 −8 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
  13. +1 −1  MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m
  14. +1 −1  MagicalRecord/Categories/NSPersistentStore+MagicalRecord.m
  15. +8 −8 MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
  16. +4 −4 MagicalRecord/Core/MagicalRecord+Actions.m
  17. +1 −1  MagicalRecord/Core/MagicalRecord+ErrorHandling.m
  18. +5 −5 MagicalRecord/Core/MagicalRecord+Options.m
  19. +1 −1  MagicalRecord/Core/MagicalRecord+ShorthandSupport.m
  20. +5 −5 MagicalRecord/Core/MagicalRecord+iCloud.m
  21. +5 −5 MagicalRecord/Core/MagicalRecord.m
  22. +1 −1  Project Files/Unit Tests/Fixtures/FixtureHelpers.m
View
4 MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
@@ -12,12 +12,12 @@
@implementation NSAttributeDescription (MagicalRecord_DataImport)
-- (NSString *) MR_primaryKey;
+- (NSString *) MR_primaryKey
{
return nil;
}
-- (id) MR_valueForKeyPath:(NSString *)keyPath fromObjectData:(id)objectData;
+- (id) MR_valueForKeyPath:(NSString *)keyPath fromObjectData:(id)objectData
{
id value = [objectData valueForKeyPath:keyPath];
View
4 MagicalRecord/Categories/DataImport/NSEntityDescription+MagicalDataImport.m
@@ -10,7 +10,7 @@
@implementation NSEntityDescription (MagicalRecord_DataImport)
-- (NSAttributeDescription *) MR_primaryAttributeToRelateBy;
+- (NSAttributeDescription *) MR_primaryAttributeToRelateBy
{
NSString *lookupKey = [[self userInfo] valueForKey:kMagicalRecordImportRelationshipLinkedByKey] ?: primaryKeyNameFromString([self name]);
NSDictionary *attributesByName = [self attributesByName];
@@ -22,7 +22,7 @@ - (NSAttributeDescription *) MR_primaryAttributeToRelateBy;
return primaryAttribute;
}
-- (NSManagedObject *) MR_createInstanceInContext:(NSManagedObjectContext *)context;
+- (NSManagedObject *) MR_createInstanceInContext:(NSManagedObjectContext *)context
{
Class relatedClass = NSClassFromString([self managedObjectClassName]);
NSManagedObject *newInstance = [relatedClass MR_createInContext:context];
View
2  MagicalRecord/Categories/DataImport/NSObject+MagicalDataImport.m
@@ -22,7 +22,7 @@ - (id) MR_valueForUndefinedKey:(NSString *)key
return nil;
}
-- (NSString *) MR_lookupKeyForAttribute:(NSAttributeDescription *)attributeInfo;
+- (NSString *) MR_lookupKeyForAttribute:(NSAttributeDescription *)attributeInfo
{
NSString *attributeName = [attributeInfo name];
NSString *lookupKey = [[attributeInfo userInfo] valueForKey:kMagicalRecordImportAttributeKeyMapKey] ?: attributeName;
View
2  MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.m
@@ -13,7 +13,7 @@
@implementation NSRelationshipDescription (MagicalRecord_DataImport)
-- (NSString *) MR_primaryKey;
+- (NSString *) MR_primaryKey
{
NSString *primaryKeyName = [[self userInfo] valueForKey:kMagicalRecordImportRelationshipLinkedByKey] ?:
primaryKeyNameFromString([[self destinationEntity] name]);
View
2  MagicalRecord/Categories/DataImport/NSString+MagicalDataImport.m
@@ -11,7 +11,7 @@
@implementation NSString (MagicalRecord_DataImport)
-- (NSString *) MR_capitalizedFirstCharacterString;
+- (NSString *) MR_capitalizedFirstCharacterString
{
if ([self length] > 0)
{
View
10 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m
@@ -35,18 +35,18 @@ + (NSNumber *) MR_numberOfEntitiesWithPredicate:(NSPredicate *)searchTerm inCont
return [NSNumber numberWithUnsignedInteger:[self MR_countOfEntitiesWithPredicate:searchTerm inContext:context]];
}
-+ (NSNumber *) MR_numberOfEntitiesWithPredicate:(NSPredicate *)searchTerm;
++ (NSNumber *) MR_numberOfEntitiesWithPredicate:(NSPredicate *)searchTerm
{
return [self MR_numberOfEntitiesWithPredicate:searchTerm
inContext:[NSManagedObjectContext MR_contextForCurrentThread]];
}
-+ (NSUInteger) MR_countOfEntities;
++ (NSUInteger) MR_countOfEntities
{
return [self MR_countOfEntitiesWithContext:[NSManagedObjectContext MR_contextForCurrentThread]];
}
-+ (NSUInteger) MR_countOfEntitiesWithContext:(NSManagedObjectContext *)context;
++ (NSUInteger) MR_countOfEntitiesWithContext:(NSManagedObjectContext *)context
{
NSError *error = nil;
NSUInteger count = [context countForFetchRequest:[self MR_createFetchRequestInContext:context] error:&error];
@@ -55,12 +55,12 @@ + (NSUInteger) MR_countOfEntitiesWithContext:(NSManagedObjectContext *)context;
return count;
}
-+ (NSUInteger) MR_countOfEntitiesWithPredicate:(NSPredicate *)searchFilter;
++ (NSUInteger) MR_countOfEntitiesWithPredicate:(NSPredicate *)searchFilter
{
return [self MR_countOfEntitiesWithPredicate:searchFilter inContext:[NSManagedObjectContext MR_defaultContext]];
}
-+ (NSUInteger) MR_countOfEntitiesWithPredicate:(NSPredicate *)searchFilter inContext:(NSManagedObjectContext *)context;
++ (NSUInteger) MR_countOfEntitiesWithPredicate:(NSPredicate *)searchFilter inContext:(NSManagedObjectContext *)context
{
NSError *error = nil;
NSFetchRequest *request = [self MR_createFetchRequestInContext:context];
View
8 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
@@ -168,7 +168,7 @@ - (void) MR_setRelationships:(NSDictionary *)relationships forKeysWithObject:(id
}
}
-- (BOOL) MR_preImport:(id)objectData;
+- (BOOL) MR_preImport:(id)objectData
{
if ([self respondsToSelector:@selector(shouldImport:)])
{
@@ -187,7 +187,7 @@ - (BOOL) MR_preImport:(id)objectData;
return YES;
}
-- (BOOL) MR_postImport:(id)objectData;
+- (BOOL) MR_postImport:(id)objectData
{
MR_swapMethodsFromClass([objectData class], @selector(valueForUndefinedKey:), @selector(MR_valueForUndefinedKey:));
if ([self respondsToSelector:@selector(didImport:)])
@@ -197,7 +197,7 @@ - (BOOL) MR_postImport:(id)objectData;
return YES;
}
-- (BOOL) MR_performDataImportFromObject:(id)objectData relationshipBlock:(void(^)(NSRelationshipDescription*, id))relationshipBlock;
+- (BOOL) MR_performDataImportFromObject:(id)objectData relationshipBlock:(void(^)(NSRelationshipDescription*, id))relationshipBlock
{
BOOL didStartimporting = [self MR_preImport:objectData];
if (!didStartimporting) return NO;
@@ -230,7 +230,7 @@ - (BOOL) MR_importValuesForKeysWithObject:(id)objectData
} ];
}
-+ (id) MR_importFromObject:(id)objectData inContext:(NSManagedObjectContext *)context;
++ (id) MR_importFromObject:(id)objectData inContext:(NSManagedObjectContext *)context
{
NSAttributeDescription *primaryAttribute = [[self MR_entityDescription] MR_primaryAttributeToRelateBy];
View
8 MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.m
@@ -101,7 +101,7 @@ + (id) MR_findFirstByAttribute:(NSString *)attribute withValue:(id)searchValue
inContext:[NSManagedObjectContext MR_contextForCurrentThread]];
}
-+ (id) MR_findFirstOrderedByAttribute:(NSString *)attribute ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
++ (id) MR_findFirstOrderedByAttribute:(NSString *)attribute ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context
{
NSFetchRequest *request = [self MR_requestAllSortedBy:attribute ascending:ascending inContext:context];
[request setFetchLimit:1];
@@ -109,7 +109,7 @@ + (id) MR_findFirstOrderedByAttribute:(NSString *)attribute ascending:(BOOL)asce
return [self MR_executeFetchRequestAndReturnFirstObject:request inContext:context];
}
-+ (id) MR_findFirstOrderedByAttribute:(NSString *)attribute ascending:(BOOL)ascending;
++ (id) MR_findFirstOrderedByAttribute:(NSString *)attribute ascending:(BOOL)ascending
{
return [self MR_findFirstOrderedByAttribute:attribute
ascending:ascending
@@ -231,7 +231,7 @@ + (NSFetchedResultsController *) MR_fetchController:(NSFetchRequest *)request de
return controller;
}
-+ (NSFetchedResultsController *) MR_fetchAllWithDelegate:(id<NSFetchedResultsControllerDelegate>)delegate;
++ (NSFetchedResultsController *) MR_fetchAllWithDelegate:(id<NSFetchedResultsControllerDelegate>)delegate
{
return [self MR_fetchAllWithDelegate:delegate inContext:[NSManagedObjectContext MR_contextForCurrentThread]];
}
@@ -272,7 +272,7 @@ + (NSFetchedResultsController *) MR_fetchAllGroupedBy:(NSString *)group withPred
inContext:[NSManagedObjectContext MR_contextForCurrentThread]];
}
-+ (NSFetchedResultsController *) MR_fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
++ (NSFetchedResultsController *) MR_fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context
{
return [self MR_fetchAllGroupedBy:group
withPredicate:searchTerm
View
2  MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.m
@@ -127,7 +127,7 @@ + (NSFetchRequest *) MR_requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)
return request;
}
-+ (NSFetchRequest *) MR_requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm;
++ (NSFetchRequest *) MR_requestAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm
{
NSFetchRequest *request = [self MR_requestAllSortedBy:sortTerm
ascending:ascending
View
8 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m
@@ -48,7 +48,7 @@ - (void) MR_stopObservingContext:(NSManagedObjectContext *)otherContext
#pragma mark - Context iCloud Merge Helpers
-- (void) MR_mergeChangesFromiCloud:(NSNotification *)notification;
+- (void) MR_mergeChangesFromiCloud:(NSNotification *)notification
{
[self performBlock:^{
@@ -75,7 +75,7 @@ - (void) MR_mergeChangesFromNotification:(NSNotification *)notification;
[self mergeChangesFromContextDidSaveNotification:notification];
}
-- (void) MR_mergeChangesOnMainThread:(NSNotification *)notification;
+- (void) MR_mergeChangesOnMainThread:(NSNotification *)notification
{
if ([NSThread isMainThread])
{
@@ -87,7 +87,7 @@ - (void) MR_mergeChangesOnMainThread:(NSNotification *)notification;
}
}
-- (void) MR_observeiCloudChangesInCoordinator:(NSPersistentStoreCoordinator *)coordinator;
+- (void) MR_observeiCloudChangesInCoordinator:(NSPersistentStoreCoordinator *)coordinator
{
if (![MagicalRecord isICloudEnabled]) return;
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
@@ -98,7 +98,7 @@ - (void) MR_observeiCloudChangesInCoordinator:(NSPersistentStoreCoordinator *)co
}
-- (void) MR_stopObservingiCloudChangesInCoordinator:(NSPersistentStoreCoordinator *)coordinator;
+- (void) MR_stopObservingiCloudChangesInCoordinator:(NSPersistentStoreCoordinator *)coordinator
{
if (![MagicalRecord isICloudEnabled]) return;
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
View
26 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
@@ -32,7 +32,7 @@ + (void) MR_cleanUp;
[self MR_setRootSavingContext:nil];
}
-- (NSString *) MR_description;
+- (NSString *) MR_description
{
NSString *contextLabel = [NSString stringWithFormat:@"*** %@ ***", [self MR_workingName]];
NSString *onMainThread = [NSThread isMainThread] ? @"*** MAIN THREAD ***" : @"*** BACKGROUND THREAD ***";
@@ -40,7 +40,7 @@ - (NSString *) MR_description;
return [NSString stringWithFormat:@"<%@ (%p): %@> on %@", NSStringFromClass([self class]), self, contextLabel, onMainThread];
}
-- (NSString *) MR_parentChain;
+- (NSString *) MR_parentChain
{
NSMutableString *familyTree = [@"" mutableCopy];
NSManagedObjectContext *currentContext = self;
@@ -102,12 +102,12 @@ + (void) MR_setDefaultContext:(NSManagedObjectContext *)moc
MRLog(@"Set Default Context: %@", defaultManagedObjectContext_);
}
-+ (NSManagedObjectContext *) MR_rootSavingContext;
++ (NSManagedObjectContext *) MR_rootSavingContext
{
return rootSavingContext;
}
-+ (void) MR_setRootSavingContext:(NSManagedObjectContext *)context;
++ (void) MR_setRootSavingContext:(NSManagedObjectContext *)context
{
if (rootSavingContext)
{
@@ -121,7 +121,7 @@ + (void) MR_setRootSavingContext:(NSManagedObjectContext *)context;
MRLog(@"Set Root Saving Context: %@", rootSavingContext);
}
-+ (void) MR_initializeDefaultContextWithCoordinator:(NSPersistentStoreCoordinator *)coordinator;
++ (void) MR_initializeDefaultContextWithCoordinator:(NSPersistentStoreCoordinator *)coordinator
{
if (defaultManagedObjectContext_ == nil)
{
@@ -144,20 +144,20 @@ + (void) MR_resetDefaultContext
dispatch_async(dispatch_get_main_queue(), resetBlock);
}
-+ (NSManagedObjectContext *) MR_contextWithoutParent;
++ (NSManagedObjectContext *) MR_contextWithoutParent
{
NSManagedObjectContext *context = [[self alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
return context;
}
-+ (NSManagedObjectContext *) MR_context;
++ (NSManagedObjectContext *) MR_context
{
NSManagedObjectContext *context = [[self alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
[context setParentContext:[self MR_defaultContext]];
return context;
}
-+ (NSManagedObjectContext *) MR_contextWithParent:(NSManagedObjectContext *)parentContext;
++ (NSManagedObjectContext *) MR_contextWithParent:(NSManagedObjectContext *)parentContext
{
NSManagedObjectContext *context = [self MR_contextWithoutParent];
[context setParentContext:parentContext];
@@ -165,14 +165,14 @@ + (NSManagedObjectContext *) MR_contextWithParent:(NSManagedObjectContext *)pare
return context;
}
-+ (NSManagedObjectContext *) MR_newMainQueueContext;
++ (NSManagedObjectContext *) MR_newMainQueueContext
{
NSManagedObjectContext *context = [[self alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
MRLog(@"Created Main Queue Context: %@", context);
return context;
}
-+ (NSManagedObjectContext *) MR_contextWithStoreCoordinator:(NSPersistentStoreCoordinator *)coordinator;
++ (NSManagedObjectContext *) MR_contextWithStoreCoordinator:(NSPersistentStoreCoordinator *)coordinator
{
NSManagedObjectContext *context = nil;
if (coordinator != nil)
@@ -187,7 +187,7 @@ + (NSManagedObjectContext *) MR_contextWithStoreCoordinator:(NSPersistentStoreCo
return context;
}
-- (void) MR_obtainPermanentIDsBeforeSaving;
+- (void) MR_obtainPermanentIDsBeforeSaving
{
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(MR_contextWillSave:)
@@ -212,12 +212,12 @@ - (void) MR_contextWillSave:(NSNotification *)notification
}
}
-- (void) MR_setWorkingName:(NSString *)workingName;
+- (void) MR_setWorkingName:(NSString *)workingName
{
[[self userInfo] setObject:workingName forKey:kMagicalRecordNSManagedObjectContextWorkingName];
}
-- (NSString *) MR_workingName;
+- (NSString *) MR_workingName
{
NSString *workingName = [[self userInfo] objectForKey:kMagicalRecordNSManagedObjectContextWorkingName];
if (nil == workingName)
View
16 MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
@@ -20,7 +20,7 @@ - (void) MR_saveWithErrorCallback:(void(^)(NSError *))errorCallback;
@implementation NSManagedObjectContext (MagicalSaves)
-- (void) MR_saveWithErrorCallback:(void(^)(NSError *))errorCallback;
+- (void) MR_saveWithErrorCallback:(void(^)(NSError *))errorCallback
{
if (![self hasChanges])
{
@@ -58,17 +58,17 @@ - (void) MR_saveWithErrorCallback:(void(^)(NSError *))errorCallback;
}
}
-- (void) MR_saveNestedContexts;
+- (void) MR_saveNestedContexts
{
[self MR_saveNestedContextsErrorHandler:nil];
}
-- (void) MR_saveNestedContextsErrorHandler:(void (^)(NSError *))errorCallback;
+- (void) MR_saveNestedContextsErrorHandler:(void (^)(NSError *))errorCallback
{
[self MR_saveNestedContextsErrorHandler:nil completion:nil];
}
-- (void) MR_saveNestedContextsErrorHandler:(void (^)(NSError *))errorCallback completion:(void (^)(void))completion;
+- (void) MR_saveNestedContextsErrorHandler:(void (^)(NSError *))errorCallback completion:(void (^)(void))completion
{
[self performBlock:^{
[self MR_saveWithErrorCallback:errorCallback];
@@ -86,22 +86,22 @@ - (void) MR_saveNestedContextsErrorHandler:(void (^)(NSError *))errorCallback co
}];
}
-- (void) MR_save;
+- (void) MR_save
{
[self MR_saveWithErrorCallback:nil];
}
-- (void) MR_saveInBackgroundCompletion:(void (^)(void))completion;
+- (void) MR_saveInBackgroundCompletion:(void (^)(void))completion
{
[self MR_saveInBackgroundErrorHandler:nil completion:completion];
}
-- (void) MR_saveInBackgroundErrorHandler:(void (^)(NSError *))errorCallback;
+- (void) MR_saveInBackgroundErrorHandler:(void (^)(NSError *))errorCallback
{
[self MR_saveInBackgroundErrorHandler:errorCallback completion:nil];
}
-- (void) MR_saveInBackgroundErrorHandler:(void (^)(NSError *))errorCallback completion:(void (^)(void))completion;
+- (void) MR_saveInBackgroundErrorHandler:(void (^)(NSError *))errorCallback completion:(void (^)(void))completion
{
[self performBlock:^{
// Save the context
View
2  MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m
@@ -19,7 +19,7 @@ + (void)MR_resetContextForCurrentThread
[[NSManagedObjectContext MR_contextForCurrentThread] reset];
}
-+ (NSManagedObjectContext *) MR_contextForCurrentThread;
++ (NSManagedObjectContext *) MR_contextForCurrentThread
{
if ([NSThread isMainThread])
{
View
2  MagicalRecord/Categories/NSPersistentStore+MagicalRecord.m
@@ -59,7 +59,7 @@ + (NSURL *) MR_urlForStoreName:(NSString *)storeFileName
return [NSURL fileURLWithPath:[[self MR_applicationStorageDirectory] stringByAppendingPathComponent:storeFileName]];
}
-+ (NSURL *) MR_cloudURLForUbiqutiousContainer:(NSString *)bucketName;
++ (NSURL *) MR_cloudURLForUbiqutiousContainer:(NSString *)bucketName
{
NSFileManager *fileManager = [[NSFileManager alloc] init];
NSURL *cloudURL = nil;
View
16 MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
@@ -120,7 +120,7 @@ - (NSPersistentStore *) MR_addInMemoryStore
return store;
}
-+ (NSDictionary *) MR_autoMigrationOptions;
++ (NSDictionary *) MR_autoMigrationOptions
{
// Adding the journalling mode recommended by apple
NSMutableDictionary *sqliteOptions = [NSMutableDictionary dictionary];
@@ -134,7 +134,7 @@ + (NSDictionary *) MR_autoMigrationOptions;
return options;
}
-- (NSPersistentStore *) MR_addAutoMigratingSqliteStoreNamed:(NSString *) storeFileName;
+- (NSPersistentStore *) MR_addAutoMigratingSqliteStoreNamed:(NSString *) storeFileName
{
NSDictionary *options = [[self class] MR_autoMigrationOptions];
return [self MR_addSqliteStoreNamed:storeFileName withOptions:options];
@@ -177,7 +177,7 @@ + (NSPersistentStoreCoordinator *) MR_newPersistentStoreCoordinator
return coordinator;
}
-- (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)subPathComponent;
+- (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)subPathComponent
{
[self MR_addiCloudContainerID:containerID
contentNameKey:contentNameKey
@@ -186,7 +186,7 @@ - (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSStrin
completion:nil];
}
-- (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)subPathComponent completion:(void(^)(void))completionBlock;
+- (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)subPathComponent completion:(void(^)(void))completionBlock
{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -233,7 +233,7 @@ - (void) MR_addiCloudContainerID:(NSString *)containerID contentNameKey:(NSStrin
+ (NSPersistentStoreCoordinator *) MR_coordinatorWithiCloudContainerID:(NSString *)containerID
contentNameKey:(NSString *)contentNameKey
localStoreNamed:(NSString *)localStoreName
- cloudStorePathComponent:(NSString *)subPathComponent;
+ cloudStorePathComponent:(NSString *)subPathComponent
{
return [self MR_coordinatorWithiCloudContainerID:containerID
contentNameKey:contentNameKey
@@ -246,7 +246,7 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithiCloudContainerID:(NSString
contentNameKey:(NSString *)contentNameKey
localStoreNamed:(NSString *)localStoreName
cloudStorePathComponent:(NSString *)subPathComponent
- completion:(void(^)(void))completionHandler;
+ completion:(void(^)(void))completionHandler
{
NSManagedObjectModel *model = [NSManagedObjectModel MR_defaultManagedObjectModel];
NSPersistentStoreCoordinator *psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
@@ -260,7 +260,7 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithiCloudContainerID:(NSString
return psc;
}
-+ (NSPersistentStoreCoordinator *) MR_coordinatorWithPersistentStore:(NSPersistentStore *)persistentStore;
++ (NSPersistentStoreCoordinator *) MR_coordinatorWithPersistentStore:(NSPersistentStore *)persistentStore
{
NSManagedObjectModel *model = [NSManagedObjectModel MR_defaultManagedObjectModel];
NSPersistentStoreCoordinator *psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
@@ -289,7 +289,7 @@ + (NSPersistentStoreCoordinator *) MR_coordinatorWithSqliteStoreNamed:(NSString
@implementation NSDictionary (Merging)
-- (NSMutableDictionary *) MR_dictionaryByMergingDictionary:(NSDictionary *)d;
+- (NSMutableDictionary *) MR_dictionaryByMergingDictionary:(NSDictionary *)d
{
NSMutableDictionary *mutDict = [self mutableCopy];
[mutDict addEntriesFromDictionary:d];
View
8 MagicalRecord/Core/MagicalRecord+Actions.m
@@ -10,7 +10,7 @@
@implementation MagicalRecord (Actions)
-+ (void) saveInBackgroundUsingContext:(NSManagedObjectContext *)localContext block:(void (^)(NSManagedObjectContext *))block completion:(void(^)(void))completion errorHandler:(void(^)(NSError *))errorHandler;
++ (void) saveInBackgroundUsingContext:(NSManagedObjectContext *)localContext block:(void (^)(NSManagedObjectContext *))block completion:(void(^)(void))completion errorHandler:(void(^)(NSError *))errorHandler
{
[localContext performBlock: ^{
block(localContext);
@@ -19,7 +19,7 @@ + (void) saveInBackgroundUsingContext:(NSManagedObjectContext *)localContext blo
}];
}
-+ (void) saveInBackgroundWithBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler;
++ (void) saveInBackgroundWithBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler
{
NSManagedObjectContext *mainContext = [NSManagedObjectContext MR_defaultContext];
NSManagedObjectContext *localContext = [NSManagedObjectContext MR_contextWithParent:mainContext];
@@ -27,14 +27,14 @@ + (void) saveInBackgroundWithBlock:(void (^)(NSManagedObjectContext *))block com
[self saveInBackgroundUsingContext:localContext block:block completion:completion errorHandler:errorHandler];
}
-+ (void) saveInBackgroundUsingCurrentContextWithBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler;
++ (void) saveInBackgroundUsingCurrentContextWithBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler
{
NSManagedObjectContext *localContext = [NSManagedObjectContext MR_contextForCurrentThread];
[self saveInBackgroundUsingContext:localContext block:block completion:completion errorHandler:errorHandler];
}
-+ (void) saveWithBlock:(void (^)(NSManagedObjectContext *localContext))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler;
++ (void) saveWithBlock:(void (^)(NSManagedObjectContext *localContext))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler
{
NSManagedObjectContext *mainContext = [NSManagedObjectContext MR_defaultContext];
NSManagedObjectContext *localContext = [NSManagedObjectContext MR_contextWithParent:mainContext];
View
2  MagicalRecord/Core/MagicalRecord+ErrorHandling.m
@@ -15,7 +15,7 @@
@implementation MagicalRecord (ErrorHandling)
-+ (void) cleanUpErrorHanding;
++ (void) cleanUpErrorHanding
{
errorHandlerTarget = nil;
errorHandlerAction = nil;
View
10 MagicalRecord/Core/MagicalRecord+Options.m
@@ -16,27 +16,27 @@ @implementation MagicalRecord (Options)
#pragma mark - Options
-+ (BOOL) shouldAutoCreateManagedObjectModel;
++ (BOOL) shouldAutoCreateManagedObjectModel
{
return shouldAutoCreateManagedObjectModel_;
}
-+ (void) setShouldAutoCreateManagedObjectModel:(BOOL)shouldAutoCreate;
++ (void) setShouldAutoCreateManagedObjectModel:(BOOL)shouldAutoCreate
{
shouldAutoCreateManagedObjectModel_ = shouldAutoCreate;
}
-+ (BOOL) shouldAutoCreateDefaultPersistentStoreCoordinator;
++ (BOOL) shouldAutoCreateDefaultPersistentStoreCoordinator
{
return shouldAutoCreateDefaultPersistentStoreCoordinator_;
}
-+ (void) setShouldAutoCreateDefaultPersistentStoreCoordinator:(BOOL)shouldAutoCreate;
++ (void) setShouldAutoCreateDefaultPersistentStoreCoordinator:(BOOL)shouldAutoCreate
{
shouldAutoCreateDefaultPersistentStoreCoordinator_ = shouldAutoCreate;
}
-+ (BOOL) shouldDeleteStoreOnModelMismatch;
++ (BOOL) shouldDeleteStoreOnModelMismatch
{
return shouldDeleteStoreOnModelMismatch_;
}
View
2  MagicalRecord/Core/MagicalRecord+ShorthandSupport.m
@@ -56,7 +56,7 @@ + (void) updateResolveMethodsForClass:(Class)klass
replaceSelectorForTargetWithSourceImpAndSwizzle(self, @selector(MR_resolveInstanceMethod:), klass, @selector(resolveInstanceMethod:));
}
-+ (void) swizzleShorthandMethods;
++ (void) swizzleShorthandMethods
{
if (methodsHaveBeenSwizzled) return;
View
10 MagicalRecord/Core/MagicalRecord+iCloud.m
@@ -16,12 +16,12 @@ @implementation MagicalRecord (iCloud)
#pragma mark - iCloud Methods
-+ (BOOL) isICloudEnabled;
++ (BOOL) isICloudEnabled
{
return _iCloudEnabled;
}
-+ (void) setICloudEnabled:(BOOL)enabled;
++ (void) setICloudEnabled:(BOOL)enabled
{
@synchronized(self)
{
@@ -29,7 +29,7 @@ + (void) setICloudEnabled:(BOOL)enabled;
}
}
-+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localStoreNamed:(NSString *)localStore;
++ (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localStoreNamed:(NSString *)localStore
{
NSString *contentNameKey = [[[NSBundle mainBundle] infoDictionary] objectForKey:(id)kCFBundleIdentifierKey];
[self setupCoreDataStackWithiCloudContainer:icloudBucket
@@ -38,7 +38,7 @@ + (void) setupCoreDataStackWithiCloudContainer:(NSString *)icloudBucket localSto
cloudStorePathComponent:nil];
}
-+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent;
++ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent
{
[self setupCoreDataStackWithiCloudContainer:containerID
contentNameKey:contentNameKey
@@ -47,7 +47,7 @@ + (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNa
completion:nil];
}
-+ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent completion:(void(^)(void))completion;
++ (void) setupCoreDataStackWithiCloudContainer:(NSString *)containerID contentNameKey:(NSString *)contentNameKey localStoreNamed:(NSString *)localStoreName cloudStorePathComponent:(NSString *)pathSubcomponent completion:(void(^)(void))completion
{
NSPersistentStoreCoordinator *coordinator = [NSPersistentStoreCoordinator MR_coordinatorWithiCloudContainerID:containerID
contentNameKey:contentNameKey
View
10 MagicalRecord/Core/MagicalRecord.m
@@ -29,7 +29,7 @@ + (void) cleanUp
[self cleanUpStack];
}
-+ (void) cleanUpStack;
++ (void) cleanUpStack
{
[NSManagedObjectContext MR_cleanUp];
[NSManagedObjectModel MR_setDefaultManagedObjectModel:nil];
@@ -50,20 +50,20 @@ + (NSString *) currentStack
return status;
}
-+ (void) setDefaultModelNamed:(NSString *)modelName;
++ (void) setDefaultModelNamed:(NSString *)modelName
{
NSManagedObjectModel *model = [NSManagedObjectModel MR_managedObjectModelNamed:modelName];
[NSManagedObjectModel MR_setDefaultManagedObjectModel:model];
}
-+ (void) setDefaultModelFromClass:(Class)klass;
++ (void) setDefaultModelFromClass:(Class)klass
{
NSBundle *bundle = [NSBundle bundleForClass:klass];
NSManagedObjectModel *model = [NSManagedObjectModel mergedModelFromBundles:[NSArray arrayWithObject:bundle]];
[NSManagedObjectModel MR_setDefaultManagedObjectModel:model];
}
-+ (NSString *) defaultStoreName;
++ (NSString *) defaultStoreName
{
NSString *defaultName = [[[NSBundle mainBundle] infoDictionary] valueForKey:(id)kCFBundleNameKey];
if (defaultName == nil)
@@ -81,7 +81,7 @@ + (NSString *) defaultStoreName;
#pragma mark - initialize
-+ (void) initialize;
++ (void) initialize
{
if (self == [MagicalRecord class])
{
View
2  Project Files/Unit Tests/Fixtures/FixtureHelpers.m
@@ -41,7 +41,7 @@ + (id) dataFromJSONFixtureNamed:(NSString *)fixtureName
@implementation GHTestCase (FixtureHelpers)
-- (id) dataFromJSONFixture;
+- (id) dataFromJSONFixture
{
NSString *className = NSStringFromClass([self class]);
className = [className stringByReplacingOccurrencesOfString:@"Import" withString:@""];
Something went wrong with that request. Please try again.