Skip to content

Feature arc #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psineur wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feature arc #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7516b25
Merge branch 'release-1.0'
psineur Dec 18, 2011
e97f583
Merge branch 'release-1.1'
psineur Jan 31, 2012
497644b
convert to ARC
jwilling May 23, 2012
b93869d
convert projects to ARC
jwilling May 23, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions AutoMagicCoding-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
FD8C3CE1149E366200FAA45D /* NSObject+AutoMagicCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AutoMagicCoding.h"; sourceTree = "<group>"; };
FD8C3CE2149E366200FAA45D /* NSObject+AutoMagicCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AutoMagicCoding.m"; sourceTree = "<group>"; };
FDA4D40F14D6DABA00B9AE2A /* CHANGELOG */ = {isa = PBXFileReference; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests copy.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "AutoMagicCoding-iOSTests copy.octest"; path = "AutoMagicCoding-iOSTests-NO_THROW.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests-NO_THROW.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AutoMagicCoding-iOSTests-NO_THROW.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
FDB80DBE149E300F001E95AA /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
FDB80DC1149E300F001E95AA /* AutoMagicCoding-iOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "AutoMagicCoding-iOS-Info.plist"; sourceTree = "<group>"; };
FDB80DC2149E300F001E95AA /* AutoMagicCoding-iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AutoMagicCoding-iOS-Prefix.pch"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -179,7 +179,7 @@
children = (
6D6D28B81411608600B7EA19 /* AutoMagicCoding-iOS.app */,
6D6D28E11411608600B7EA19 /* AutoMagicCoding-iOSTests.octest */,
FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests copy.octest */,
FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests-NO_THROW.octest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -350,7 +350,7 @@
);
name = "AutoMagicCoding-iOSTests AMC_NO_THROW";
productName = "AutoMagicCoding-iOSTests";
productReference = FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests copy.octest */;
productReference = FDB80D16149E268F001E95AA /* AutoMagicCoding-iOSTests-NO_THROW.octest */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -592,23 +592,27 @@
6D6D28F61411608600B7EA19 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SupportingFiles/SupportingFiles-iOS/AutoMagicCoding-iOS-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SupportingFiles/SupportingFiles-iOS/AutoMagicCoding-iOS-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
WRAPPER_EXTENSION = app;
};
name = Debug;
};
6D6D28F71411608600B7EA19 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SupportingFiles/SupportingFiles-iOS/AutoMagicCoding-iOS-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SupportingFiles/SupportingFiles-iOS/AutoMagicCoding-iOS-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
6 changes: 1 addition & 5 deletions AutoMagicCoding/NSObject+AutoMagicCoding.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ + (id) objectWithDictionaryRepresentation: (NSDictionary *) aDict
Class rClass = NSClassFromString(className);
if ( rClass && [rClass instancesRespondToSelector:@selector(initWithDictionaryRepresentation:) ] )
{
id instance = [[[rClass alloc] initWithDictionaryRepresentation: aDict] autorelease];
id instance = [[rClass alloc] initWithDictionaryRepresentation: aDict];
return instance;
}

Expand Down Expand Up @@ -128,8 +128,6 @@ - (id) initWithDictionaryRepresentation: (NSDictionary *) aDict
}

@catch (NSException *exception) {
[self release];

#ifdef AMC_NO_THROW
return nil;
#else
Expand Down Expand Up @@ -545,7 +543,6 @@ id AMCDecodeObject (id value, AMCFieldType fieldType, id collectionClass )
object = [object initWithArray: dstCollection];
}
@finally {
[object autorelease];
}

if (object)
Expand Down Expand Up @@ -582,7 +579,6 @@ id AMCDecodeObject (id value, AMCFieldType fieldType, id collectionClass )
object = [object initWithDictionary: dstCollection];
}
@finally {
[object autorelease];
}

if (object)
Expand Down
6 changes: 6 additions & 0 deletions AutomagicCoding.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,8 @@
6D6B98C1140E162700835E88 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
Expand All @@ -569,6 +571,7 @@
GCC_PREFIX_HEADER = "SupportingFiles/SupportingFiles-Mac/AutomagicCoding-Prefix.pch";
INFOPLIST_FILE = "SupportingFiles/SupportingFiles-Mac/AutomagicCoding-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
TEST_AFTER_BUILD = YES;
TEST_HOST = "";
TEST_RIG = "";
Expand All @@ -579,6 +582,8 @@
6D6B98C2140E162700835E88 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
Expand All @@ -587,6 +592,7 @@
GCC_PREFIX_HEADER = "SupportingFiles/SupportingFiles-Mac/AutomagicCoding-Prefix.pch";
INFOPLIST_FILE = "SupportingFiles/SupportingFiles-Mac/AutomagicCoding-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
TEST_AFTER_BUILD = YES;
TEST_HOST = "";
TEST_RIG = "";
Expand Down
2 changes: 1 addition & 1 deletion SupportingFiles/SupportingFiles-iOS/AutoMagicCoding_iOSAppDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

@interface AutoMagicCoding_iOSAppDelegate : NSObject <UIApplicationDelegate>

@property (nonatomic, retain) IBOutlet UIWindow *window;
@property (nonatomic, strong) IBOutlet UIWindow *window;

@end
5 changes: 0 additions & 5 deletions SupportingFiles/SupportingFiles-iOS/AutoMagicCoding_iOSAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,5 @@ - (void)applicationWillTerminate:(UIApplication *)application
*/
}

- (void)dealloc
{
[_window release];
[super dealloc];
}

@end
8 changes: 4 additions & 4 deletions SupportingFiles/SupportingFiles-iOS/main.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

int main(int argc, char *argv[])
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
int retVal = UIApplicationMain(argc, argv, nil, nil);
[pool release];
return retVal;
@autoreleasepool {
int retVal = UIApplicationMain(argc, argv, nil, nil);
return retVal;
}
}