From 542de916c4beea64afae32c5bb1501223ea5bb4f Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sat, 6 Apr 2013 22:45:33 -0400 Subject: [PATCH] Add and use an _Init() method for BarTeamInfo --- src/apps/deskbar/BarApp.cpp | 14 ++++++++++---- src/apps/deskbar/BarApp.h | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp index 8ed106714c..0c1b936b8c 100644 --- a/src/apps/deskbar/BarApp.cpp +++ b/src/apps/deskbar/BarApp.cpp @@ -960,8 +960,7 @@ BarTeamInfo::BarTeamInfo(BList* teams, uint32 flags, char* sig, BBitmap* icon, icon(icon), name(name) { - for (int32 i = 0; i < kIconCacheCount; i++) - iconCache[i] = NULL; + _Init(); } @@ -972,8 +971,7 @@ BarTeamInfo::BarTeamInfo(const BarTeamInfo &info) icon(new BBitmap(*info.icon)), name(strdup(info.name)) { - for (int32 i = 0; i < kIconCacheCount; i++) - iconCache[i] = NULL; + _Init(); } @@ -985,3 +983,11 @@ BarTeamInfo::~BarTeamInfo() for (int32 i = 0; i < kIconCacheCount; i++) delete iconCache[i]; } + + +void +BarTeamInfo::_Init() +{ + for (int32 i = 0; i < kIconCacheCount; i++) + iconCache[i] = NULL; +} diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h index 89627a36e7..2540ca0fb8 100644 --- a/src/apps/deskbar/BarApp.h +++ b/src/apps/deskbar/BarApp.h @@ -93,6 +93,10 @@ public: BarTeamInfo(const BarTeamInfo &info); ~BarTeamInfo(); +private: + void _Init(); + +public: BList* teams; uint32 flags; char* sig;