Merge lp:~rockstar/ubuntuone-ios-music/project-settings into lp:ubuntuone-ios-music

[Paul Hummer]

Update u1music project settings

Update the u1music project settings, kill most of the warnings.

The only warnings I didn't kill were the Categories re-implementing methods. It's encouraged that we use inheritance for that (and rightly so). However, that means refactoring, which I don't think we want to do right now.

This branch was SUPER educational.

[Zachery Bir (urbanape)]

Looks good, land it!

review: Approve

=== modified file 'Dependencies/JSONKit/JSONKit.m'
--- Dependencies/JSONKit/JSONKit.m	2011-07-10 22:17:52 +0000
+++ Dependencies/JSONKit/JSONKit.m	2012-08-16 21:23:21 +0000
@@ -742,14 +742,14 @@
 - (void)getObjects:(id *)objectsPtr range:(NSRange)range
 {
   NSParameterAssert((objects != NULL) && (count <= capacity));
-  if((objectsPtr     == NULL)  && (NSMaxRange(range) > 0UL))   { [NSException raise:NSRangeException format:@"*** -[%@ %@]: pointer to objects array is NULL but range length is %lu", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSMaxRange(range)];        }
-  if((range.location >  count) || (NSMaxRange(range) > count)) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",                          NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSMaxRange(range), count]; }
+  if((objectsPtr     == NULL)  && (NSMaxRange(range) > 0UL))   { [NSException raise:NSRangeException format:@"*** -[%@ %@]: pointer to objects array is NULL but range length is %u", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSMaxRange(range)];        }
+  if((range.location >  count) || (NSMaxRange(range) > count)) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%u) beyond bounds (%u)",                          NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSMaxRange(range), count]; }
   memcpy(objectsPtr, objects + range.location, range.length * sizeof(id));
 }
 
 - (id)objectAtIndex:(NSUInteger)objectIndex
 {
-  if(objectIndex >= count) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)", NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
+  if(objectIndex >= count) { [NSException raise:NSRangeException format:@"*** -[%@ %@]: index (%u) beyond bounds (%u)", NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
   NSParameterAssert((objects != NULL) && (count <= capacity) && (objects[objectIndex] != NULL));
   return(objects[objectIndex]);
 }
@@ -770,7 +770,7 @@
 {
   if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
   if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >  count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count + 1UL]; }
+  if(objectIndex >  count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%u) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count + 1UL]; }
 #ifdef __clang_analyzer__
   [anObject retain]; // Stupid clang analyzer...  Issue #19.
 #else
@@ -783,7 +783,7 @@
 - (void)removeObjectAtIndex:(NSUInteger)objectIndex
 {
   if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
+  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%u) beyond bounds (%u)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
   _JKArrayRemoveObjectAtIndex(self, objectIndex);
   mutations = (mutations == NSUIntegerMax) ? 1UL : mutations + 1UL;
 }
