diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-27 13:42:58 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-27 13:42:58 +0000 |
| commit | 7fa2a65c0cfc714364490cb715171461143024e0 (patch) | |
| tree | b7e40b0ca71a7ac8d957d150f038603cde2dcd3c /src/views | |
| parent | 1a5e51f94ed8cb01600184119e52bb64bdb3dccc (diff) | |
fix more 64bit warnings
BUG=skia:
Review URL: https://codereview.chromium.org/147683003
git-svn-id: http://skia.googlecode.com/svn/trunk@13190 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/mac/SkOptionsTableView.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/views/mac/SkOptionsTableView.mm b/src/views/mac/SkOptionsTableView.mm index 7a6afe42b3..b4cdbf4119 100644 --- a/src/views/mac/SkOptionsTableView.mm +++ b/src/views/mac/SkOptionsTableView.mm @@ -66,7 +66,7 @@ int menuIndex = fMenus->find(const_cast<SkOSMenu *>(menu)); if (menuIndex >= 0 && menuIndex < fMenus->count()) { NSUInteger first = 0; - for (NSInteger i = 0; i < menuIndex; ++i) { + for (int i = 0; i < menuIndex; ++i) { first += (*fMenus)[i]->getCount(); } [fItems removeObjectsInRange:NSMakeRange(first, [fItems count] - first)]; @@ -148,7 +148,7 @@ } - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; + NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; if (columnIndex == 0) { const SkOSMenu::Item* item = ((SkOptionItem*)[fItems objectAtIndex:row]).fItem; NSString* label = [NSString stringWithUTF8String:item->getLabel()]; @@ -163,7 +163,7 @@ - (NSCell *)tableView:(NSTableView *)tableView dataCellForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { if (tableColumn) { - int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; + NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; if (columnIndex == 1) return [((SkOptionItem*)[fItems objectAtIndex:row]).fCell copy]; else @@ -173,7 +173,7 @@ } - (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; + NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; if (columnIndex == 1) { SkOptionItem* option = (SkOptionItem*)[self.fItems objectAtIndex:row]; NSCell* storedCell = option.fCell; @@ -207,7 +207,7 @@ } - (void)tableView:(NSTableView *)tableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - int columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; + NSInteger columnIndex = [tableView columnWithIdentifier:[tableColumn identifier]]; if (columnIndex == 1) { SkOptionItem* option = (SkOptionItem*)[self.fItems objectAtIndex:row]; NSCell* cell = option.fCell; |