mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare for ARM64 compilation and remove loss-precision warnings where possible (possibly incomplete)

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-10-27 11:48:09 +01:00
parent b4e18d46ce
commit 954dc2fedf
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/ChatTableViewController.m
View file

@ -104,7 +104,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
[selectedBackgroundView setBackgroundColor:LINPHONE_TABLE_CELL_BACKGROUND_COLOR];
}
[cell setChatRoom:(LinphoneChatRoom*)ms_list_nth_data(data, [indexPath row])];
[cell setChatRoom:(LinphoneChatRoom*)ms_list_nth_data(data, (int)[indexPath row])];
return cell;
}
@ -114,7 +114,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[tableView deselectRowAtIndexPath:indexPath animated:NO];
LinphoneChatRoom *chatRoom = (LinphoneChatRoom*)ms_list_nth_data(data, [indexPath row]);
LinphoneChatRoom *chatRoom = (LinphoneChatRoom*)ms_list_nth_data(data, (int)[indexPath row]);
// Go to ChatRoom view
ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController);
@ -135,7 +135,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
if(editingStyle == UITableViewCellEditingStyleDelete) {
[tableView beginUpdates];
LinphoneChatRoom *chatRoom = (LinphoneChatRoom*)ms_list_nth_data(data, [indexPath row]);
LinphoneChatRoom *chatRoom = (LinphoneChatRoom*)ms_list_nth_data(data, (int)[indexPath row]);
linphone_chat_room_delete_history(chatRoom);
linphone_chat_room_destroy(chatRoom);
data = linphone_core_get_chat_rooms([LinphoneManager getLc]);

6
Classes/ContactDetailsTableViewController.m
View file

@ -850,7 +850,7 @@ static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSe
ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonPhoneProperty);
ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap);
CFRelease(lcMap);
int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
ABMultiValueReplaceLabelAtIndex(lMap, (CFStringRef)(value), index);
ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil);
CFRelease(lMap);
@ -858,7 +858,7 @@ static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSe
ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty);
ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap);
CFRelease(lcMap);
int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
ABMultiValueReplaceLabelAtIndex(lMap, (CFStringRef)(value), index);
ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil);
CFRelease(lMap);
@ -866,7 +866,7 @@ static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSe
ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty);
ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap);
CFRelease(lcMap);
int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
NSInteger index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
ABMultiValueReplaceLabelAtIndex(lMap, (CFStringRef)(value), index);
ABRecordSetValue(contact, kABPersonEmailProperty, lMap, nil);
CFRelease(lMap);

2
Classes/ContactsTableViewController.m
View file

@ -119,7 +119,7 @@ static int ms_strcmpfuz(const char * fuzzy_word, const char * sentence) {
}
// If the whole fuzzy was found, returns 0. Otherwise returns number of characters left.
return (within_sentence != NULL ? 0 : fuzzy_word + strlen(fuzzy_word) - c);
return (int)(within_sentence != NULL ? 0 : fuzzy_word + strlen(fuzzy_word) - c);
}
- (void)loadData {

2
Classes/LinphoneAppDelegate.m
View file

@ -340,7 +340,7 @@
}
- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
Linphone_log(@"%@ - state = %d", NSStringFromSelector(_cmd), application.applicationState);
Linphone_log(@"%@ - state = %ld", NSStringFromSelector(_cmd), application.applicationState);
[self fixRing];

6
Classes/LinphoneManager.m
View file

@ -459,7 +459,7 @@ exit_dbmigration:
@"start_at_boot_preference" :@YES};
BOOL shouldSync = FALSE;
Linphone_log(@"%d user prefs", [defaults_keys count]);
Linphone_log(@"%lu user prefs", (unsigned long)[defaults_keys count]);
for( NSString* userpref in values ){
if( [defaults_keys containsObject:userpref] ){
@ -1015,7 +1015,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
&& (lLinphoneMgr.connectivity == newConnectivity || lLinphoneMgr.connectivity == none)) {
linphone_proxy_config_expires(proxy, 0);
} else if (proxy){
int defaultExpire = [[LinphoneManager instance] lpConfigIntForKey:@"default_expires"];
NSInteger defaultExpire = [[LinphoneManager instance] lpConfigIntForKey:@"default_expires"];
if (defaultExpire>=0)
linphone_proxy_config_expires(proxy, defaultExpire);
//else keep default value from linphonecore
@ -1997,7 +1997,7 @@ static void audioRouteChangeListenerCallback (
- (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key forSection:(NSString *)section {
if (!key) return;
lp_config_set_int(configDb, [section UTF8String], [key UTF8String], value );
lp_config_set_int(configDb, [section UTF8String], [key UTF8String], (int)value );
}
- (NSInteger)lpConfigIntForKey:(NSString*)key {

2
Classes/PhoneMainView.m
View file

@ -318,7 +318,7 @@ static RootViewManager* rootViewManagerInstance = nil;
}
- (void)onGlobalStateChanged:(NSNotification*)notif {
LinphoneGlobalState state = [[[notif userInfo] valueForKey:@"state"] integerValue];
LinphoneGlobalState state = (LinphoneGlobalState)[[[notif userInfo] valueForKey:@"state"] integerValue];
static BOOL already_shown = FALSE;
if( state == LinphoneGlobalOn && !already_shown && [LinphoneManager instance].wasRemoteProvisioned ){
LinphoneProxyConfig* conf = NULL;

2
Classes/SettingsViewController.m
View file

@ -377,7 +377,7 @@
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[self.topViewController viewWillDisappear:animated];
UIViewController *nextView = nil;
int count = [self.viewControllers count];
NSInteger count = [self.viewControllers count];
if(count > 1) {
nextView = [self.viewControllers objectAtIndex:count - 2];
}

2
Classes/Utils/UACellBackgroundView/UACellBackgroundView.m
View file

@ -98,7 +98,7 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi
if([tableView style] == UITableViewStyleGrouped) {
NSIndexPath *path = [tableView indexPathForCell:cell];
if(path) {
int count = [tableView numberOfRowsInSection:[path section]];
NSInteger count = [tableView numberOfRowsInSection:[path section]];
// Set Position for background view
if([path row] == 0) {
if([path row] == (count - 1)) {