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

Removed private functions _long_to_color_() and _color_to_long_(), there

Browse Source 
shouldnt be any application that uses them, as they were not in headers.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-05-22 20:43:39 +00:00
parent bb15b0769b
commit 687e925395
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Slider.cpp
+8 -28
View File
@@ -23,25 +23,6 @@
#include <Slider.h> #include <Slider.h>
// Those two functions are also exported by BeOS' libbe.so
rgb_color
_long_to_color_(int32 color)
{
return *((rgb_color*)&color);
}
int32
_color_to_long_(rgb_color color)
{
return *((int32*)&color);
}
// #pragma mark -
BSlider::BSlider(BRect frame, const char *name, const char *label, BMessage *message, BSlider::BSlider(BRect frame, const char *name, const char *label, BMessage *message,
int32 minValue, int32 maxValue, thumb_style thumbType, int32 minValue, int32 maxValue, thumb_style thumbType,
uint32 resizingMode, uint32 flags) uint32 resizingMode, uint32 flags)
@@ -125,11 +106,10 @@ BSlider::BSlider(BMessage *archive)
if (archive->FindInt32("_sdelay", &fSnoozeAmount) != B_OK) if (archive->FindInt32("_sdelay", &fSnoozeAmount) != B_OK)
SetSnoozeAmount(20000); SetSnoozeAmount(20000);
int32 color; rgb_color color;
if (archive->FindInt32("_fcolor", &color) == B_OK) { if (archive->FindInt32("_fcolor", (int32 *)&color) == B_OK) {
rgb_color fillColor = _long_to_color_(color); UseFillColor(true, &color);
UseFillColor(true, &fillColor);
} else } else
UseFillColor(false); UseFillColor(false);
@@ -176,8 +156,8 @@ BSlider::BSlider(BMessage *archive)
else else
fStyle = B_BLOCK_THUMB; fStyle = B_BLOCK_THUMB;
if (archive->FindInt32("_bcolor", &color) == B_OK) if (archive->FindInt32("_bcolor", (int32 *)&color) == B_OK)
SetBarColor(_long_to_color_(color)); SetBarColor(color);
else { else {
if (Style() == B_BLOCK_THUMB) if (Style() == B_BLOCK_THUMB)
SetBarColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), SetBarColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
@@ -249,10 +229,10 @@ BSlider::Archive(BMessage *archive, bool deep) const
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt32("_sdelay", fSnoozeAmount); ret = archive->AddInt32("_sdelay", fSnoozeAmount);
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt32("_bcolor", _color_to_long_(fBarColor)); ret = archive->AddInt32("_bcolor", (const uint32 &)fBarColor);
if (FillColor(NULL) && ret == B_OK) if (FillColor(NULL) && ret == B_OK)
ret = archive->AddInt32("_fcolor", _color_to_long_(fFillColor)); ret = archive->AddInt32("_fcolor", (const uint32 &)fFillColor);
if (ret == B_OK && fMinLimitLabel) if (ret == B_OK && fMinLimitLabel)
ret = archive->AddString("_minlbl", fMinLimitLabel); ret = archive->AddString("_minlbl", fMinLimitLabel);