Turned on ARC for DelaunayTest, and the whole Edgy project (though ev…

…erything else already used it)
mrotondo · Jun 22, 2013 · c5107e1 · c5107e1
1 parent cf3f289
commit c5107e1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/DelaunayTest/main.m b/DelaunayTest/main.m
@@ -7,11 +7,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "DelaunayTestAppDelegate.h"
 
 int main(int argc, char *argv[])
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, nil);
-    [pool release];
-    return retVal;
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([DelaunayTestAppDelegate class]));
+    }
 }
diff --git a/Edgy.xcodeproj/project.pbxproj b/Edgy.xcodeproj/project.pbxproj
@@ -762,6 +762,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -780,6 +781,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -832,6 +834,7 @@
 				D508BBAC17714D5600D36144 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		D508BBB017714D5600D36144 /* Build configuration list for PBXNativeTarget "Edgy DemoTests" */ = {
 			isa = XCConfigurationList;
@@ -840,6 +843,7 @@
 				D508BBAE17714D5600D36144 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		D5A55A1713EE19130001ADF7 /* Build configuration list for PBXNativeTarget "Edgy iOS" */ = {
 			isa = XCConfigurationList;

diff --git a/Edgy/DelaunayPoint.h b/Edgy/DelaunayPoint.h
@@ -19,7 +19,7 @@
 @property (nonatomic, strong) id value;
 @property (nonatomic, strong) UIColor *color;
 
-+ (DelaunayPoint *) pointAtX:(float)x andY:(float)y;
++ (DelaunayPoint *)pointAtX:(float)x andY:(float)y;
 + (DelaunayPoint *)pointAtX:(float)newX andY:(float)newY withID:(NSNumber *)idNumber;
 - (NSArray *)counterClockwiseEdges;
 

diff --git a/Edgy/DelaunayTriangulation.h b/Edgy/DelaunayTriangulation.h
@@ -28,6 +28,7 @@
 + (DelaunayTriangulation *)triangulationWithRect:(CGRect)rect;
 - (BOOL)addPoint:(DelaunayPoint *)newPoint withColor:(UIColor *)color;
 - (DelaunayTriangle *)triangleContainingPoint:(DelaunayPoint *)point;
+- (void)enforceDelaunayProperty;
 - (NSDictionary*)voronoiCells;
 - (void)interpolateWeightsWithPoint:(DelaunayPoint *)point;