From 920d42946e535306eda305478c42ef0e59aeb2ec Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 28 Oct 2014 12:10:22 +0100 Subject: [PATCH] Remove warnings generated by Xcode --- Classes/LinphoneAppDelegate.m | 7 ++- Classes/LinphoneUI/UICallBar.m | 8 ++-- .../IASKAppSettingsViewController.m | 12 ++--- .../NinePatch.xcodeproj/project.pbxproj | 20 +------- Classes/Utils/OrderedDictionary.m | 21 +++++--- .../XMLRPC/XMLRPC.xcodeproj/project.pbxproj | 20 +------- Classes/Utils/XMLRPC/XMLRPCConnection.m | 36 +++++++------- .../Utils/XMLRPC/XMLRPCConnectionManager.h | 2 +- .../Utils/XMLRPC/XMLRPCConnectionManager.m | 26 +++++----- Classes/Utils/XMLRPC/XMLRPCRequest.m | 28 +++++------ README.md | 2 +- linphone.xcodeproj/project.pbxproj | 48 ++++++++++++++----- .../xcschemes/LinphoneTester.xcscheme | 2 +- .../xcshareddata/xcschemes/linphone.xcscheme | 2 +- 14 files changed, 116 insertions(+), 118 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 45ea94fef..2502f5c16 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -166,9 +166,8 @@ [localRingNotifAction setActions:localRingActions forContext:UIUserNotificationActionContextDefault]; [localRingNotifAction setActions:localRingActions forContext:UIUserNotificationActionContextMinimal]; - [Decline release]; - [Answer release]; - + [decline release]; + [answer release]; return localRingNotifAction; } @@ -329,7 +328,7 @@ } - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { - Linphone_log(@"%@ - state = %ld", NSStringFromSelector(_cmd), application.applicationState); + Linphone_log(@"%@ - state = %d", NSStringFromSelector(_cmd), application.applicationState); [self fixRing]; diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index 728659778..ec2d16c0c 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -335,10 +335,10 @@ } switch(state) { - LinphoneCallEnd: - LinphoneCallError: - LinphoneCallIncoming: - LinphoneCallOutgoing: + case LinphoneCallEnd: + case LinphoneCallError: + case LinphoneCallIncoming: + case LinphoneCallOutgoing: [self hidePad:TRUE]; [self hideOptions:TRUE]; [self hideRoutes:TRUE]; diff --git a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m index f9d7afc19..da7395b1a 100755 --- a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m +++ b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m @@ -27,9 +27,9 @@ #import "IASKSpecifierValuesViewController.h" #import "IASKTextField.h" -static const CGFloat KEYBOARD_ANIMATION_DURATION = 0.3; -static const CGFloat MINIMUM_SCROLL_FRACTION = 0.2; -static const CGFloat MAXIMUM_SCROLL_FRACTION = 0.8; +//static const CGFloat KEYBOARD_ANIMATION_DURATION = 0.3; +//static const CGFloat MINIMUM_SCROLL_FRACTION = 0.2; +//static const CGFloat MAXIMUM_SCROLL_FRACTION = 0.8; static NSString *kIASKCredits = @"Powered by InAppSettingsKit"; // Leave this as-is!!! @@ -579,7 +579,7 @@ CGRect IASKCGRectSwap(CGRect rect); } else { textField.autocorrectionType = specifier.autoCorrectionType; } - textField.textAlignment = specifier.textAlignment; + textField.textAlignment = (NSTextAlignment)specifier.textAlignment; textField.adjustsFontSizeToFitWidth = specifier.adjustsFontSizeToFitWidth; } else if ([specifier.type isEqualToString:kIASKPSSliderSpecifier]) { @@ -615,9 +615,9 @@ CGRect IASKCGRectSwap(CGRect rect); cell.imageView.highlightedImage = specifier.highlightedCellImage; if (![specifier.type isEqualToString:kIASKPSMultiValueSpecifier] && ![specifier.type isEqualToString:kIASKPSTitleValueSpecifier] && ![specifier.type isEqualToString:kIASKPSTextFieldSpecifier]) { - cell.textLabel.textAlignment = specifier.textAlignment; + cell.textLabel.textAlignment = (NSTextAlignment)specifier.textAlignment; } - cell.detailTextLabel.textAlignment = specifier.textAlignment; + cell.detailTextLabel.textAlignment = (NSTextAlignment)specifier.textAlignment; cell.textLabel.adjustsFontSizeToFitWidth = specifier.adjustsFontSizeToFitWidth; cell.detailTextLabel.adjustsFontSizeToFitWidth = specifier.adjustsFontSizeToFitWidth; return cell; diff --git a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj index e45af12bf..cf5dee0db 100755 --- a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj +++ b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0610; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "NinePatch" */; compatibilityVersion = "Xcode 3.2"; @@ -305,17 +305,13 @@ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -325,10 +321,6 @@ 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_THUMB_SUPPORT = NO; @@ -344,10 +336,6 @@ D3D14E7E15A72BD10074A527 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_THUMB_SUPPORT = NO; @@ -381,10 +369,6 @@ D3D14E8015A72BD70074A527 /* DistributionAdhoc */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_THUMB_SUPPORT = NO; diff --git a/Classes/Utils/OrderedDictionary.m b/Classes/Utils/OrderedDictionary.m index 8678ed0dd..0d6683e8a 100644 --- a/Classes/Utils/OrderedDictionary.m +++ b/Classes/Utils/OrderedDictionary.m @@ -47,19 +47,26 @@ NSString *DescriptionForObject(NSObject *object, id locale, NSUInteger indent) @implementation OrderedDictionary -- (id)init +- (void) initObjectsWithCapacity:(NSUInteger)capacity { - return [self initWithCapacity:0]; -} - -- (id)initWithCapacity:(NSUInteger)capacity -{ - self = [super init]; if (self != nil) { dictionary = [[NSMutableDictionary alloc] initWithCapacity:capacity]; array = [[NSMutableArray alloc] initWithCapacity:capacity]; } +} + +- (id)init +{ + self = [super init]; + [self initObjectsWithCapacity:0]; + return self; +} + +- (id)initWithCapacity:(NSUInteger)capacity +{ + self = [super init]; + [self initObjectsWithCapacity:0]; return self; } diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj index 5cc078b9c..0199834fe 100755 --- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj +++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0610; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */; compatibilityVersion = "Xcode 3.2"; @@ -374,10 +374,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 07127C5A0F4266F4009C7476 /* CommonRelease.xcconfig */; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; @@ -407,13 +403,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 07127C590F4266F4009C7476 /* CommonDevelopment.xcconfig */; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; }; @@ -441,10 +433,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 07127C5A0F4266F4009C7476 /* CommonRelease.xcconfig */; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; @@ -474,10 +462,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 07127C5A0F4266F4009C7476 /* CommonRelease.xcconfig */; buildSettings = { - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; diff --git a/Classes/Utils/XMLRPC/XMLRPCConnection.m b/Classes/Utils/XMLRPC/XMLRPCConnection.m index e4e305346..01410c41a 100755 --- a/Classes/Utils/XMLRPC/XMLRPCConnection.m +++ b/Classes/Utils/XMLRPC/XMLRPCConnection.m @@ -46,15 +46,15 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; myIdentifier = [NSString stringByGeneratingUUID]; #endif myData = [[NSMutableData alloc] init]; - + myConnection = [[NSURLConnection alloc] initWithRequest: [request request] delegate: self]; - + #if ! __has_feature(objc_arc) myDelegate = [delegate retain]; #else myDelegate = delegate; #endif - + if (myConnection) { NSLog(@"The connection, %@, has been established!", myIdentifier); } else { @@ -65,7 +65,7 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; return nil; } } - + return self; } @@ -78,10 +78,10 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; #else NSData *data = [NSURLConnection sendSynchronousRequest: [request request] returningResponse: &response error: error]; #endif - + if (response) { NSInteger statusCode = [response statusCode]; - + if ((statusCode < 400) && data) { #if ! __has_feature(objc_arc) return [[[XMLRPCResponse alloc] initWithData: data] autorelease]; @@ -90,7 +90,7 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; #endif } } - + return nil; } @@ -118,7 +118,7 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; #pragma mark - -- (void)dealloc { +- (void)dealloc { #if ! __has_feature(objc_arc) [myManager release]; [myRequest release]; @@ -126,7 +126,7 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; [myData release]; [myConnection release]; [myDelegate release]; - + [super dealloc]; #endif } @@ -139,17 +139,17 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; - (void)connection: (NSURLConnection *)connection didReceiveResponse: (NSURLResponse *)response { if([response respondsToSelector: @selector(statusCode)]) { - NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode]; - + long statusCode = [(NSHTTPURLResponse *)response statusCode]; + if(statusCode >= 400) { NSError *error = [NSError errorWithDomain: @"HTTP" code: statusCode userInfo: nil]; - + [myDelegate request: myRequest didFailWithError: error]; } else if (statusCode == 304) { [myManager closeConnectionForIdentifier: myIdentifier]; } } - + [myData setLength: 0]; } @@ -173,11 +173,11 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; #else XMLRPCRequest *request = myRequest; #endif - + NSLog(@"The connection, %@, failed with the following error: %@", myIdentifier, [error localizedDescription]); - + [myDelegate request: request didFailWithError: error]; - + [myManager closeConnectionForIdentifier: myIdentifier]; } @@ -204,10 +204,10 @@ totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite; XMLRPCResponse *response = [[XMLRPCResponse alloc] initWithData: myData]; XMLRPCRequest *request = myRequest; #endif - + [myDelegate request: request didReceiveResponse: response]; } - + [myManager closeConnectionForIdentifier: myIdentifier]; } diff --git a/Classes/Utils/XMLRPC/XMLRPCConnectionManager.h b/Classes/Utils/XMLRPC/XMLRPCConnectionManager.h index ae3a6f23b..22619d18e 100755 --- a/Classes/Utils/XMLRPC/XMLRPCConnectionManager.h +++ b/Classes/Utils/XMLRPC/XMLRPCConnectionManager.h @@ -17,7 +17,7 @@ - (NSArray *)activeConnectionIdentifiers; -- (int)numberOfActiveConnections; +- (long)numberOfActiveConnections; #pragma mark - diff --git a/Classes/Utils/XMLRPC/XMLRPCConnectionManager.m b/Classes/Utils/XMLRPC/XMLRPCConnectionManager.m index 4d3ca087a..2f2734faf 100755 --- a/Classes/Utils/XMLRPC/XMLRPCConnectionManager.m +++ b/Classes/Utils/XMLRPC/XMLRPCConnectionManager.m @@ -11,7 +11,7 @@ static XMLRPCConnectionManager *sharedInstance = nil; if (self) { myConnections = [[NSMutableDictionary alloc] init]; } - + return self; } @@ -21,11 +21,11 @@ static XMLRPCConnectionManager *sharedInstance = nil; @synchronized(self) { if (!sharedInstance) { sharedInstance = [super allocWithZone: zone]; - + return sharedInstance; } } - + return nil; } @@ -37,7 +37,7 @@ static XMLRPCConnectionManager *sharedInstance = nil; sharedInstance = [[self alloc] init]; } } - + return sharedInstance; } @@ -50,13 +50,13 @@ static XMLRPCConnectionManager *sharedInstance = nil; #else NSString *identifier = [newConnection identifier]; #endif - + [myConnections setObject: newConnection forKey: identifier]; - + #if ! __has_feature(objc_arc) [newConnection release]; #endif - + return identifier; } @@ -66,8 +66,8 @@ static XMLRPCConnectionManager *sharedInstance = nil; return [myConnections allKeys]; } -- (int)numberOfActiveConnections { - return (int)[myConnections count]; +- (long)numberOfActiveConnections { + return [myConnections count]; } #pragma mark - @@ -80,17 +80,17 @@ static XMLRPCConnectionManager *sharedInstance = nil; - (void)closeConnectionForIdentifier: (NSString *)identifier { XMLRPCConnection *selectedConnection = [self connectionForIdentifier: identifier]; - + if (selectedConnection) { [selectedConnection cancel]; - + [myConnections removeObjectForKey: identifier]; } } - (void)closeConnections { [[myConnections allValues] makeObjectsPerformSelector: @selector(cancel)]; - + [myConnections removeAllObjects]; } @@ -98,7 +98,7 @@ static XMLRPCConnectionManager *sharedInstance = nil; - (void)finalize { [self closeConnections]; - + [super finalize]; } diff --git a/Classes/Utils/XMLRPC/XMLRPCRequest.m b/Classes/Utils/XMLRPC/XMLRPCRequest.m index 1b6272f64..d01427b07 100755 --- a/Classes/Utils/XMLRPC/XMLRPCRequest.m +++ b/Classes/Utils/XMLRPC/XMLRPCRequest.m @@ -12,13 +12,13 @@ } else { myRequest = [[NSMutableURLRequest alloc] init]; } - + myXMLEncoder = encoder; #if ! __has_feature(objc_arc) [myXMLEncoder retain]; #endif } - + return self; } @@ -75,11 +75,11 @@ - (void)setMethod: (NSString *)method withParameter: (id)parameter { NSArray *parameters = nil; - + if (parameter) { parameters = [NSArray arrayWithObject: parameter]; } - + [myXMLEncoder setMethod: method withParameters: parameters]; } @@ -107,41 +107,41 @@ - (NSURLRequest *)request { NSData *content = [[self body] dataUsingEncoding: NSUTF8StringEncoding]; - NSNumber *contentLength = [NSNumber numberWithInteger:[content length]]; - + NSNumber *contentLength = [NSNumber numberWithLong: [content length]]; + if (!myRequest) { return nil; } - + [myRequest setHTTPMethod: @"POST"]; - + if (![myRequest valueForHTTPHeaderField: @"Content-Type"]) { [myRequest addValue: @"text/xml" forHTTPHeaderField: @"Content-Type"]; } else { [myRequest setValue: @"text/xml" forHTTPHeaderField: @"Content-Type"]; } - + if (![myRequest valueForHTTPHeaderField: @"Content-Length"]) { [myRequest addValue: [contentLength stringValue] forHTTPHeaderField: @"Content-Length"]; } else { [myRequest setValue: [contentLength stringValue] forHTTPHeaderField: @"Content-Length"]; } - + if (![myRequest valueForHTTPHeaderField: @"Accept"]) { [myRequest addValue: @"text/xml" forHTTPHeaderField: @"Accept"]; } else { [myRequest setValue: @"text/xml" forHTTPHeaderField: @"Accept"]; } - + if (![self userAgent]) { NSString *userAgent = [[NSUserDefaults standardUserDefaults] objectForKey:@"UserAgent"]; if (userAgent) { [self setUserAgent:userAgent]; } } - + [myRequest setHTTPBody: content]; - + return (NSURLRequest *)myRequest; } @@ -157,7 +157,7 @@ #if ! __has_feature(objc_arc) [myRequest release]; [myXMLEncoder release]; - + [super dealloc]; #endif } diff --git a/README.md b/README.md index 8dba70955..456b86d69 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ You must first install both Xcode with iPhone OS SDK and [HomeBrew](brew.sh) or ```sh brew install automake intltool libtool pkg-config coreutils yasm nasm wget imagemagick # then you have to install antlr3 from a tap. -wget https://gist.github.com/Gui13/f5cf103f50d34c28c7be/raw/5d1abaa11bacf7256aac9cb42e2f569a0b775d86/antlr3.rb +wget https://gist.githubusercontent.com/Gui13/f5cf103f50d34c28c7be/raw/f50242f5e0c3a6d25ed7fca1462bce3a7b738971/antlr3.rb mv antlr3.rb /usr/local/Library/Formula/ brew install antlr3 ``` diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7da16a654..b03004b24 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -801,9 +801,9 @@ D3807FC415C28940005BE9BC /* DCRoundSwitchOutlineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FBC15C28940005BE9BC /* DCRoundSwitchOutlineLayer.m */; }; D3807FC515C28940005BE9BC /* DCRoundSwitchToggleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FBE15C28940005BE9BC /* DCRoundSwitchToggleLayer.m */; }; D3807FC615C28940005BE9BC /* DCRoundSwitchToggleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FBE15C28940005BE9BC /* DCRoundSwitchToggleLayer.m */; }; - D3807FE815C2894A005BE9BC /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCA15C2894A005BE9BC /* IASKAppSettingsViewController.m */; }; + D3807FE815C2894A005BE9BC /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCA15C2894A005BE9BC /* IASKAppSettingsViewController.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; D3807FE915C2894A005BE9BC /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCA15C2894A005BE9BC /* IASKAppSettingsViewController.m */; }; - D3807FEA15C2894A005BE9BC /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCC15C2894A005BE9BC /* IASKAppSettingsWebViewController.m */; }; + D3807FEA15C2894A005BE9BC /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCC15C2894A005BE9BC /* IASKAppSettingsWebViewController.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; D3807FEB15C2894A005BE9BC /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCC15C2894A005BE9BC /* IASKAppSettingsWebViewController.m */; }; D3807FEC15C2894A005BE9BC /* IASKSpecifierValuesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCE15C2894A005BE9BC /* IASKSpecifierValuesViewController.m */; }; D3807FED15C2894A005BE9BC /* IASKSpecifierValuesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FCE15C2894A005BE9BC /* IASKSpecifierValuesViewController.m */; }; @@ -815,11 +815,11 @@ D3807FF315C2894A005BE9BC /* IASKSettingsStoreFile.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FD615C2894A005BE9BC /* IASKSettingsStoreFile.m */; }; D3807FF415C2894A005BE9BC /* IASKSettingsStoreUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FD815C2894A005BE9BC /* IASKSettingsStoreUserDefaults.m */; }; D3807FF515C2894A005BE9BC /* IASKSettingsStoreUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FD815C2894A005BE9BC /* IASKSettingsStoreUserDefaults.m */; }; - D3807FF615C2894A005BE9BC /* IASKSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDA15C2894A005BE9BC /* IASKSpecifier.m */; }; + D3807FF615C2894A005BE9BC /* IASKSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDA15C2894A005BE9BC /* IASKSpecifier.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; D3807FF715C2894A005BE9BC /* IASKSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDA15C2894A005BE9BC /* IASKSpecifier.m */; }; D3807FF815C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDD15C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m */; }; D3807FF915C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDD15C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m */; }; - D3807FFA15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDF15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m */; }; + D3807FFA15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDF15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; D3807FFB15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FDF15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m */; }; D3807FFC15C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FE115C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m */; }; D3807FFD15C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3807FE115C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m */; }; @@ -1594,7 +1594,6 @@ 2248E90C12F7E4CF00220D9C /* UIDigitButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButton.h; sourceTree = ""; }; 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButton.m; sourceTree = ""; }; 22509041196BD902007863F6 /* libopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenh264.a; path = "liblinphone-sdk/apple-darwin/lib/libopenh264.a"; sourceTree = ""; }; - 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = ""; }; 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; 226183AB1472527D0037138E /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; @@ -1653,6 +1652,7 @@ 631C4FB019D2A8F2004BFE77 /* UIDigitButtonLongPlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButtonLongPlus.m; sourceTree = ""; }; 631C4FB519D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButtonLongVoiceMail.h; sourceTree = ""; }; 631C4FB619D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButtonLongVoiceMail.m; sourceTree = ""; }; + 633E388219FFB0F400936D1C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = "liblinphone-sdk/apple-darwin/share/linphone/rootca.pem"; sourceTree = ""; }; 7066FC0B13E830E400EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; 70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; @@ -2783,6 +2783,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 633E388219FFB0F400936D1C /* README.md */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97323FDCFA39411CA2CEA /* Frameworks */, F04892FE180C3296002FED35 /* ImageOptim.sh */, @@ -2791,7 +2792,6 @@ F08F118819C09C6B007D70C2 /* LinphoneTester Tests */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 19C28FACFE9D520D11CA2CBB /* Products */, - 2258633C11410BAC00C5A737 /* README */, 29B97317FDCFA39411CA2CEA /* Resources */, D398D3031594B0FB00FD553C /* Settings */, ); @@ -3726,7 +3726,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0610; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = Z2V957B3D6; @@ -5528,7 +5528,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; @@ -5577,16 +5576,22 @@ 228B19A61302902F00F154D3 /* DistributionAdhoc */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5807,16 +5812,22 @@ 22F3D55513CC3C9100A0DA02 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5878,16 +5889,22 @@ 22F51EE7107FA53D00F98953 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5950,20 +5967,27 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; + ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme index 00754381c..8e72f5ba4 100644 --- a/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme +++ b/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme @@ -1,6 +1,6 @@