adium 5240:c9ecba5be673: Add some parentheses to self init assig...

commits at adium.im commits at adium.im
Sun Dec 30 20:38:59 UTC 2012


details:	http://hg.adium.im/adium/rev/c9ecba5be673
revision:	5240:c9ecba5be673
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Dec 30 15:17:36 2012 -0500

Add some parentheses to self init assignments.
Subject: adium 5241:76839efbd3f9: Organize the base xcconfig a bit and add the new checks Xcode suggests.

details:	http://hg.adium.im/adium/rev/76839efbd3f9
revision:	5241:76839efbd3f9
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Dec 30 15:26:46 2012 -0500

Organize the base xcconfig a bit and add the new checks Xcode suggests.
Subject: adium 5242:212759975b0c: Remove some duplicate method definitions.

details:	http://hg.adium.im/adium/rev/212759975b0c
revision:	5242:212759975b0c
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Dec 30 15:31:34 2012 -0500

Remove some duplicate method definitions.
Subject: adium 5243:535c713ff1de: Don't use the deprecated isa property to set the class.

details:	http://hg.adium.im/adium/rev/535c713ff1de
revision:	5243:535c713ff1de
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun Dec 30 15:35:03 2012 -0500

Don't use the deprecated isa property to set the class.

diffs (252 lines):

diff -r a4385bf575e4 -r 535c713ff1de Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Wed Dec 19 18:51:32 2012 -0500
+++ b/Adium.xcodeproj/project.pbxproj	Sun Dec 30 15:35:03 2012 -0500
@@ -9362,7 +9362,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = AI;
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = "The Adium Team";
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/Adium Framework/Source/AIAccountMenu.m
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.m	Sun Dec 30 15:35:03 2012 -0500
@@ -51,7 +51,6 @@
 - (void)toggleAccountEnabled:(id)sender;
 - (void)dummyAction:(id)sender;
 - (void)editAccount:(id)sender;
-- (void)toggleAccountEnabled:(id)sender;
 @end
 
 static NSMenu *socialNetworkingSubmenuForAccount(AIAccount *account, id target, SEL action, id self);
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m
--- a/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m	Sun Dec 30 15:35:03 2012 -0500
@@ -69,7 +69,6 @@
 - (void)denyBlock:(id)sender;
 - (void)ignore:(id)sender;
 - (void)ignoreBlock:(id)sender;
-- (void)authorize:(id)sender;
 - (void)authorizeAdd:(id)sender;
 @end
 
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/Adium Framework/Source/AIStatusControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIStatusControllerProtocol.h	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIStatusControllerProtocol.h	Sun Dec 30 15:35:03 2012 -0500
@@ -145,5 +145,4 @@
 - (AIStatusGroup *)rootStateGroup;
 
 - (void)savedStatusesChanged;
