コミット: 69a2adcaaffc073e4c8d9d51583dc042e3146351 - CDEvents (git)

An Objective-C wrapper for Mac OS X’s FSEvents C API.

コミットメタ情報

• リビジョン: 69a2adcaaffc073e4c8d9d51583dc042e3146351 (tree)
• 日時: 2011-08-18 03:35:37
• 作者: Aron Cedercrantz <aron@cede...>
• コミッター: Aron Cedercrantz

ログメッセージ

Updated project for ARC.

変更サマリ

• modified: CDEvent.h
• modified: CDEvent.m
• modified: CDEvents.h
• modified: CDEvents.m
• modified: CDEvents.xcodeproj/project.pbxproj

差分

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -71,8 +71,8 @@ typedef FSEventStreamEventFlags CDEventFlags;
 @interface CDEvent : NSObject <NSCoding, NSCopying> {
 @private
 	CDEventIdentifier			_identifier;
-	NSDate						*_date;
-	NSURL						*_URL;
+	NSDate						*__weak _date;
+	NSURL						*__weak _URL;
 	CDEventFlags				_flags;
 }
 
@@ -96,7 +96,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  *
  * @since 1.0.0
  */
-@property (readonly) NSDate						*date;
+@property (weak, readonly) NSDate						*date;
 
 /**
  * The URL of the item which changed.
@@ -105,7 +105,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  *
  * @since 1.0.0
  */
-@property (readonly) NSURL						*URL;
+@property (weak, readonly) NSURL						*URL;
 
 
 /** @name Getting Event Flags */

--- a/CDEvent.m
+++ b/CDEvent.m
@@ -44,22 +44,14 @@
 							 URL:(NSURL *)URL
 						   flags:(CDEventFlags)flags
 {
-	return [[[CDEvent alloc] initWithIdentifier:identifier
+	return [[CDEvent alloc] initWithIdentifier:identifier
 										   date:date
 											URL:URL
-										  flags:flags]
-			autorelease];
+										  flags:flags];
 }
 
 
 #pragma mark Init/dealloc methods
-- (void)dealloc
-{
-	[_date release];
-	[_URL release];
-	
-	[super dealloc];
-}
 
 - (id)initWithIdentifier:(NSUInteger)identifier
 					date:(NSDate *)date
@@ -69,8 +61,8 @@
 	if ((self = [super init])) {
 		_identifier	= identifier;
 		_flags		= flags;
-		_date		= [date retain];
-		_URL		= [URL retain];
+		_date		= date;
+		_URL		= URL;
 	}
 	
 	return self;
@@ -101,7 +93,7 @@
 - (id)copyWithZone:(NSZone *)zone
 {
 	// We can do this since we are immutable.
-	return [self retain];
+	return self;
 }
 
 

--- a/CDEvents.h
+++ b/CDEvents.h
@@ -107,20 +107,20 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  */
 @interface CDEvents : NSObject <NSCopying> {
 @private
-	__weak id<CDEventsDelegate>	_delegate;
+	//__weak id<CDEventsDelegate>		_delegate;
 	
 	FSEventStreamRef			_eventStream;
-	CFTimeInterval				_notificationLatency;
+	//CFTimeInterval				_notificationLatency;
 	
-	CDEventIdentifier			_sinceEventIdentifier;
+	//CDEventIdentifier			_sinceEventIdentifier;
 	NSUInteger					_eventStreamCreationFlags;
 	
-	BOOL						_ignoreEventsFromSubDirectories;
+	//BOOL						_ignoreEventsFromSubDirectories;
 	
-	CDEvent						*_lastEvent;
+	//CDEvent						*_lastEvent;
 	
-	NSArray						*_watchedURLs;
-	NSArray						*_excludedURLs;
+	//NSArray						*_watchedURLs;
+	//NSArray						*_excludedURLs;
 }
 
 #pragma mark Properties
