Permalink
Browse files

Fix broken merge

Remove references to NSFetchedResultsController for mac apps
  • Loading branch information...
1 parent 5c5ea83 commit 2fbd008fba03d248ee2a097fcc3fa2f615101fb3 @casademora casademora committed May 9, 2012
Showing with 4 additions and 15 deletions.
  1. +4 −0 MagicalRecord/Core/MagicalRecordShorthand.h
  2. +0 −15 MagicalRecord/CoreData+MagicalRecord.h
@@ -54,12 +54,14 @@
+ (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context;
+ (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending;
+ (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+ (NSFetchedResultsController *) fetchAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm groupBy:(NSString *)groupingKeyPath delegate:(id<NSFetchedResultsControllerDelegate>)delegate;
+ (NSFetchedResultsController *) fetchAllSortedBy:(NSString *)sortTerm ascending:(BOOL)ascending withPredicate:(NSPredicate *)searchTerm groupBy:(NSString *)groupingKeyPath delegate:(id<NSFetchedResultsControllerDelegate>)delegate inContext:(NSManagedObjectContext *)context;
+ (NSFetchedResultsController *) fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending;
+ (NSFetchedResultsController *) fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
+ (NSFetchedResultsController *) fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending delegate:(id<NSFetchedResultsControllerDelegate>)delegate;
+ (NSFetchedResultsController *) fetchAllGroupedBy:(NSString *)group withPredicate:(NSPredicate *)searchTerm sortedBy:(NSString *)sortTerm ascending:(BOOL)ascending delegate:(id<NSFetchedResultsControllerDelegate>)delegate inContext:(NSManagedObjectContext *)context;
+#endif
@end
@interface NSManagedObject (MagicalRecordShortHand)
+ (NSUInteger) defaultBatchSize;
@@ -68,7 +70,9 @@
+ (NSArray *) executeFetchRequest:(NSFetchRequest *)request inContext:(NSManagedObjectContext *)context;
+ (id) executeFetchRequestAndReturnFirstObject:(NSFetchRequest *)request;
+ (id) executeFetchRequestAndReturnFirstObject:(NSFetchRequest *)request inContext:(NSManagedObjectContext *)context;
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+ (void) performFetch:(NSFetchedResultsController *)controller;
+#endif
+ (NSEntityDescription *) entityDescription;
+ (NSEntityDescription *) entityDescriptionInContext:(NSManagedObjectContext *)context;
+ (NSArray *) propertiesNamed:(NSArray *)properties;
@@ -45,18 +45,3 @@
#import "NSEntityDescription+MagicalDataImport.h"
#endif
-g.h"
- #import "NSPersistentStoreCoordinator+MagicalRecord.h"
- #import "NSManagedObjectModel+MagicalRecord.h"
- #import "NSPersistentStore+MagicalRecord.h"
-
- #import "MagicalImportFunctions.h"
- #import "NSManagedObject+MagicalDataImport.h"
- #import "NSNumber+MagicalDataImport.h"
- #import "NSObject+MagicalDataImport.h"
- #import "NSString+MagicalDataImport.h"
- #import "NSAttributeDescription+MagicalDataImport.h"
- #import "NSRelationshipDescription+MagicalDataImport.h"
- #import "NSEntityDescription+MagicalDataImport.h"
-
-#endif

0 comments on commit 2fbd008

Please sign in to comment.