Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed superfluous BView::findView() and moved its functionality to BView::FindView().

Browse Source 
Fixed it on the way - it's a bad idea to pass NULL pointers to strcmp().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13288 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-06-27 01:54:12 +00:00
parent 75480b6bf8
commit 9793d44045
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/os/interface/View.h
View File

@ -585,7 +585,6 @@ private:
void deleteView( BView* aView);
bool do_owner_check_no_pick() const;
BView* findView( const BView* aView, const char* viewName ) const;
bool attachView( BView *aView );
bool addToList( BView *aView, BView *before = NULL);
bool removeFromList();

36
src/kits/interface/View.cpp
View File

@ -3172,7 +3172,22 @@ BView::Parent() const
BView *
BView::FindView(const char *name) const
{
return findView(this, name);
if (name == NULL)
return NULL;
if (Name() != NULL && !strcmp(Name(), name))
return const_cast<BView *>(this);
BView *child = first_child;
while (child != NULL) {
BView *view = child->FindView(name);
if (view != NULL)
return view;
child = child->next_sibling;
}
return NULL;
}
@ -3799,25 +3814,6 @@ BView::deleteView(BView* view)
}
BView *
BView::findView(const BView *view, const char *viewName) const
{
if (!strcmp(viewName, view->Name()))
return const_cast<BView *>(view);
BView *child = view->first_child;
while (child != NULL) {
BView *view;
if ((view = findView(child, viewName)) != NULL)
return view;
child = child->next_sibling;
}
return NULL;
}
void
BView::setCachedState()
{