@@ -135,7 +135,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (assign) __weak id<CDEventsDelegate>	delegate;
+@property (weak) id<CDEventsDelegate>			delegate;
 
 /** @name Getting Event Watcher Properties */
 /**
@@ -163,7 +163,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (retain, readonly) CDEvent			*lastEvent;
+@property (strong, readonly) CDEvent			*lastEvent;
 
 /**
  * The URLs that we watch for events.
@@ -172,7 +172,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (readonly) NSArray					*watchedURLs;
+@property (strong, readonly) NSArray			*watchedURLs;
 
 
 /** @name Configuring the Event watcher */

--- a/CDEvents.m
+++ b/CDEvents.m
@@ -27,7 +27,8 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
 // Private API
 @interface CDEvents ()
 
-@property (retain, readwrite) CDEvent *lastEvent;
+@property (strong, readwrite) CDEvent *lastEvent;
+@property (strong, readwrite) NSArray *watchedURLs;
 
 // The FSEvents callback function
 static void CDEventsCallback(
@@ -74,11 +75,7 @@ static void CDEventsCallback(
 	
 	_delegate = nil;
 	
-	[_lastEvent release];
-	[_watchedURLs release];
-	[_excludedURLs release];
 	
-	[super dealloc];
 }
 
 - (void)finalize
@@ -193,10 +190,10 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 - (NSString *)streamDescription
 {
 	CFStringRef streamDescriptionCF = FSEventStreamCopyDescription(_eventStream);
-	NSString *returnString = [[NSString alloc] initWithString:(NSString *)streamDescriptionCF];
+	NSString *returnString = [[NSString alloc] initWithString:(__bridge NSString *)streamDescriptionCF];
 	CFRelease(streamDescriptionCF);
 	
-	return [returnString autorelease];
+	return returnString;
 }
 
 
@@ -205,7 +202,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 {
 	FSEventStreamContext callbackCtx;
 	callbackCtx.version			= 0;
-	callbackCtx.info			= (void *)self;
+	callbackCtx.info			= (__bridge void *)self;
 	callbackCtx.retain			= NULL;
 	callbackCtx.release			= NULL;
 	callbackCtx.copyDescription	= NULL;
@@ -218,7 +215,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 	_eventStream = FSEventStreamCreate(kCFAllocatorDefault,
 									   &CDEventsCallback,
 									   &callbackCtx,
-									   (CFArrayRef)watchedPaths,
+									   (__bridge CFArrayRef)watchedPaths,
 									   (FSEventStreamEventId)[self sinceEventIdentifier],
 									   [self notificationLatency],
 									   _eventStreamCreationFlags);
@@ -244,11 +241,11 @@ static void CDEventsCallback(
 	const FSEventStreamEventFlags eventFlags[],
 	const FSEventStreamEventId eventIds[])
 {
-	CDEvents *watcher = (CDEvents *)callbackCtxInfo;
+	CDEvents *watcher = (__bridge CDEvents *)callbackCtxInfo;
 	
 	NSArray *watchedURLs		= [watcher watchedURLs];
 	NSArray *excludedURLs		= [watcher excludedURLs];
-	NSArray *eventPathsArray	= (NSArray *)eventPaths;
+	NSArray *eventPathsArray	= (__bridge NSArray *)eventPaths;
 	BOOL shouldIgnore = NO;
 	
 	for (NSUInteger i = 0; i < numEvents; ++i) {
@@ -293,7 +290,6 @@ static void CDEventsCallback(
 				[watcher setLastEvent:event];
 			}
 			
-			[event release];
 		}
 	}
 	

--- a/CDEvents.xcodeproj/project.pbxproj
+++ b/CDEvents.xcodeproj/project.pbxproj
@@ -321,13 +321,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_ENABLE_OBJC_GC = supported;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -344,11 +345,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_OBJC_GC = supported;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
@@ -363,16 +365,13 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					x86_64,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				RUN_CLANG_STATIC_ANALYZER = YES;
@@ -383,15 +382,12 @@
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					x86_64,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PREBINDING = NO;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx;