i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: A few more style fixes to IconCache

Browse Source 
* Hilight => Highlight
This commit is contained in:
John Scipione
2014-07-17 19:36:48 -04:00
parent 9f2a3f6f47
commit c6433b0b3c
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/IconCache.cpp
+19 -19
View File
@@ -104,9 +104,9 @@ All rights reserved.
IconCacheEntry::IconCacheEntry() IconCacheEntry::IconCacheEntry()
: :
fLargeIcon(NULL), fLargeIcon(NULL),
fHilightedLargeIcon(NULL), fHighlightedLargeIcon(NULL),
fMiniIcon(NULL), fMiniIcon(NULL),
fHilightedMiniIcon(NULL), fHighlightedMiniIcon(NULL),
fAliasForIndex(-1) fAliasForIndex(-1)
{ {
} }
@@ -116,15 +116,15 @@ IconCacheEntry::~IconCacheEntry()
{ {
if (fAliasForIndex < 0) { if (fAliasForIndex < 0) {
delete fLargeIcon; delete fLargeIcon;
delete fHilightedLargeIcon; delete fHighlightedLargeIcon;
delete fMiniIcon; delete fMiniIcon;
delete fHilightedMiniIcon; delete fHighlightedMiniIcon;
// clean up a bit to leave the hash table entry in an initialized state // clean up a bit to leave the hash table entry in an initialized state
fLargeIcon = NULL; fLargeIcon = NULL;
fHilightedLargeIcon = NULL; fHighlightedLargeIcon = NULL;
fMiniIcon = NULL; fMiniIcon = NULL;
fHilightedMiniIcon = NULL; fHighlightedMiniIcon = NULL;
} }
fAliasForIndex = -1; fAliasForIndex = -1;
} }
@@ -180,9 +180,9 @@ IconCacheEntry::HaveIconBitmap(IconDrawMode mode, icon_size size) const
: fLargeIcon != NULL : fLargeIcon != NULL
&& fLargeIcon->Bounds().IntegerWidth() + 1 == size; && fLargeIcon->Bounds().IntegerWidth() + 1 == size;
} else if (mode == kSelected) { } else if (mode == kSelected) {
return size == B_MINI_ICON ? fHilightedMiniIcon != NULL return size == B_MINI_ICON ? fHighlightedMiniIcon != NULL
: fHilightedLargeIcon != NULL : fHighlightedLargeIcon != NULL
&& fHilightedLargeIcon->Bounds().IntegerWidth() + 1 == size; && fHighlightedLargeIcon->Bounds().IntegerWidth() + 1 == size;
} }
return false; return false;
@@ -202,9 +202,9 @@ IconCacheEntry::IconForMode(IconDrawMode mode, icon_size size) const
return fLargeIcon; return fLargeIcon;
} else if (mode == kSelected) { } else if (mode == kSelected) {
if (size == B_MINI_ICON) if (size == B_MINI_ICON)
return fHilightedMiniIcon; return fHighlightedMiniIcon;
else else
return fHilightedLargeIcon; return fHighlightedLargeIcon;
} }
return NULL; return NULL;
@@ -298,9 +298,9 @@ IconCacheEntry::SetIcon(BBitmap* bitmap, IconDrawMode mode, icon_size size,
fLargeIcon = bitmap; fLargeIcon = bitmap;
} else if (mode == kSelectedIcon) { } else if (mode == kSelectedIcon) {
if (size == B_MINI_ICON) if (size == B_MINI_ICON)
fHilightedMiniIcon = bitmap; fHighlightedMiniIcon = bitmap;
else else
fHilightedLargeIcon = bitmap; fHighlightedLargeIcon = bitmap;
} else } else
TRESPASS(); TRESPASS();
} }
@@ -1376,17 +1376,17 @@ IconCacheEntry::RetireIcons(BObjectList<BBitmap>* retiredBitmapList)
retiredBitmapList->AddItem(fLargeIcon); retiredBitmapList->AddItem(fLargeIcon);
fLargeIcon = NULL; fLargeIcon = NULL;
} }
if (fHilightedLargeIcon != NULL) { if (fHighlightedLargeIcon != NULL) {
retiredBitmapList->AddItem(fHilightedLargeIcon); retiredBitmapList->AddItem(fHighlightedLargeIcon);
fHilightedLargeIcon = NULL; fHighlightedLargeIcon = NULL;
} }
if (fMiniIcon != NULL) { if (fMiniIcon != NULL) {
retiredBitmapList->AddItem(fMiniIcon); retiredBitmapList->AddItem(fMiniIcon);
fMiniIcon = NULL; fMiniIcon = NULL;
} }
if (fHilightedMiniIcon != NULL) { if (fHighlightedMiniIcon != NULL) {
retiredBitmapList->AddItem(fHilightedMiniIcon); retiredBitmapList->AddItem(fHighlightedMiniIcon);
fHilightedMiniIcon = NULL; fHighlightedMiniIcon = NULL;
} }
int32 count = retiredBitmapList->CountItems(); int32 count = retiredBitmapList->CountItems();
src/kits/tracker/IconCache.h
+2 -2
View File
@@ -165,9 +165,9 @@ protected:
// list of most common icons // list of most common icons
BBitmap* fLargeIcon; BBitmap* fLargeIcon;
BBitmap* fHilightedLargeIcon; BBitmap* fHighlightedLargeIcon;
BBitmap* fMiniIcon; BBitmap* fMiniIcon;
BBitmap* fHilightedMiniIcon; BBitmap* fHighlightedMiniIcon;
int32 fAliasForIndex; int32 fAliasForIndex;
// list of other icon kinds would be added here // list of other icon kinds would be added here