@@ -792,7 +792,7 @@
 {
   if(mutations   == 0UL)   { [NSException raise:NSInternalInconsistencyException format:@"*** -[%@ %@]: mutating method sent to immutable object", NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
   if(anObject    == NULL)  { [NSException raise:NSInvalidArgumentException       format:@"*** -[%@ %@]: attempt to insert nil",                    NSStringFromClass([self class]), NSStringFromSelector(_cmd)]; }
-  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%lu) beyond bounds (%lu)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
+  if(objectIndex >= count) { [NSException raise:NSRangeException                 format:@"*** -[%@ %@]: index (%u) beyond bounds (%u)",          NSStringFromClass([self class]), NSStringFromSelector(_cmd), objectIndex, count]; }
 #ifdef __clang_analyzer__
   [anObject retain]; // Stupid clang analyzer...  Issue #19.
 #else
@@ -2559,17 +2559,17 @@
   // supported classes, we fail the second type (i.e., double fault error).
   BOOL rerunningAfterClassFormatter = NO;
 rerunAfterClassFormatter:
-       if(JK_EXPECT_T(object->isa == encodeState->fastClassLookup.stringClass))     { isClass = JKClassString;     }
-  else if(JK_EXPECT_T(object->isa == encodeState->fastClassLookup.numberClass))     { isClass = JKClassNumber;     }
-  else if(JK_EXPECT_T(object->isa == encodeState->fastClassLookup.dictionaryClass)) { isClass = JKClassDictionary; }
-  else if(JK_EXPECT_T(object->isa == encodeState->fastClassLookup.arrayClass))      { isClass = JKClassArray;      }
-  else if(JK_EXPECT_T(object->isa == encodeState->fastClassLookup.nullClass))       { isClass = JKClassNull;       }
+       if(JK_EXPECT_T(object_getClass(object) == encodeState->fastClassLookup.stringClass))     { isClass = JKClassString;     }
+  else if(JK_EXPECT_T(object_getClass(object) == encodeState->fastClassLookup.numberClass))     { isClass = JKClassNumber;     }
+  else if(JK_EXPECT_T(object_getClass(object) == encodeState->fastClassLookup.dictionaryClass)) { isClass = JKClassDictionary; }
+  else if(JK_EXPECT_T(object_getClass(object) == encodeState->fastClassLookup.arrayClass))      { isClass = JKClassArray;      }
+  else if(JK_EXPECT_T(object_getClass(object) == encodeState->fastClassLookup.nullClass))       { isClass = JKClassNull;       }
   else {
-         if(JK_EXPECT_T([object isKindOfClass:[NSString     class]])) { encodeState->fastClassLookup.stringClass     = object->isa; isClass = JKClassString;     }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSNumber     class]])) { encodeState->fastClassLookup.numberClass     = object->isa; isClass = JKClassNumber;     }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSDictionary class]])) { encodeState->fastClassLookup.dictionaryClass = object->isa; isClass = JKClassDictionary; }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSArray      class]])) { encodeState->fastClassLookup.arrayClass      = object->isa; isClass = JKClassArray;      }
-    else if(JK_EXPECT_T([object isKindOfClass:[NSNull       class]])) { encodeState->fastClassLookup.nullClass       = object->isa; isClass = JKClassNull;       }
+         if(JK_EXPECT_T([object isKindOfClass:[NSString     class]])) { encodeState->fastClassLookup.stringClass     = object_getClass(object); isClass = JKClassString;     }
+    else if(JK_EXPECT_T([object isKindOfClass:[NSNumber     class]])) { encodeState->fastClassLookup.numberClass     = object_getClass(object); isClass = JKClassNumber;     }
+    else if(JK_EXPECT_T([object isKindOfClass:[NSDictionary class]])) { encodeState->fastClassLookup.dictionaryClass = object_getClass(object); isClass = JKClassDictionary; }
+    else if(JK_EXPECT_T([object isKindOfClass:[NSArray      class]])) { encodeState->fastClassLookup.arrayClass      = object_getClass(object); isClass = JKClassArray;      }
+    else if(JK_EXPECT_T([object isKindOfClass:[NSNull       class]])) { encodeState->fastClassLookup.nullClass       = object_getClass(object); isClass = JKClassNull;       }
     else {
       if((rerunningAfterClassFormatter == NO) && (
 #ifdef __BLOCKS__
@@ -2751,7 +2751,7 @@
           for(id keyObject in enumerateObject) {
             if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
             printComma = 1;
-            if(JK_EXPECT_F((keyObject->isa      != encodeState->fastClassLookup.stringClass)) && JK_EXPECT_F(([keyObject   isKindOfClass:[NSString class]] == NO))) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
+            if(JK_EXPECT_F((object_getClass(keyObject)      != encodeState->fastClassLookup.stringClass)) && JK_EXPECT_F(([keyObject   isKindOfClass:[NSString class]] == NO))) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
             if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keyObject)))                                                        { return(1); }
             if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                                                                      { return(1); }
             if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, (void *)CFDictionaryGetValue((CFDictionaryRef)object, keyObject)))) { return(1); }
@@ -2762,7 +2762,7 @@
           for(idx = 0L; idx < dictionaryCount; idx++) {
             if(JK_EXPECT_T(printComma)) { if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ","))) { return(1); } }
             printComma = 1;
-            if(JK_EXPECT_F(((id)keys[idx])->isa != encodeState->fastClassLookup.stringClass) && JK_EXPECT_F([(id)keys[idx] isKindOfClass:[NSString class]] == NO)) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
+            if(JK_EXPECT_F((object_getClass((id)keys[idx])) != encodeState->fastClassLookup.stringClass) && JK_EXPECT_F([(id)keys[idx] isKindOfClass:[NSString class]] == NO)) { jk_encode_error(encodeState, @"Key must be a string object."); return(1); }
             if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, keys[idx])))    { return(1); }
             if(JK_EXPECT_F(jk_encode_write1(encodeState, 0L, ":")))                  { return(1); }
             if(JK_EXPECT_F(jk_encode_add_atom_to_buffer(encodeState, objects[idx]))) { return(1); }
 
