diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 7ae9d7e5b..8a4a175e5 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -37,7 +37,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf self = [super initWithNibName:@"ContactDetailsViewController" bundle:[NSBundle mainBundle]]; if(self != nil) { inhibUpdate = FALSE; - addressBook = ABAddressBookCreate(); + addressBook = ABAddressBookCreateWithOptions(nil, nil); ABAddressBookRegisterExternalChangeCallback(addressBook, sync_address_book, self); } return self; diff --git a/Classes/ImageSharing.m b/Classes/ImageSharing.m index c0ec61489..9833ab8be 100644 --- a/Classes/ImageSharing.m +++ b/Classes/ImageSharing.m @@ -155,7 +155,7 @@ [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer status code [%i]", statusCode]; if (statusCode == 200 && !upload) { - totalBytesExpectedToRead = [response expectedContentLength]; + totalBytesExpectedToRead = (int)[response expectedContentLength]; } } diff --git a/Classes/Model/ChatModel.m b/Classes/Model/ChatModel.m index 2c5767ba6..c14e576bf 100644 --- a/Classes/Model/ChatModel.m +++ b/Classes/Model/ChatModel.m @@ -103,7 +103,7 @@ if([self chatId] != nil) { [chatId release]; } - chatId = [[NSNumber alloc] initWithInt:sqlite3_last_insert_rowid(database)]; + chatId = [[NSNumber alloc] initWithInt:(int)sqlite3_last_insert_rowid(database)]; sqlite3_finalize(sqlStatement); } diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index b9eb446e6..d36e5b81a 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -141,8 +141,8 @@ [((IASKSwitchEx*)cell.accessoryView) addTarget:self action:@selector(toggledValue:) forControlEvents:UIControlEventValueChanged]; [((IASKSwitchEx*)cell.accessoryView) setOnTintColor:LINPHONE_MAIN_COLOR]; cell.selectionStyle = UITableViewCellSelectionStyleNone; - cell.textLabel.minimumFontSize = kIASKMinimumFontSize; - cell.detailTextLabel.minimumFontSize = kIASKMinimumFontSize; + cell.textLabel.minimumScaleFactor = kIASKMinimumFontSize/[UIFont systemFontSize]; + cell.detailTextLabel.minimumScaleFactor = kIASKMinimumFontSize/[UIFont systemFontSize]; } else { cell = [super newCellForIdentifier:identifier]; } @@ -361,7 +361,7 @@ labelTitleView.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.5]; labelTitleView.font = [UIFont boldSystemFontOfSize:20]; labelTitleView.shadowOffset = CGSizeMake(0,1); - labelTitleView.textAlignment = UITextAlignmentCenter; + labelTitleView.textAlignment = NSTextAlignmentCenter; labelTitleView.text = viewController.title; [labelTitleView sizeToFit]; viewController.navigationItem.titleView = labelTitleView; diff --git a/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m b/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m index 1af806879..17950b645 100755 --- a/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m +++ b/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m @@ -42,7 +42,7 @@ if (!self.textLabel.text.length) { viewSize = [self.detailTextLabel superview].frame.size; self.detailTextLabel.frame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, viewSize.width - kIASKPaddingLeft - kIASKPaddingRight - imageOffset, viewSize.height); - } else if (self.detailTextLabel.textAlignment == UITextAlignmentLeft) { + } else if (self.detailTextLabel.textAlignment == NSTextAlignmentLeft) { CGRect valueFrame = self.detailTextLabel.frame; valueFrame.origin.x = labelFrame.origin.x + MAX(kIASKMinLabelWidth - imageOffset, labelWidth) + kIASKSpacing; valueFrame.size.width = self.detailTextLabel.superview.frame.size.width - valueFrame.origin.x - kIASKPaddingRight;