From 1d09e9cee35bb74028ac9a23379b8419076bec1c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 29 Apr 2014 16:46:00 +0200 Subject: [PATCH] BScrollbar: remove unused field. * Nothing ever reads fTargetName in the scrollbar code, so remove the field. * Frees one reserved slot, and a little memory, as the target name was copied with strdup. --- headers/os/interface/ScrollBar.h | 3 +-- src/kits/interface/ScrollBar.cpp | 16 ++++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/headers/os/interface/ScrollBar.h b/headers/os/interface/ScrollBar.h index fb4f3ec34b..65a62e79be 100644 --- a/headers/os/interface/ScrollBar.h +++ b/headers/os/interface/ScrollBar.h @@ -133,11 +133,10 @@ private: float fProportion; BView* fTarget; orientation fOrientation; - char* fTargetName; Private* fPrivateData; - uint32 _reserved[3]; + uint32 _reserved[4]; }; #endif // _SCROLL_BAR_H diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp index 34d9a12d03..eb2d9aa318 100644 --- a/src/kits/interface/ScrollBar.cpp +++ b/src/kits/interface/ScrollBar.cpp @@ -207,8 +207,7 @@ BScrollBar::BScrollBar(BRect frame, const char* name, BView* target, fValue(0), fProportion(0.0f), fTarget(NULL), - fOrientation(direction), - fTargetName(NULL) + fOrientation(direction) { SetViewColor(B_TRANSPARENT_COLOR); @@ -237,8 +236,7 @@ BScrollBar::BScrollBar(const char* name, BView* target, fValue(0), fProportion(0.0f), fTarget(NULL), - fOrientation(direction), - fTargetName(NULL) + fOrientation(direction) { SetViewColor(B_TRANSPARENT_COLOR); @@ -255,8 +253,7 @@ BScrollBar::BScrollBar(const char* name, BView* target, BScrollBar::BScrollBar(BMessage* data) : BView(data), - fTarget(NULL), - fTargetName(NULL) + fTarget(NULL) { fPrivateData = new BScrollBar::Private(this); @@ -567,17 +564,12 @@ BScrollBar::SetTarget(BView* target) } fTarget = target; - free(fTargetName); - if (fTarget) { - fTargetName = strdup(target->Name()); - if (fOrientation == B_VERTICAL) fTarget->fVerScroller = this; else fTarget->fHorScroller = this; - } else - fTargetName = NULL; + } }