From 6d9adcf120c46ff6631f126cc8a6785f5ed43197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 4 Apr 2006 13:51:28 +0000 Subject: [PATCH] Removed a superfluous const_cast and a variable from ChooseTrigger(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17007 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Menu.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index 7f497bc790..d9170c2aab 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1818,18 +1818,16 @@ BMenu::ChooseTrigger(const char *title, BList *chars) if (title == NULL) return NULL; - - char *titlePtr = const_cast(title); - + char trigger; // TODO: Oh great, reinterpret_cast all around - while ((trigger = *titlePtr) != '\0') { + while ((trigger = title[0]) != '\0') { if (!chars->HasItem(reinterpret_cast((uint32)trigger))) { chars->AddItem(reinterpret_cast((uint32)trigger)); - return titlePtr; + return title; } - - titlePtr++; + + title++; } return NULL;