• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

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


Commit MetaInfo

Révision58ab9283660faf83b1ebbeefa69e8d74c973c18e (tree)
l'heure2010-04-04 17:38:28
AuteurAron Cedercrantz <aron@cede...>
CommiterAron Cedercrantz

Message de Log

Merge branch 'release/1.0.1'

Change Summary

Modification

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -46,6 +46,13 @@
4646 */
4747 typedef NSUInteger CDEventIdentifier;
4848
49+/**
50+ * The event stream event flags type.
51+ *
52+ * @since 1.0.1
53+ */
54+typedef NSUInteger CDEventFlags;
55+
4956
5057 /**
5158 * An Objective-C wrapper for a <code>FSEvents</code> event data.
@@ -62,7 +69,7 @@ typedef NSUInteger CDEventIdentifier;
6269 CDEventIdentifier _identifier;
6370 NSDate *_date;
6471 NSURL *_URL;
65- FSEventStreamEventFlags _flags;
72+ CDEventFlags _flags;
6673 }
6774
6875 #pragma mark Properties
@@ -106,7 +113,7 @@ typedef NSUInteger CDEventIdentifier;
106113 *
107114 * @since 1.0.0
108115 */
109-@property (readonly) FSEventStreamEventFlags flags;
116+@property (readonly) CDEventFlags flags;
110117
111118 #pragma mark Class object creators
112119
@@ -127,7 +134,7 @@ typedef NSUInteger CDEventIdentifier;
127134 + (CDEvent *)eventWithIdentifier:(NSUInteger)identifier
128135 date:(NSDate *)date
129136 URL:(NSURL *)URL
130- flags:(FSEventStreamEventFlags)flags;
137+ flags:(CDEventFlags)flags;
131138
132139 #pragma mark Init methods
133140 /**
@@ -146,6 +153,6 @@ typedef NSUInteger CDEventIdentifier;
146153 - (id)initWithIdentifier:(NSUInteger)identifier
147154 date:(NSDate *)date
148155 URL:(NSURL *)URL
149- flags:(FSEventStreamEventFlags)flags;
156+ flags:(CDEventFlags)flags;
150157
151158 @end
--- a/CDEvents.m
+++ b/CDEvents.m
@@ -146,15 +146,14 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
146146 #pragma mark NSCopying method
147147 - (id)copyWithZone:(NSZone *)zone
148148 {
149- CDEvents *copy = [[CDEvents alloc] init];
150-
151- copy->_delegate = _delegate;
152- copy->_notificationLatency = [self notificationLatency];
153- copy->_ignoreEventsFromSubDirectories = [self ignoreEventsFromSubDirectories];
154- copy->_lastEvent = [[self lastEvent] retain];
155- copy->_sinceEventIdentifier = _sinceEventIdentifier;
156- copy->_watchedURLs = [[self watchedURLs] copyWithZone:zone];
157- copy->_excludedURLs = [[self excludedURLs] copyWithZone:zone];
149+ CDEvents *copy = [[CDEvents alloc] initWithURLs:[self watchedURLs]
150+ delegate:[self delegate]
151+ onRunLoop:[NSRunLoop currentRunLoop]
152+ sinceEventIdentifier:[self sinceEventIdentifier]
153+ notificationLantency:[self notificationLatency]
154+ ignoreEventsFromSubDirs:[self ignoreEventsFromSubDirectories]
155+ excludeURLs:[self excludedURLs]
156+ streamCreationFlags:_eventStreamCreationFlags];
158157
159158 return copy;
160159 }
--- a/CDEvents.xcodeproj/project.pbxproj
+++ b/CDEvents.xcodeproj/project.pbxproj
@@ -26,7 +26,7 @@
2626 isa = PBXContainerItemProxy;
2727 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2828 proxyType = 1;
29- remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* CDEvents */;
29+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
3030 remoteInfo = CDEvents;
3131 };
3232 /* End PBXContainerItemProxy section */
@@ -325,8 +325,9 @@
325325 GCC_OPTIMIZATION_LEVEL = 0;
326326 GCC_PRECOMPILE_PREFIX_HEADER = YES;
327327 GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
328+ GCC_VERSION = "";
328329 INFOPLIST_FILE = Info.plist;
329- INSTALL_PATH = "@rpath";
330+ INSTALL_PATH = "@loader_path/../Frameworks";
330331 PRODUCT_NAME = CDEvents;
331332 WRAPPER_EXTENSION = framework;
332333 };
@@ -344,8 +345,9 @@
344345 GCC_MODEL_TUNING = G5;
345346 GCC_PRECOMPILE_PREFIX_HEADER = YES;
346347 GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
348+ GCC_VERSION = "";
347349 INFOPLIST_FILE = Info.plist;
348- INSTALL_PATH = "@rpath";
350+ INSTALL_PATH = "@loader_path/../Frameworks";
349351 PRODUCT_NAME = CDEvents;
350352 WRAPPER_EXTENSION = framework;
351353 };