=== modified file 'Dependencies/oauthconsumer/OAMutableURLRequest.m'
--- Dependencies/oauthconsumer/OAMutableURLRequest.m	2011-07-10 22:17:52 +0000
+++ Dependencies/oauthconsumer/OAMutableURLRequest.m	2012-08-16 21:23:21 +0000
@@ -129,7 +129,7 @@
 
 - (void)_generateTimestamp {
 	[timestamp release];
-    timestamp = [[NSString alloc]initWithFormat:@"%d", time(NULL)];
+    timestamp = [[NSString alloc]initWithFormat:@"%ld", time(NULL)];
 }
 
 - (void)_generateNonce {
 
=== modified file 'Dependencies/oauthconsumer/OATokenManager.m'
--- Dependencies/oauthconsumer/OATokenManager.m	2011-07-10 22:17:52 +0000
+++ Dependencies/oauthconsumer/OATokenManager.m	2012-08-16 21:23:21 +0000
@@ -93,7 +93,7 @@
 		[self exchangeToken];
 	} else {
 		[authorizedTokenKey release];
-		authorizedTokenKey = [aKey retain];
+		authorizedTokenKey = [aKey copy];
 	}
 }
 
 
=== modified file 'SynthesizeSingleton.h'
--- SynthesizeSingleton.h	2010-09-24 05:34:15 +0000
+++ SynthesizeSingleton.h	2012-08-16 21:23:21 +0000
@@ -58,7 +58,7 @@
 	return NSUIntegerMax; \
 } \
  \
-- (void)release \
+- (oneway void)release \
 { \
 } \
  \
 
=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2012-08-13 16:35:03 +0000
+++ U1Music.xcodeproj/project.pbxproj	2012-08-16 21:23:21 +0000
@@ -1216,7 +1216,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0440;
 				ORGANIZATIONNAME = Canonical;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */;
@@ -1497,7 +1497,8 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_THUMB_SUPPORT = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "U1Music-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1527,7 +1528,8 @@
 				CURRENT_PROJECT_VERSION = 6;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_THUMB_SUPPORT = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "U1Music-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				LIBRARY_SEARCH_PATHS = (
 
=== modified file 'categories/UIImage+Resize.m'
--- categories/UIImage+Resize.m	2011-05-02 07:33:18 +0000
+++ categories/UIImage+Resize.m	2012-08-16 21:23:21 +0000
@@ -189,6 +189,8 @@
             transform = CGAffineTransformTranslate(transform, 0, newSize.height);
             transform = CGAffineTransformRotate(transform, -M_PI_2);
             break;
+        default:
+            break;
     }
     
     switch (self.imageOrientation) {
@@ -203,6 +205,8 @@
             transform = CGAffineTransformTranslate(transform, newSize.height, 0);
             transform = CGAffineTransformScale(transform, -1, 1);
             break;
+        default:
+            break;
     }
     
     return transform;
 
=== modified file 'utilities/AudioStreamer.h'
--- utilities/AudioStreamer.h	2012-02-17 20:55:09 +0000
+++ utilities/AudioStreamer.h	2012-08-16 21:23:21 +0000
@@ -25,7 +25,7 @@
 #import <UIKit/UIKit.h>
 #else
 #import <Cocoa/Cocoa.h>
-#endif TARGET_OS_IPHONE			
+#endif // TARGET_OS_IPHONE			
 
 #include <pthread.h>
 #include <AudioToolbox/AudioToolbox.h>
@@ -170,7 +170,7 @@
 }
 
 @property AudioStreamerErrorCode errorCode;
-@property (readonly) AudioStreamerState state;
+@property (nonatomic, readonly) AudioStreamerState state;
 @property (readonly) AudioStreamerStopReason stopReason;
 @property (readonly) double progress;
 @property (readonly) double duration;
 
=== modified file 'utilities/AudioStreamer.m'
--- utilities/AudioStreamer.m	2012-02-17 20:55:09 +0000
+++ utilities/AudioStreamer.m	2012-08-16 21:23:21 +0000
@@ -56,7 +56,7 @@
 NSString * const AS_AUDIO_BUFFER_TOO_SMALL_STRING = @"Audio packets are larger than kAQDefaultBufSize.";
 
 @interface AudioStreamer () <UIAlertViewDelegate>
-@property (readwrite) AudioStreamerState state;
+@property (nonatomic, readwrite) AudioStreamerState state;
 @property UIBackgroundTaskIdentifier bgTaskId;
 
 - (void)handlePropertyChangeForFileStream:(AudioFileStreamID)inAudioFileStream
