adium 4072:a7ef115f3ff7: Fixed some more warnings related to imp...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/a7ef115f3ff7
revision:	4072:a7ef115f3ff7
branch:		(none)
author:		Patrick Steinhardt <steinhardt.p at me.com>
date:		Tue Jul 26 21:43:25 2011 +0200

Fixed some more warnings related to implicit conversions.

diffs (116 lines):

diff -r da5bbdab941f -r a7ef115f3ff7 Plugins/Twitter Plugin/MGTwitterEngine/NSData+Base64.m
--- a/Plugins/Twitter Plugin/MGTwitterEngine/NSData+Base64.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Plugins/Twitter Plugin/MGTwitterEngine/NSData+Base64.m	Tue Jul 26 21:43:25 2011 +0200
@@ -32,7 +32,7 @@
 		unsigned long ixtext = 0;
 		unsigned long lentext = 0;
 		unsigned char ch = 0;
-		unsigned char inbuf[3], outbuf[4];
+		unsigned char inbuf[4], outbuf[4];
 		short i = 0, ixinbuf = 0;
 		BOOL flignore = NO;
 		BOOL flendtext = NO;
diff -r da5bbdab941f -r a7ef115f3ff7 Source/AIListController.m
--- a/Source/AIListController.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Source/AIListController.m	Tue Jul 26 21:43:25 2011 +0200
@@ -588,7 +588,7 @@
 			//XXX If we can sort manually but the sort controller also has some control (e.g. status sort with manual ordering), we should get a hint and make use of it.
 			
 			AISortController *sortController = [AISortController activeSortController];
-			AIListObject<AIContainingObject> *container = proposedListObject ? proposedListObject : adium.contactController.contactList;
+			AIListObject<AIContainingObject> *container = proposedListObject ? (AIListObject<AIContainingObject> *)proposedListObject : adium.contactController.contactList;
 
 			if (!sortController.canSortManually && [container containsObject:[dragItems objectAtIndex:0]]) {
 				// We can't sort manually, and the container already has this item. No operation will take place.
diff -r da5bbdab941f -r a7ef115f3ff7 Source/AIListObjectContentsPlugin.m
--- a/Source/AIListObjectContentsPlugin.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Source/AIListObjectContentsPlugin.m	Tue Jul 26 21:43:25 2011 +0200
@@ -86,8 +86,8 @@
 - (NSString *)labelForObject:(AIListObject *)inObject
 {
 	if ([inObject conformsToProtocol:@protocol(AIContainingObject)] || 
-		[inObject isKindOfClass:[AIListContact class]] &&
-		![inObject isKindOfClass:[AIListBookmark class]]) {
+		([inObject isKindOfClass:[AIListContact class]] &&
+		![inObject isKindOfClass:[AIListBookmark class]])) {
 		return AILocalizedString(@"Contacts",nil);
 	}
 	
diff -r da5bbdab941f -r a7ef115f3ff7 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Source/AILoggerPlugin.m	Tue Jul 26 21:43:25 2011 +0200
@@ -351,12 +351,12 @@
 		
 		OSStatus err = FSPathMakeRef((UInt8 *)[logBasePath UTF8String], &ref, &isDir);
 		if (noErr != err) {
-			NSLog(@"Warning: Couldn't obtain FSRef for transcripts folder: %s (%i)", GetMacOSStatusCommentString(err), err);
+			NSLog(@"Warning: Couldn't obtain FSRef for transcripts folder: %s (%ld)", GetMacOSStatusCommentString(err), (long)err);
 		} else if (!isDir) {
 			Boolean wasAliased_nobodyCares;
 			err = FSResolveAliasFile(&ref, /*resolveAliasChains*/ true, &isDir, &wasAliased_nobodyCares);
 			if (noErr != err) {
-				NSLog(@"Warning: Couldn't resolve alias to transcripts folder: %s (%i)", GetMacOSStatusCommentString(err), err);
+				NSLog(@"Warning: Couldn't resolve alias to transcripts folder: %s (%ld)", GetMacOSStatusCommentString(err), (long)err);
 			} else {
 				NSURL *logBaseURL = [(NSURL *)CFURLCreateFromFSRef(kCFAllocatorDefault, &ref) autorelease];
 				logBaseAliasPath = logBasePath;
diff -r da5bbdab941f -r a7ef115f3ff7 Source/AIPreferenceContainer.m
--- a/Source/AIPreferenceContainer.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Source/AIPreferenceContainer.m	Tue Jul 26 21:43:25 2011 +0200
@@ -163,7 +163,7 @@
 	
 	if (error) {
 		NSLog(@"Error reading data for preferences file %@: %@ (%@ %ld: %@)", objectPrefsPath, error,
-			  [error domain], [error code], [error userInfo]);
+			  [error domain], (long)[error code], [error userInfo]);
 		AILogWithSignature(@"Error reading data for preferences file %@: %@ (%@ %i: %@)", objectPrefsPath, error,
 						   [error domain], [error code], [error userInfo]);
 		if ([[NSFileManager defaultManager] fileExistsAtPath:objectPrefsPath]) {
diff -r da5bbdab941f -r a7ef115f3ff7 Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m	Tue Jul 26 21:03:47 2011 +0200
+++ b/Source/AdiumPasswords.m	Tue Jul 26 21:43:25 2011 +0200
@@ -348,11 +348,11 @@
 		 */
 		if (inPassword || (err != errSecItemNotFound)) {
 			NSDictionary *userInfo = [error userInfo];
-			NSLog(@"could not %@ password for special password %@: %@ returned %i (%@)",
+			NSLog(@"could not %@ password for special password %@: %@ returned %ld (%@)",
 			      inPassword ? @"set" : @"remove",
 			      [self _accountNameForSpecialPassword:inType account:inAccount name:inName],
 				  [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME],
-				  err,
+				  (long)err,
 				  [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
 		}
 	}
@@ -373,10 +373,10 @@
 		 */
 		if (err != errSecItemNotFound) {
 			NSDictionary *userInfo = [error userInfo];
-			NSLog(@"could not retrieve password for special password %@: %@ returned %i (%@)",
+			NSLog(@"could not retrieve password for special password %@: %@ returned %ld (%@)",
 				  [self _accountNameForSpecialPassword:inType account:inAccount name:inName],
 				  [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME],
-				  err,
+				  (long)err,
 				  [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
 		}
 	}
@@ -480,7 +480,7 @@
 				OSStatus err = (OSStatus)[error code];
 				if (err != errSecItemNotFound) {
 					NSDictionary *userInfo = [error userInfo];
-					NSLog(@"could not retrieve password for account %@: %@ returned %i (%@)", [self _oldStyleAccountNameForAccount:account], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
+					NSLog(@"could not retrieve password for account %@: %@ returned %ld (%@)", [self _oldStyleAccountNameForAccount:account], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], (long)err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
 				}
 			} else {
 				[self setPassword:password forAccount:account];
@@ -497,7 +497,7 @@
 					 */
 					if (err != errSecItemNotFound) {
 						NSDictionary *userInfo = [error userInfo];
-						NSLog(@"could not delete password for account %@: %@ returned %i (%@)", [self _oldStyleAccountNameForAccount:account], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
+						NSLog(@"could not delete password for account %@: %@ returned %ld (%@)", [self _oldStyleAccountNameForAccount:account], [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_SECURITYFUNCTIONNAME], (long)err, [userInfo objectForKey:AIKEYCHAIN_ERROR_USERINFO_ERRORDESCRIPTION]);
 					}
 				}
 			}