Merge pull request #81 from aufflick/master

Arc migration
AlanQuatermain · Dec 1, 2011 · 4072978 · 4072978
2 parents 90ab0f3 + 12b747d
commit 4072978
Show file tree

Hide file tree

Showing 21 changed files with 321 additions and 452 deletions.
diff --git a/AQGridView.xcodeproj/project.pbxproj b/AQGridView.xcodeproj/project.pbxproj
@@ -281,6 +281,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/AQGridView.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -292,6 +293,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = BUILTIN_IMAGES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				PRODUCT_NAME = AQGridView;
 			};
 			name = Debug;
@@ -301,13 +303,15 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/AQGridView.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = AQGridView_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = BUILTIN_IMAGES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				PRODUCT_NAME = AQGridView;
 			};
 			name = Release;

diff --git a/Classes/AQGridView.h b/Classes/AQGridView.h
@@ -97,7 +97,7 @@ extern NSString * const AQGridViewSelectionDidChangeNotification;
 
 @interface AQGridView : UIScrollView
 {
-	id<AQGridViewDataSource>		_dataSource;
+	id<AQGridViewDataSource>		__unsafe_unretained _dataSource;
 
 	AQGridViewData *				_gridData;
 	NSMutableArray *				_updateInfoStack;