Last cleanup and hookup to TouchJSON latest

cigraphics · Dec 13, 2010 · dbee191 · dbee191
1 parent 50d80c2
commit dbee191
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 30 deletions.
diff --git a/Classes/Data/SubredditDataModel.h b/Classes/Data/SubredditDataModel.h
@@ -3,7 +3,7 @@
 //  iReddit
 //
 //  Created by Ryan Bruels on 7/21/10.
-//  Copyright 2010 DevToaster, LLC. All rights reserved.
+
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Classes/Data/SubredditDataModel.m b/Classes/Data/SubredditDataModel.m
@@ -3,7 +3,7 @@
 //  iReddit
 //
 //  Created by Ryan Bruels on 7/21/10.
-//  Copyright 2010 DevToaster, LLC. All rights reserved.
+
 //
 
 #import "SubredditDataModel.h"
@@ -53,9 +53,7 @@ - (void)load:(TTURLRequestCachePolicy)cachePolicy more:(BOOL)more
         // clear the stories for this subreddit
         [self.stories removeAllObjects];
     }
-
-	BOOL savedReddit = [self.subreddit isEqual:@"/saved/"];
-
+
     TTURLRequest *activeRequest = [TTURLRequest requestWithURL:loadURL delegate:self];
 	activeRequest.cacheExpirationAge = 0;
     activeRequest.cachePolicy = TTURLRequestCachePolicyNoCache;

diff --git a/Classes/ViewControllers/RootViewController.m b/Classes/ViewControllers/RootViewController.m
@@ -301,9 +301,7 @@ - (void)requestDidFinishLoad:(TTURLRequest*)request
     // parse the JSON data that we retrieved from the server
     NSDictionary *json = [NSDictionary dictionaryWithJSONString:responseBody error:nil];
     [responseBody release];
-
-    NSLog(@"REDDITS LOADED");
-
+
     // drill down into the JSON object to get the part 
     // that we're actually interested in.
 
@@ -370,7 +368,6 @@ - (void)didAddReddit:(NSNotification *)note
 
 			if ([item.URL isEqual:[redditInfo objectForKey:@"subreddit_url"]])
 			{
-				NSLog(@"HERE");
 				NSMutableArray *items = [customSubreddits mutableCopy];
 
 				id item = [[items objectAtIndex:i] retain];

diff --git a/Classes/ViewControllers/StoryViewController.m b/Classes/ViewControllers/StoryViewController.m
@@ -633,9 +633,7 @@ - (void)viewDidUnload
 	self.toggleButtonItem = nil;
 	self.segmentedControl = nil;
 	self.loadingView = nil;
-
-	NSLog(@"unloading story view controller %@", self);
-	[super viewDidUnload];
+    [super viewDidUnload];
 }
 
 - (void)dealloc 

diff --git a/Classes/ViewControllers/SubredditTableViewDelegate.h b/Classes/ViewControllers/SubredditTableViewDelegate.h
@@ -5,7 +5,7 @@
 //  Created so we can respond to scroll view events as necessary.
 //
 //  Created by Ryan Bruels on 12/12/10.
-//  Copyright 2010 DevToaster, LLC. All rights reserved.
+
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Classes/ViewControllers/SubredditTableViewDelegate.m b/Classes/ViewControllers/SubredditTableViewDelegate.m
@@ -3,7 +3,7 @@
 //  iReddit
 //
 //  Created by Ryan Bruels on 12/12/10.
-//  Copyright 2010 DevToaster, LLC. All rights reserved.
+
 //
 
 #import "SubredditTableViewDelegate.h"

diff --git a/Classes/Views/RedditWebView.m b/Classes/Views/RedditWebView.m
@@ -188,7 +188,6 @@ - (void)loadWithStory:(Story *)story commentID:(NSString *)commentID
 
 - (void)dealloc 
 {
-	NSLog(@"DEALLOCING WEBVIEW %@", self);
 	super.delegate = nil;
     [super dealloc];
 }

diff --git a/Classes/Views/RedditWindow.m b/Classes/Views/RedditWindow.m
@@ -3,7 +3,7 @@
 //  iReddit
 //
 //  Created by Ryan Bruels on 12/11/10.
-//  Copyright 2010 DevToaster, LLC. All rights reserved.
+
 //
 
 #import "RedditWindow.h"

diff --git a/Classes/iRedditAppDelegate.h b/Classes/iRedditAppDelegate.h
@@ -30,7 +30,6 @@
 + (UIColor *)redditNavigationBarTintColor;
 + (iRedditAppDelegate *)sharedAppDelegate;
 
-- (void)startMessageTimer;
 - (void)reloadSound;
 - (void)showRandomStory;
 

