(fixes issue 389) CoreData compile fixes by sgraesser

This commit is contained in:
Christopher Lloyd 2009-10-19 13:59:16 +00:00
parent b50419735e
commit 19b5f7b30d
11 changed files with 24 additions and 17 deletions

View File

@ -7,13 +7,13 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import "NSAttributeDescription.h"
#import "NSEntityDescription.h"
#import <AppKit/NSNibKeyedUnarchiver.h>
#import <Foundation/NSKeyedUnarchiver.h>
@implementation NSAttributeDescription
- (id) initWithCoder: (NSCoder *) coder {
if([coder isKindOfClass: [NSNibKeyedUnarchiver class]]) {
NSNibKeyedUnarchiver *keyed = (NSNibKeyedUnarchiver *) coder;
if([coder isKindOfClass: [NSKeyedUnarchiver class]]) {
NSKeyedUnarchiver *keyed = (NSKeyedUnarchiver *) coder;
_attributeType = [keyed decodeIntForKey: @"NSAttributeType"];
_valueClassName
= [[keyed decodeObjectForKey: @"NSAttributeValueClassName"] retain];

View File

@ -13,7 +13,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import "NSAttributeDescription.h"
#import "NSRelationshipDescription.h"
#import "NSManagedObject.h"
#import <AppKit/NSNibKeyedUnarchiver.h>
#import <Foundation/NSKeyedUnarchiver.h>
#import <AppKit/NSRaise.h>
#import <objc/objc-class.h>
#import <ctype.h>
#import <string.h>
@ -24,8 +25,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@synthesize _selectorPropertyMap;
- (id) initWithCoder: (NSCoder *) coder {
if([coder isKindOfClass: [NSNibKeyedUnarchiver class]]) {
NSNibKeyedUnarchiver *keyed = (NSNibKeyedUnarchiver *) coder;
if([coder isKindOfClass: [NSKeyedUnarchiver class]]) {
NSKeyedUnarchiver *keyed = (NSKeyedUnarchiver *) coder;
_className = [[keyed decodeObjectForKey: @"NSClassNameForEntity"] retain];
_name = [[keyed decodeObjectForKey: @"NSEntityName"] retain];
_model = [keyed decodeObjectForKey: @"NSManagedObjectModel"];

View File

@ -9,6 +9,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import "NSManagedObject.h"
#import "NSManagedObjectContext.h"
#import "NSEntityDescription.h"
#import <AppKit/NSRaise.h>
@implementation NSFetchRequest

View File

@ -9,6 +9,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import "NSManagedObjectContext.h"
#import "NSEntityDescription.h"
#import "NSPropertyDescription.h"
#import <AppKit/NSRaise.h>
@implementation NSManagedObject

View File

@ -11,6 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import "_NSManagedProxy.h"
#import <Foundation/Foundation.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSRaise.h>
@implementation NSManagedObjectContext

View File

@ -6,7 +6,8 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import "NSManagedObjectModel.h"
#import <AppKit/NSNibKeyedUnarchiver.h>
#import <Foundation/NSKeyedUnarchiver.h>
#import <AppKit/NSRaise.h>
@implementation NSManagedObjectModel
@ -19,8 +20,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
if(!data) return nil;
NSDictionary *nameTable
= [NSDictionary dictionaryWithObject: self forKey: @"NSOwner"];
NSNibKeyedUnarchiver *unarchiver
= [[[NSNibKeyedUnarchiver alloc] initForReadingWithData: data
NSKeyedUnarchiver *unarchiver
= [[[NSKeyedUnarchiver alloc] initForReadingWithData: data
externalNameTable: nameTable] autorelease];
NSManagedObjectModel *result = [unarchiver decodeObjectForKey: @"root"];
return result;
@ -28,8 +29,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
- (id) initWithCoder: (NSCoder *) coder {
if([coder isKindOfClass: [NSNibKeyedUnarchiver class]]) {
NSNibKeyedUnarchiver *keyed = (NSNibKeyedUnarchiver *) coder;
if([coder isKindOfClass: [NSKeyedUnarchiver class]]) {
NSKeyedUnarchiver *keyed = (NSKeyedUnarchiver *) coder;
_entities = [[keyed decodeObjectForKey: @"NSEntities"] retain];
_fetchRequestTemplates
= [[keyed decodeObjectForKey: @"NSFetchRequestTemplates"] retain];

View File

@ -6,6 +6,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import "NSPersistentStoreCoordinator.h"
#import <AppKit/NSRaise.h>
@implementation NSPersistentStoreCoordinator

View File

@ -6,6 +6,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import "NSPropertyDescription.h"
#import <AppKit/NSRaise.h>
@implementation NSPropertyDescription

View File

@ -7,13 +7,13 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import "NSRelationshipDescription.h"
#import "NSEntityDescription.h"
#import <AppKit/NSNibKeyedUnarchiver.h>
#import <Foundation/NSKeyedUnarchiver.h>
@implementation NSRelationshipDescription
- (id) initWithCoder: (NSCoder *) coder {
if([coder isKindOfClass: [NSNibKeyedUnarchiver class]]) {
NSNibKeyedUnarchiver *keyed = (NSNibKeyedUnarchiver *) coder;
if([coder isKindOfClass: [NSKeyedUnarchiver class]]) {
NSKeyedUnarchiver *keyed = (NSKeyedUnarchiver *) coder;
_deleteRule = [keyed decodeIntForKey: @"NSDeleteRule"];
_destinationEntity = [keyed decodeObjectForKey: @"NSDestinationEntity"];
_entity = [keyed decodeObjectForKey: @"NSEntity"];

View File

@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
// -*- mode: objc -*-
#import <Cocoa/Cocoa.h>
#import <AppKit/NSNibKeyedUnarchiver.h>
#import <Foundation/NSKeyedUnarchiver.h>
@interface _NSManagedProxy_observerInfo : NSObject {

View File

@ -23,8 +23,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@implementation _NSManagedProxy
- (id) initWithCoder: (NSCoder *) coder {
if([coder isKindOfClass: [NSNibKeyedUnarchiver class]]){
NSNibKeyedUnarchiver *keyed = (NSNibKeyedUnarchiver *) coder;
if([coder isKindOfClass: [NSKeyedUnarchiver class]]){
NSKeyedUnarchiver *keyed = (NSKeyedUnarchiver *) coder;
_object = nil;
_context = nil;
_entity = nil;