@@ -649,7 +649,7 @@
 			if (fileLength > 0 && seekByteOffset > 0)
 			{
 				CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Range"),
-												 (CFStringRef)[NSString stringWithFormat:@"bytes=%ld-%ld", seekByteOffset, fileLength]);
+												 (CFStringRef)[NSString stringWithFormat:@"bytes=%u-%u", seekByteOffset, fileLength]);
 				discontinuous = YES;
 			}
 			
@@ -765,7 +765,7 @@
 			if (state != AS_STOPPING &&
 				state != AS_STOPPED)
 			{
-				NSLog(@"### Not starting audio thread. State code is: %ld", state);
+				NSLog(@"### Not starting audio thread. State code is: %u", state);
 			}
 			self.state = AS_INITIALIZED;
 			[pool release];
 
=== modified file 'utilities/Reachability.h'
--- utilities/Reachability.h	2010-09-20 20:32:15 +0000
+++ utilities/Reachability.h	2012-08-16 21:23:21 +0000
@@ -48,6 +48,7 @@
 
 #import <Foundation/Foundation.h>
 #import <SystemConfiguration/SystemConfiguration.h>
+#import <netinet/in.h>
 
 typedef enum {
 	NotReachable = 0,
 
=== modified file 'utilities/U1SocketListener.h'
--- utilities/U1SocketListener.h	2012-02-07 23:01:23 +0000
+++ utilities/U1SocketListener.h	2012-08-16 21:23:21 +0000
@@ -23,7 +23,7 @@
 
 @interface U1SocketListener : NSObject
 
-@property (copy) U1SocketListenerAcceptHandler acceptHandler;
+@property (nonatomic, copy) U1SocketListenerAcceptHandler acceptHandler;
 
 + (U1SocketListener*)localListenerWithPort:(NSUInteger)port error:(NSError **)error;
 
 
=== modified file 'utilities/U1StreamWriter.h'
--- utilities/U1StreamWriter.h	2012-02-15 22:15:38 +0000
+++ utilities/U1StreamWriter.h	2012-08-16 21:23:21 +0000
@@ -25,8 +25,8 @@
 
 @interface U1StreamWriter : NSObject
 
-@property (copy) U1StreamWriterErrorHandler errorHandler;
-@property (copy) void(^completionHandler)();
+@property (nonatomic, copy) U1StreamWriterErrorHandler errorHandler;
+@property (nonatomic, copy) void(^completionHandler)();
 @property (assign) id<U1StreamWriterDelegate> delegate;
 
 - (id)initWithDescriptor:(U1Descriptor*)aSocket;
 
=== modified file 'utilities/operations/Downloader.m'
--- utilities/operations/Downloader.m	2012-02-17 19:45:46 +0000
+++ utilities/operations/Downloader.m	2012-08-16 21:23:21 +0000
@@ -172,7 +172,7 @@
 				[chunkRanges enumerateObjectsUsingBlock:^(id rangeValue, NSUInteger idx, BOOL *stop) {
 					NSRange range = [rangeValue rangeValue];
 					
-					NSString *path = [[tmpDir path] stringByAppendingPathComponent:[NSString stringWithFormat:@"%lu.chunk", idx]];
+					NSString *path = [[tmpDir path] stringByAppendingPathComponent:[NSString stringWithFormat:@"%u.chunk", idx]];
 					
 					U1ChunkDownloadOperation *chunk = [[U1ChunkDownloadOperation alloc] initWithUrl:url path:path andRange:range];
 					
 
=== modified file 'utilities/operations/U1ChunkDownloadOperation.m'
--- utilities/operations/U1ChunkDownloadOperation.m	2012-02-08 23:56:03 +0000
+++ utilities/operations/U1ChunkDownloadOperation.m	2012-08-16 21:23:21 +0000
@@ -22,7 +22,7 @@
 - (id)initWithUrl:(NSURL *)url path:(NSString *)aPath andRange:(NSRange)aRange;
 {
 	NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
-	NSString *requestRange = [NSString stringWithFormat:@"bytes=%lu-%lu", aRange.location, NSMaxRange(aRange) - 1];
+	NSString *requestRange = [NSString stringWithFormat:@"bytes=%u-%u", aRange.location, NSMaxRange(aRange) - 1];
 	[request setValue:requestRange forHTTPHeaderField:@"Range"];
 	
 	self = [super initWithRequest:request];