-- (void)statusStateDidSetUniqueStatusID;
 @end
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m
--- a/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m	Sun Dec 30 15:35:03 2012 -0500
@@ -60,7 +60,7 @@
 			 target:(id)inTarget
 		   userInfo:(id)inUserInfo
 {
-	if (self = [self init]) {
+	if ((self = [self init])) {
 		[self changeWindowToTitle:inTitle
 					defaultButton:inDefaultButton
 				  alternateButton:inAlternateButton
@@ -78,7 +78,7 @@
 
 - (id)init
 {
-	if (self = [super initWithWindowNibName:TEXT_AND_BUTTONS_WINDOW_NIB]) {
+	if ((self = [super initWithWindowNibName:TEXT_AND_BUTTONS_WINDOW_NIB])) {
 		
 	}
 	
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj	Sun Dec 30 15:35:03 2012 -0500
@@ -399,7 +399,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = AH;
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = "The Adium Team";
 			};
 			buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
diff -r a4385bf575e4 -r 535c713ff1de Frameworks/JSONKit/JSONKit.m
--- a/Frameworks/JSONKit/JSONKit.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Frameworks/JSONKit/JSONKit.m	Sun Dec 30 15:35:03 2012 -0500
@@ -657,7 +657,7 @@
   NSCParameterAssert((objects != NULL) && (_JKArrayClass != NULL) && (_JKArrayInstanceSize > 0UL));
   JKArray *array = NULL;
   if(JK_EXPECT_T((array = (JKArray *)calloc(1UL, _JKArrayInstanceSize)) != NULL)) { // Directly allocate the JKArray instance via calloc.
-    array->isa      = _JKArrayClass;
+    object_setClass(array, _JKArrayClass);
     if((array = [array init]) == NULL) { return(NULL); }
     array->capacity = count;
     array->count    = count;
@@ -906,7 +906,7 @@
   NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_JKDictionaryClass != NULL) && (_JKDictionaryInstanceSize > 0UL));
   JKDictionary *dictionary = NULL;
   if(JK_EXPECT_T((dictionary = (JKDictionary *)calloc(1UL, _JKDictionaryInstanceSize)) != NULL)) { // Directly allocate the JKDictionary instance via calloc.
-    dictionary->isa      = _JKDictionaryClass;
+    object_setClass(dictionary, _JKDictionaryClass);
     if((dictionary = [dictionary init]) == NULL) { return(NULL); }
     dictionary->capacity = _JKDictionaryCapacityForCount(count);
     dictionary->count    = 0UL;
diff -r a4385bf575e4 -r 535c713ff1de Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h
--- a/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h	Wed Dec 19 18:51:32 2012 -0500
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h	Sun Dec 30 15:35:03 2012 -0500
@@ -55,7 +55,6 @@
 - (void)setRemoteFilename:(NSString *)aRemoteFilename;
 - (NSString *)url;
 - (void)setUrl:(NSString *)anUrl;
-- (NSString *)mimeType;
 - (void)setMimeType:(NSString *)aMimeType;
 - (id)accountData;
 - (void)setAccountData:(id)anAccountData;
diff -r a4385bf575e4 -r 535c713ff1de Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h	Wed Dec 19 18:51:32 2012 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h	Sun Dec 30 15:35:03 2012 -0500
@@ -23,8 +23,6 @@
 - (id)delegate;
 - (void)setDelegate:(id)newDelegate;
 
-- (EKEzvOutgoingFileTransfer *)transfer;
-
 - (NSURL *)documentRoot;
 - (void)setDocumentRoot:(NSURL *)value;
 
diff -r a4385bf575e4 -r 535c713ff1de Plugins/Emoticons/AIEmoticonPreferences.m
--- a/Plugins/Emoticons/AIEmoticonPreferences.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Plugins/Emoticons/AIEmoticonPreferences.m	Sun Dec 30 15:35:03 2012 -0500
@@ -46,7 +46,7 @@
 
 - (id)init
 {
-	if (self = [super initWithWindowNibName:@"EmoticonPrefs"]) {
+	if ((self = [super initWithWindowNibName:@"EmoticonPrefs"])) {
 		
 	}
 	
diff -r a4385bf575e4 -r 535c713ff1de Plugins/Purple Service/CBPurpleAccount.h
--- a/Plugins/Purple Service/CBPurpleAccount.h	Wed Dec 19 18:51:32 2012 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.h	Sun Dec 30 15:35:03 2012 -0500
@@ -56,8 +56,6 @@
 - (void)createNewPurpleAccount;
 
 - (void)dealloc;
-- (NSSet *)supportedPropertyKeys;
-- (void)updateStatusForKey:(NSString *)key;
 - (NSDictionary *)defaultProperties;
 - (NSString *)unknownGroupName;
 - (AIService *)_serviceForUID:(NSString *)contactUID;
diff -r a4385bf575e4 -r 535c713ff1de Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Sun Dec 30 15:35:03 2012 -0500
@@ -79,7 +79,6 @@
 - (BOOL)shouldHandleDragWithPasteboard:(NSPasteboard *)pasteboard;
 - (void)enqueueContentObject:(AIContentObject *)contentObject;
 - (void)debugLog:(NSString *)message;
-- (void)processQueuedContent;
 - (NSString *)webviewSource;
 - (void) setIsGroupChat:(BOOL) flag;
 
diff -r a4385bf575e4 -r 535c713ff1de Source/AIDockIconSelectionSheet.m
--- a/Source/AIDockIconSelectionSheet.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Source/AIDockIconSelectionSheet.m	Sun Dec 30 15:35:03 2012 -0500
@@ -39,7 +39,7 @@
 
 - (id)init
 {
-	if (self = [super initWithWindowNibName:@"DockIconSelectionSheet"]) {
+	if ((self = [super initWithWindowNibName:@"DockIconSelectionSheet"])) {
 		
 	}
 	
diff -r a4385bf575e4 -r 535c713ff1de Source/AINewGroupWindowController.m
--- a/Source/AINewGroupWindowController.m	Wed Dec 19 18:51:32 2012 -0500
+++ b/Source/AINewGroupWindowController.m	Sun Dec 30 15:35:03 2012 -0500
@@ -32,7 +32,7 @@
 
 - (id)init
 {
-	if (self = [super initWithWindowNibName:ADD_GROUP_PROMPT_NIB]) {
+	if ((self = [super initWithWindowNibName:ADD_GROUP_PROMPT_NIB])) {
 		
 	}
 	
diff -r a4385bf575e4 -r 535c713ff1de xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig	Wed Dec 19 18:51:32 2012 -0500
+++ b/xcconfigs/Base.xcconfig	Sun Dec 30 15:35:03 2012 -0500
@@ -1,32 +1,38 @@
+FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "$(BUILT_PRODUCTS_DIR)"
+FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "$(SRCROOT)/Frameworks"
+FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)
+ALWAYS_SEARCH_USER_PATHS = NO
+
+VALID_ARCHS = x86_64
+ARCHS = $(NATIVE_ARCH_ACTUAL)
+SDKROOT = macosx
+MACOSX_DEPLOYMENT_TARGET = 10.7
+DEBUG_INFORMATION_FORMAT = dwarf
+WARNING_CFLAGS = -Wall -Wno-arc-performSelector-leaks
+OTHER_CFLAGS = "$(CFLAGS)"
+RUN_CLANG_STATIC_ANALYZER = NO
+COMBINE_HIDPI_IMAGES = YES
+PREBINDING = NO
+
 GCC_PREFIX_HEADER = Adium.pch
-ARCHS = $(NATIVE_ARCH_ACTUAL)
-FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "$(SRCROOT)/Frameworks"
 GCC_ENABLE_CPP_EXCEPTIONS = NO
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+GCC_ENABLE_FIX_AND_CONTINUE = NO
+GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES
+GCC_ENABLE_SYMBOL_SEPARATION = YES
+GCC_ENABLE_OBJC_EXCEPTIONS = YES
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+GCC_TREAT_WARNINGS_AS_ERRORS = NO
+
 GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
 GCC_WARN_SHADOW = YES
-GCC_C_LANGUAGE_STANDARD = gnu99
-GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-SDKROOT = macosx
-MACOSX_DEPLOYMENT_TARGET = 10.7
 GCC_WARN_ABOUT_MISSING_NEWLINE = YES
 GCC_WARN_UNUSED_VARIABLE = YES
 GCC_WARN_MISSING_PARENTHESES = YES
-ALWAYS_SEARCH_USER_PATHS = NO
 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES
-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)
-GCC_ENABLE_FIX_AND_CONTINUE = NO
 GCC_WARN_ABOUT_RETURN_TYPE = YES
 GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES
-GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES
-PREBINDING = NO
-GCC_ENABLE_SYMBOL_SEPARATION = YES
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-VALID_ARCHS = x86_64
-DEBUG_INFORMATION_FORMAT = dwarf
-WARNING_CFLAGS = -Wall -Wno-arc-performSelector-leaks
-OTHER_CFLAGS = "$(CFLAGS)"
-FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "$(BUILT_PRODUCTS_DIR)"
 GCC_WARN_64_TO_32_BIT_CONVERSION = YES
 GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
 GCC_WARN_STRICT_SELECTOR_MATCH = missing value
@@ -34,6 +40,8 @@
 GCC_WARN_UNUSED_FUNCTION = YES
 GCC_WARN_UNUSED_LABEL = YES
 GCC_WARN_UNUSED_VALUE = YES
-GCC_TREAT_WARNINGS_AS_ERRORS = NO
-RUN_CLANG_STATIC_ANALYZER = NO
-COMBINE_HIDPI_IMAGES = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES
+
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES




More information about the commits mailing list