diff --git a/Classes/iRedditAppDelegate.m b/Classes/iRedditAppDelegate.m
@@ -241,7 +241,6 @@ - (void)navigationController:(UINavigationController *)navigationController didS
 {
 	if (![navigationController.viewControllers containsObject:randomController])
 	{
-		NSLog(@"RELEASING RANDOM CONTROLLER");
 		[randomController release];
 		randomController = nil;
 	}

diff --git a/iReddit.xcodeproj/project.pbxproj b/iReddit.xcodeproj/project.pbxproj
@@ -18,8 +18,6 @@
 		3821EF4B11CAC990002CCCE2 /* CJSONScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF3D11CAC98F002CCCE2 /* CJSONScanner.m */; };
 		3821EF4C11CAC990002CCCE2 /* CJSONSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF3F11CAC98F002CCCE2 /* CJSONSerializer.m */; };
 		3821EF4D11CAC990002CCCE2 /* CJSONDeserializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */; };
-		3821EF4E11CAC990002CCCE2 /* CJSONDataSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF4311CAC98F002CCCE2 /* CJSONDataSerializer.m */; };
-		3821EF4F11CAC990002CCCE2 /* CSerializedJSONData.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF4511CAC98F002CCCE2 /* CSerializedJSONData.m */; };
 		3821EF5011CAC990002CCCE2 /* CDataScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 3821EF4711CAC990002CCCE2 /* CDataScanner.m */; };
 		61C35E1111FF0C85001A2F85 /* RedditPremiumIcon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 61C35E0F11FF0C85001A2F85 /* RedditPremiumIcon-72.png */; };
 		61C35E1211FF0C85001A2F85 /* RedditPremiumIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61C35E1011FF0C85001A2F85 /* RedditPremiumIcon@2x.png */; };
@@ -481,10 +479,6 @@
 		3821EF3F11CAC98F002CCCE2 /* CJSONSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONSerializer.m; path = ../TouchJSON/Source/JSON/CJSONSerializer.m; sourceTree = SOURCE_ROOT; };
 		3821EF4011CAC98F002CCCE2 /* CJSONDeserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONDeserializer.h; path = ../TouchJSON/Source/JSON/CJSONDeserializer.h; sourceTree = SOURCE_ROOT; };
 		3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONDeserializer.m; path = ../TouchJSON/Source/JSON/CJSONDeserializer.m; sourceTree = SOURCE_ROOT; };
-		3821EF4211CAC98F002CCCE2 /* CJSONDataSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJSONDataSerializer.h; path = ../TouchJSON/Source/JSON/CJSONDataSerializer.h; sourceTree = SOURCE_ROOT; };
-		3821EF4311CAC98F002CCCE2 /* CJSONDataSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJSONDataSerializer.m; path = ../TouchJSON/Source/JSON/CJSONDataSerializer.m; sourceTree = SOURCE_ROOT; };
-		3821EF4411CAC98F002CCCE2 /* CSerializedJSONData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSerializedJSONData.h; path = ../TouchJSON/Source/JSON/CSerializedJSONData.h; sourceTree = SOURCE_ROOT; };
-		3821EF4511CAC98F002CCCE2 /* CSerializedJSONData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSerializedJSONData.m; path = ../TouchJSON/Source/JSON/CSerializedJSONData.m; sourceTree = SOURCE_ROOT; };
 		3821EF4611CAC98F002CCCE2 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDataScanner.h; path = ../TouchJSON/Source/CDataScanner.h; sourceTree = SOURCE_ROOT; };
 		3821EF4711CAC990002CCCE2 /* CDataScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDataScanner.m; path = ../TouchJSON/Source/CDataScanner.m; sourceTree = SOURCE_ROOT; };
 		61C35E0F11FF0C85001A2F85 /* RedditPremiumIcon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RedditPremiumIcon-72.png"; sourceTree = "<group>"; };
@@ -749,10 +743,6 @@
 				3821EF3F11CAC98F002CCCE2 /* CJSONSerializer.m */,
 				3821EF4011CAC98F002CCCE2 /* CJSONDeserializer.h */,
 				3821EF4111CAC98F002CCCE2 /* CJSONDeserializer.m */,
-				3821EF4211CAC98F002CCCE2 /* CJSONDataSerializer.h */,
-				3821EF4311CAC98F002CCCE2 /* CJSONDataSerializer.m */,
-				3821EF4411CAC98F002CCCE2 /* CSerializedJSONData.h */,
-				3821EF4511CAC98F002CCCE2 /* CSerializedJSONData.m */,
 			);
 			name = JSON;
 			path = ../TouchJSON/Source/JSON;
@@ -1518,8 +1508,6 @@
 				3821EF4B11CAC990002CCCE2 /* CJSONScanner.m in Sources */,
 				3821EF4C11CAC990002CCCE2 /* CJSONSerializer.m in Sources */,
 				3821EF4D11CAC990002CCCE2 /* CJSONDeserializer.m in Sources */,
-				3821EF4E11CAC990002CCCE2 /* CJSONDataSerializer.m in Sources */,
-				3821EF4F11CAC990002CCCE2 /* CSerializedJSONData.m in Sources */,
 				3821EF5011CAC990002CCCE2 /* CDataScanner.m in Sources */,
 				E58C100E12B49244004D2070 /* SubredditDataModel.m in Sources */,
 				E58C109812B4A0DD004D2070 /* RedditWindow.m in Sources */,