Permalink
Browse files

Merge branch 'master' of https://github.com/bengotow/MultistrokeGestu…

…reRecognizer-iOS

Conflicts:
	WTMGlyph/WTMGlyph.m
	WTMGlyph/WTMGlyphDetector.m
	WTMGlyph/WTMGlyphTemplate.h
	WTMGlyph/WTMGlyphTemplate.m
  • Loading branch information...
2 parents e3cecce + 8def3c9 commit 992c176c86cd9d1699499b22a2b11abf8c2f8484 @bengotow bengotow committed Jan 27, 2013
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -356,7 +356,7 @@
EA6C92ED136DA457008AD709 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0450;
ORGANIZATIONNAME = "Warrior Thief Mage Studios";
};
buildConfigurationList = EA6C92F0136DA457008AD709 /* Build configuration list for PBXProject "WTMGlyph" */;
@@ -494,9 +494,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/WTMGlyph.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WTMGlyph/WTMGlyph-Prefix.pch";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /tmp;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -508,9 +510,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/WTMGlyph.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WTMGlyph/WTMGlyph-Prefix.pch";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INSTALL_PATH = /tmp;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -528,6 +532,7 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WTMGlyphTests/WTMGlyphTests-Prefix.pch";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "WTMGlyphTests/WTMGlyphTests-Info.plist";
OTHER_LDFLAGS = (
"-framework",
@@ -548,6 +553,7 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "WTMGlyphTests/WTMGlyphTests-Prefix.pch";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "WTMGlyphTests/WTMGlyphTests-Info.plist";
OTHER_LDFLAGS = (
"-framework",
@@ -40,7 +40,7 @@
NSUInteger length;
}
-@property (readwrite, nonatomic, retain) NSData *data;
+@property (readwrite, nonatomic, strong) NSData *data;
@property (readwrite, nonatomic, assign) NSUInteger scanLocation;
@property (readonly, nonatomic, assign) NSUInteger bytesRemaining;
@property (readonly, nonatomic, assign) BOOL isAtEnd;
@@ -74,16 +74,14 @@ + (void)initialize
{
if (sDoubleCharacters == NULL)
{
- sDoubleCharacters = [[NSCharacterSet characterSetWithCharactersInString:@"0123456789eE-+."] retain];
+ sDoubleCharacters = [NSCharacterSet characterSetWithCharactersInString:@"0123456789eE-+."];
}
}
- (void)dealloc
{
- [data release];
data = NULL;
//
- [super dealloc];
}
- (NSUInteger)scanLocation
@@ -105,8 +103,7 @@ - (void)setData:(NSData *)inData
{
if (data != inData)
{
- [data release];
- data = [inData retain];
+ data = inData;
}
if (data)
@@ -202,7 +199,7 @@ - (BOOL)scanCharactersFromSet:(NSCharacterSet *)inSet intoString:(NSString **)ou
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding];
}
current = P;
@@ -221,7 +218,7 @@ - (BOOL)scanUpToString:(NSString *)inString intoString:(NSString **)outValue
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:theResult - (char *)current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:theResult - (char *)current encoding:NSUTF8StringEncoding];
}
current = (u_int8_t *)theResult;
@@ -242,7 +239,7 @@ - (BOOL)scanUpToCharactersFromSet:(NSCharacterSet *)inSet intoString:(NSString *
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding];
}
current = P;
@@ -327,7 +324,7 @@ - (void)skipWhitespace
- (NSString *)remainingString
{
NSData *theRemainingData = [NSData dataWithBytes:current length:end - current];
- NSString *theString = [[[NSString alloc] initWithData:theRemainingData encoding:NSUTF8StringEncoding] autorelease];
+ NSString *theString = [[NSString alloc] initWithData:theRemainingData encoding:NSUTF8StringEncoding];
return(theString);
}
@@ -16,8 +16,8 @@ typedef id (^JSONConversionConverter)(id inObject); // TODO replace with value t
NSDictionary *convertersByName;
}
-@property (readwrite, nonatomic, retain) NSSet *tests;
-@property (readwrite, nonatomic, retain) NSDictionary *convertersByName;
+@property (readwrite, nonatomic, strong) NSSet *tests;
+@property (readwrite, nonatomic, strong) NSDictionary *convertersByName;
- (void)addTest:(JSONConversionTest)inTest;
- (void)addConverter:(JSONConversionConverter)inConverter forName:(NSString *)inName;
@@ -13,16 +13,6 @@ @implementation CFilteringJSONSerializer
@synthesize tests;
@synthesize convertersByName;
-- (void)dealloc
- {
- [tests release];
- tests = NULL;
- //
- [convertersByName release];
- convertersByName = NULL;
- //
- [super dealloc];
- }
- (NSData *)serializeObject:(id)inObject error:(NSError **)outError
{
@@ -69,16 +59,16 @@ - (NSData *)serializeObject:(id)inObject error:(NSError **)outError
- (void)addTest:(JSONConversionTest)inTest
{
- inTest = [[inTest copy] autorelease];
+ inTest = [inTest copy];
NSSet *theTests = [self.tests setByAddingObject:inTest];
self.tests = theTests;
}
- (void)addConverter:(JSONConversionConverter)inConverter forName:(NSString *)inName
{
- NSMutableDictionary *theConvertersByName = [[self.convertersByName mutableCopy] autorelease];
+ NSMutableDictionary *theConvertersByName = [self.convertersByName mutableCopy];
- inConverter = [[inConverter copy] autorelease];
+ inConverter = [inConverter copy];
[theConvertersByName setObject:inConverter forKey:inName];
self.convertersByName = theConvertersByName;
}
@@ -18,7 +18,7 @@
NSData *data;
}
-@property (readonly, nonatomic, retain) NSData *data;
+@property (readonly, nonatomic, strong) NSData *data;
- (id)initWithData:(NSData *)inData;
@@ -21,18 +21,11 @@ - (id)initWithData:(NSData *)inData
{
if ((self = [super init]) != NULL)
{
- data = [inData retain];
+ data = inData;
}
return(self);
}
-- (void)dealloc
- {
- [data release];
- data = NULL;
- //
- [super dealloc];
- }
- (NSData *)serializedJSONData
{
@@ -119,8 +119,8 @@ - (NSDictionary *)userInfoForScanLocation
NSString *theSnippet = [NSString stringWithFormat:@"%@!HERE>!%@",
- [[[NSString alloc] initWithData:[self.data subdataWithRange:theStartRange] encoding:NSUTF8StringEncoding] autorelease],
- [[[NSString alloc] initWithData:[self.data subdataWithRange:theEndRange] encoding:NSUTF8StringEncoding] autorelease]
+ [[NSString alloc] initWithData:[self.data subdataWithRange:theStartRange] encoding:NSUTF8StringEncoding],
+ [[NSString alloc] initWithData:[self.data subdataWithRange:theEndRange] encoding:NSUTF8StringEncoding]
];
NSDictionary *theUserInfo = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -46,9 +46,9 @@ typedef NSUInteger EJSONDeserializationOptions;
EJSONDeserializationOptions options;
}
-@property (readwrite, nonatomic, retain) CJSONScanner *scanner;
+@property (readwrite, nonatomic, strong) CJSONScanner *scanner;
/// Object to return instead when a null encountered in the JSON. Defaults to NSNull. Setting to null causes the scanner to skip null values.
-@property (readwrite, nonatomic, retain) id nullObject;
+@property (readwrite, nonatomic, strong) id nullObject;
/// JSON must be encoded in Unicode (UTF-8, UTF-16 or UTF-32). Use this if you expect to get the JSON in another encoding.
@property (readwrite, nonatomic, assign) NSStringEncoding allowedEncoding;
@property (readwrite, nonatomic, assign) EJSONDeserializationOptions options;
@@ -44,7 +44,7 @@ @implementation CJSONDeserializer
+ (CJSONDeserializer *)deserializer
{
- return([[[self alloc] init] autorelease]);
+ return([[self alloc] init]);
}
- (id)init
@@ -55,13 +55,6 @@ - (id)init
return(self);
}
-- (void)dealloc
- {
- [scanner release];
- scanner = NULL;
- //
- [super dealloc];
- }
#pragma mark -
@@ -44,7 +44,7 @@ typedef NSUInteger EJSONScannerOptions;
}
@property (readwrite, nonatomic, assign) BOOL strictEscapeCodes;
-@property (readwrite, nonatomic, retain) id nullObject;
+@property (readwrite, nonatomic, strong) id nullObject;
@property (readwrite, nonatomic, assign) NSStringEncoding allowedEncoding;
@property (readwrite, nonatomic, assign) EJSONScannerOptions options;
Oops, something went wrong. Retry.

0 comments on commit 992c176

Please sign in to comment.