From 7f2103fe254eecc85b4caca0d5d861864be88782 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 19 Aug 2010 15:59:50 +0000 Subject: [PATCH] Fix warnings in charactermap * no need to overload ScrollTo() with a non-related method - renamed local ScrollTo() to ScrollToBlock() git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38268 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/charactermap/CharacterView.cpp | 2 +- src/apps/charactermap/CharacterView.h | 2 +- src/apps/charactermap/CharacterWindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/charactermap/CharacterView.cpp b/src/apps/charactermap/CharacterView.cpp index e840b4867e..a09dd33878 100644 --- a/src/apps/charactermap/CharacterView.cpp +++ b/src/apps/charactermap/CharacterView.cpp @@ -103,7 +103,7 @@ CharacterView::IsShowingBlock(int32 blockIndex) const void -CharacterView::ScrollTo(int32 blockIndex) +CharacterView::ScrollToBlock(int32 blockIndex) { if (blockIndex < 0) blockIndex = 0; diff --git a/src/apps/charactermap/CharacterView.h b/src/apps/charactermap/CharacterView.h index 8183efdf81..41baaf1d81 100644 --- a/src/apps/charactermap/CharacterView.h +++ b/src/apps/charactermap/CharacterView.h @@ -30,7 +30,7 @@ public: bool IsShowingBlock(int32 blockIndex) const; - void ScrollTo(int32 blockIndex); + void ScrollToBlock(int32 blockIndex); static void UnicodeToUTF8(uint32 c, char* text, size_t textSize); diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 8503890636..c599635209 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -268,7 +268,7 @@ CharacterWindow::MessageReceived(BMessage* message) BlockListItem* item = static_cast(fUnicodeBlockView->ItemAt(index)); - fCharacterView->ScrollTo(item->BlockIndex()); + fCharacterView->ScrollToBlock(item->BlockIndex()); fFilterControl->MakeFocus(); break;