pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Integer warning fixes.

Browse source
This commit is contained in:
Alex Zolotarev 2015-05-26 14:30:41 +03:00
parent 164325358b
commit f83246b423
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/ActiveMapsVC.mm
View file

@ -99,7 +99,7 @@ extern NSString * const MapsStatusChangedNotification;
- (void)markSelectedMapIndexPath:(NSIndexPath *)indexPath
{
self.selectedPosition = indexPath.row;
self.selectedPosition = static_cast<int>(indexPath.row);
self.selectedGroup = [self groupWithSection:indexPath.section];
}
@ -237,7 +237,7 @@ extern NSString * const MapsStatusChangedNotification;
if (!cell)
cell = [[MapCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[MapCell className]];
int const position = indexPath.row;
int const position = static_cast<int const>(indexPath.row);
ActiveMapsLayout::TGroup const group = [self groupWithSection:indexPath.section];
TStatus const status = self.mapsLayout.GetCountryStatus(group, position);
TMapOptions const options = self.mapsLayout.GetCountryOptions(group, position);
@ -293,7 +293,7 @@ extern NSString * const MapsStatusChangedNotification;
- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
{
TStatus const status = self.mapsLayout.GetCountryStatus([self groupWithSection:indexPath.section], indexPath.row);
TStatus const status = self.mapsLayout.GetCountryStatus([self groupWithSection:indexPath.section], static_cast<int>(indexPath.row));
return status == TStatus::EOnDisk || status == TStatus::EOnDiskOutOfDate;
}
@ -301,7 +301,7 @@ extern NSString * const MapsStatusChangedNotification;
{
if (editingStyle == UITableViewCellEditingStyleDelete)
{
int const position = indexPath.row;
int const position = static_cast<int const>(indexPath.row);
ActiveMapsLayout::TGroup const group = [self groupWithSection:indexPath.section];
TMapOptions const options = self.mapsLayout.GetCountryOptions(group, position);
self.mapsLayout.DeleteMap(group, position, options);
@ -340,7 +340,7 @@ extern NSString * const MapsStatusChangedNotification;
- (void)mapCellDidCancelDownloading:(MapCell *)cell
{
NSIndexPath * indexPath = [self.tableView indexPathForCell:cell];
self.selectedPosition = indexPath.row;
self.selectedPosition = static_cast<int>(indexPath.row);
self.selectedGroup = [self groupWithSection:indexPath.section];
[[self actionSheetToCancelDownloadingSelectedMap] showFromRect:cell.frame inView:cell.superview animated:YES];

2
iphone/Maps/Bookmarks/AddSetVC.h
View file

@ -4,7 +4,7 @@
@class AddSetVC;
@protocol AddSetVCDelegate <NSObject>
- (void)addSetVC:(AddSetVC *)vc didAddSetWithIndex:(size_t)setIndex;
- (void)addSetVC:(AddSetVC *)vc didAddSetWithIndex:(int)setIndex;
@end

2
iphone/Maps/Bookmarks/AddSetVC.mm
View file

@ -30,7 +30,7 @@
NSString * text = textField.text;
if (text.length)
{
[self.delegate addSetVC:self didAddSetWithIndex:GetFramework().AddCategory([text UTF8String])];
[self.delegate addSetVC:self didAddSetWithIndex:static_cast<int>(GetFramework().AddCategory([text UTF8String]))];
[self.navigationController popViewControllerAnimated:YES];
}
}

2
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -438,7 +438,7 @@
- (void)calculateSections
{
size_t index = 1;
int index = 1;
BookmarkCategory * cat = GetFramework().GetBmCategory(m_categoryIndex);
if (cat->GetTracksCount())
m_trackSection = index++;

8
iphone/Maps/Bookmarks/SelectSetVC.mm
View file

@ -69,7 +69,7 @@
return cell;
}
- (void)addSetVC:(AddSetVC *)vc didAddSetWithIndex:(size_t)setIndex
- (void)addSetVC:(AddSetVC *)vc didAddSetWithIndex:(int)setIndex
{
[self moveBookmarkToSetWithIndex:setIndex];
@ -77,9 +77,9 @@
[self.delegate selectSetVC:self didUpdateBookmarkAndCategory:m_bookmarkAndCategory];
}
- (void)moveBookmarkToSetWithIndex:(size_t)setIndex
- (void)moveBookmarkToSetWithIndex:(int)setIndex
{
m_bookmarkAndCategory.second = GetFramework().MoveBookmark(m_bookmarkAndCategory.second, m_bookmarkAndCategory.first, setIndex);
m_bookmarkAndCategory.second = static_cast<int>(GetFramework().MoveBookmark(m_bookmarkAndCategory.second, m_bookmarkAndCategory.first, setIndex));
m_bookmarkAndCategory.first = setIndex;
}
@ -96,7 +96,7 @@
}
else
{
[self moveBookmarkToSetWithIndex:indexPath.row];
[self moveBookmarkToSetWithIndex:static_cast<int>(indexPath.row)];
[self.delegate selectSetVC:self didUpdateBookmarkAndCategory:m_bookmarkAndCategory];
[self.navigationController popViewControllerAnimated:YES];
}