Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ARC-ified more; rolled forward NSLogger.

  • Loading branch information...
commit c3f19fa37a820e9432edd6ec5a9e5afb29371e51 1 parent 5234040
@mysteriouspants mysteriouspants authored
View
18 NewDot.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
DA110803143F824600DFCC10 /* LoggerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = DA110801143F824600DFCC10 /* LoggerClient.m */; };
DA110806143F827700DFCC10 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA110805143F827700DFCC10 /* CFNetwork.framework */; };
DA110808143F828500DFCC10 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA110807143F828500DFCC10 /* SystemConfiguration.framework */; };
- DA5079F5142D2E3300E6AF2E /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAF5E8F142D24B800878D16 /* JSONKit.m */; };
DA71B7D3143E3DBC00E9EE94 /* NDService+Discussions.h in Headers */ = {isa = PBXBuildFile; fileRef = DA71B7D1143E3DBC00E9EE94 /* NDService+Discussions.h */; settings = {ATTRIBUTES = (Public, ); }; };
DA71B7D4143E3DBC00E9EE94 /* NDService+Discussions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA71B7D2143E3DBC00E9EE94 /* NDService+Discussions.m */; };
DA71B7D5143E3DBC00E9EE94 /* NDService+Discussions.m in Sources */ = {isa = PBXBuildFile; fileRef = DA71B7D2143E3DBC00E9EE94 /* NDService+Discussions.m */; };
@@ -39,7 +38,6 @@
DAAF5E85142D136C00878D16 /* NDService+Identity.h in Headers */ = {isa = PBXBuildFile; fileRef = DAAF5E83142D136C00878D16 /* NDService+Identity.h */; settings = {ATTRIBUTES = (Public, ); }; };
DAAF5E86142D136C00878D16 /* NDService+Identity.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAF5E84142D136C00878D16 /* NDService+Identity.m */; };
DAAF5E90142D24B800878D16 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = DAAF5E8E142D24B800878D16 /* JSONKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
- DAAF5E91142D24B800878D16 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAF5E8F142D24B800878D16 /* JSONKit.m */; };
DAAF5E9A142D2CB200878D16 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAAF5E38142D0C1A00878D16 /* Foundation.framework */; };
DAAF5EA1142D2CB200878D16 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAAF5E9F142D2CB200878D16 /* InfoPlist.strings */; };
DAAF5EA3142D2CB200878D16 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAF5EA2142D2CB200878D16 /* main.m */; };
@@ -433,7 +431,6 @@
files = (
DAAF5E82142D109300878D16 /* NDService.m in Sources */,
DAAF5E86142D136C00878D16 /* NDService+Identity.m in Sources */,
- DAAF5E91142D24B800878D16 /* JSONKit.m in Sources */,
DAE3789714311AF000F4003C /* NDService+Reservation.m in Sources */,
DAE378A21431247700F4003C /* NDService+FamilyTree.m in Sources */,
DAB030AA1432218900E2A160 /* NSDictionary+Merge.m in Sources */,
@@ -458,7 +455,6 @@
DAAF5EB2142D2CB200878D16 /* NewDotDebuggingAppDelegate_iPad.m in Sources */,
DAAF5EBB142D2D5D00878D16 /* NDService.m in Sources */,
DAAF5EBC142D2D5F00878D16 /* NDService+Identity.m in Sources */,
- DA5079F5142D2E3300E6AF2E /* JSONKit.m in Sources */,
DAE3788F1430D20A00F4003C /* TestIdentity.m in Sources */,
DAE3789814311AF000F4003C /* NDService+Reservation.m in Sources */,
DAE3789B1431237400F4003C /* TestReservation.m in Sources */,
@@ -514,8 +510,11 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
- GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_C_LANGUAGE_STANDARD = c99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -524,7 +523,7 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
@@ -538,10 +537,13 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
View
10 NewDotDebugging/Harness.m
@@ -41,14 +41,4 @@ - (id)init
return self;
}
-- (void)dealloc
-{
- self.username = nil;
- self.password = nil;
- self.serverLocation = nil;
- self.apiKey = nil;
-
- [super dealloc];
-}
-
@end
View
26 NewDotDebugging/NewDotDebuggingAppDelegate.m
@@ -44,10 +44,10 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
self.serverLocation.text = [d stringForKey:@"serverLocation"];
self.apiKey.text = [d stringForKey:@"apiKey"];
- self.identityTests = [[[TestIdentity alloc] init] autorelease];
- self.familyTreeTests = [[[TestFamilyTree alloc] init] autorelease];
- self.discussionsTests = [[[TestDiscussions alloc] init] autorelease];
- self.reservationTests = [[[TestReservation alloc] init] autorelease];
+ self.identityTests = [[TestIdentity alloc] init];
+ self.familyTreeTests = [[TestFamilyTree alloc] init];
+ self.discussionsTests = [[TestDiscussions alloc] init];
+ self.reservationTests = [[TestReservation alloc] init];
return YES;
}
@@ -152,22 +152,4 @@ - (BOOL)textFieldShouldReturn:(UITextField*)textField
return YES;
}
-#pragma mark NSObject
-
-- (void)dealloc
-{
- [_window release];
-
- self.identityTests = nil;
- self.familyTreeTests = nil;
- self.identityTests = nil;
-
- self.username = nil;
- self.password = nil;
- self.serverLocation = nil;
- self.apiKey = nil;
-
- [super dealloc];
-}
-
@end
View
10 NewDotDebugging/TestDiscussions.m
@@ -156,7 +156,7 @@ - (void)testWithUsername:(NSString*)u password:(NSString*)p serverLocation:(NSSt
{
[super testWithUsername:u password:p serverLocation:s apiKey:a];
- self.service = [[[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil] autorelease];
+ self.service = [[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil];
LOG_DISCUSSIONS(0, @"Testing Discussions Module");
[self login];
}
@@ -173,12 +173,4 @@ - (id)init
return self;
}
-- (void)dealloc
-{
- self.service = nil;
- self.discussionIds = nil;
-
- [super dealloc];
-}
-
@end
View
9 NewDotDebugging/TestFamilyTree.m
@@ -103,7 +103,7 @@ - (void)testWithUsername:(NSString*)u password:(NSString*)p serverLocation:(NSSt
{
[super testWithUsername:u password:p serverLocation:s apiKey:a];
- self.service = [[[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil] autorelease];
+ self.service = [[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil];
LOG_FAMILYTREE(0, @"Testing the FamilyTree Module");
[self login];
}
@@ -120,11 +120,4 @@ - (id)init
return self;
}
-- (void)dealloc
-{
- self.service = nil;
-
- [super dealloc];
-}
-
@end
View
12 NewDotDebugging/TestIdentity.m
@@ -119,8 +119,8 @@ - (void)testWithUsername:(NSString*)u password:(NSString*)p serverLocation:(NSSt
[super testWithUsername:u password:p serverLocation:s apiKey:a];
NSURL* baseURL = [NSURL URLWithString:s];
- self.winTest = [[[NDService alloc] initWithBaseURL:baseURL userAgent:@"NewDot/0.2"] autorelease];
- self.failTest = [[[NDService alloc] initWithBaseURL:baseURL userAgent:@"NewDot/0.2"] autorelease];
+ self.winTest = [[NDService alloc] initWithBaseURL:baseURL userAgent:@"NewDot/0.2"];
+ self.failTest = [[NDService alloc] initWithBaseURL:baseURL userAgent:@"NewDot/0.2"];
LOG_IDENTITY(0,@"Testing the Identity Module");
[self testLoginFailure];
@@ -139,12 +139,4 @@ - (id)init
return self;
}
-- (void)dealloc
-{
- self.winTest = nil;
- self.failTest = nil;
-
- [super dealloc];
-}
-
@end
View
11 NewDotDebugging/TestReservation.m
@@ -169,7 +169,7 @@ - (NSArray*)collectPersonIds:(NSArray*)ordinances
collectedPersonIds = [personIds copy];
}
- return [collectedPersonIds autorelease];
+ return collectedPersonIds;
}
#pragma mark Harness
@@ -178,7 +178,7 @@ - (void)testWithUsername:(NSString*)u password:(NSString*)p serverLocation:(NSSt
{
[super testWithUsername:u password:p serverLocation:s apiKey:a];
- self.service = [[[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil] autorelease];
+ self.service = [[NDService alloc] initWithBaseURL:[NSURL URLWithString:self.serverLocation] userAgent:nil];
LOG_RESERVATION(0, @"Testing the Reservation Module");
[self login];
@@ -196,11 +196,4 @@ - (id)init
return self;
}
-- (void)dealloc
-{
- self.service = nil;
-
- [super dealloc];
-}
-
@end
View
7 NewDotDebugging/main.m
@@ -10,8 +10,7 @@
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, nil);
+ }
}
2  vendor/NSLogger
@@ -1 +1 @@
-Subproject commit a96e4dc60cef37054c8cf570e87b2589582b33a3
+Subproject commit 9b91c68e9c04671c314cbe0bdaa789a438424141
Please sign in to comment.
Something went wrong with that request. Please try again.