Convert state variable from a uint32 to an int32
This commit is contained in:
@@ -191,7 +191,7 @@ TBarApp::SaveSettings()
|
||||
prefs.AddBool("vertical", fSettings.vertical);
|
||||
prefs.AddBool("left", fSettings.left);
|
||||
prefs.AddBool("top", fSettings.top);
|
||||
prefs.AddUInt32("state", fSettings.state);
|
||||
prefs.AddInt32("state", fSettings.state);
|
||||
prefs.AddFloat("width", fSettings.width);
|
||||
prefs.AddPoint("switcherLoc", fSettings.switcherLoc);
|
||||
prefs.AddBool("showClock", fSettings.showClock);
|
||||
@@ -291,7 +291,7 @@ TBarApp::InitSettings()
|
||||
fDefaultSettings.left);
|
||||
settings.top = prefs.GetBool("top",
|
||||
fDefaultSettings.top);
|
||||
settings.state = prefs.GetUInt32("state",
|
||||
settings.state = prefs.GetInt32("state",
|
||||
fDefaultSettings.state);
|
||||
settings.width = prefs.GetFloat("width",
|
||||
fDefaultSettings.width);
|
||||
|
||||
@@ -40,7 +40,7 @@ struct desk_settings {
|
||||
bool vertical;
|
||||
bool left;
|
||||
bool top;
|
||||
uint32 state;
|
||||
int32 state;
|
||||
float width;
|
||||
BPoint switcherLoc;
|
||||
bool showClock;
|
||||
|
||||
@@ -126,9 +126,10 @@ BarViewMessageFilter::Filter(BMessage* message, BHandler** target)
|
||||
|
||||
|
||||
TBarView::TBarView(BRect frame, bool vertical, bool left, bool top,
|
||||
uint32 state, float)
|
||||
int32 state, float)
|
||||
:
|
||||
BView(frame, "BarView", B_FOLLOW_ALL_SIDES, B_WILL_DRAW),
|
||||
fBarApp(static_cast<TBarApp*>(be_app)),
|
||||
fInlineScrollView(NULL),
|
||||
fBarMenuBar(NULL),
|
||||
fExpandoMenuBar(NULL),
|
||||
@@ -136,7 +137,7 @@ TBarView::TBarView(BRect frame, bool vertical, bool left, bool top,
|
||||
fVertical(vertical),
|
||||
fTop(top),
|
||||
fLeft(left),
|
||||
fState(static_cast<int32>(state)),
|
||||
fState(state),
|
||||
fRefsRcvdOnly(true),
|
||||
fDragMessage(NULL),
|
||||
fCachedTypesList(NULL),
|
||||
@@ -625,7 +626,7 @@ TBarView::SaveSettings()
|
||||
settings->vertical = fVertical;
|
||||
settings->left = fLeft;
|
||||
settings->top = fTop;
|
||||
settings->state = (uint32)fState;
|
||||
settings->state = fState;
|
||||
settings->width = 0;
|
||||
|
||||
fReplicantTray->SaveTimeSettings();
|
||||
|
||||
@@ -77,7 +77,7 @@ class TTeamMenuItem;
|
||||
class TBarView : public BView {
|
||||
public:
|
||||
TBarView(BRect frame, bool vertical, bool left, bool top,
|
||||
uint32 state, float width);
|
||||
int32 state, float width);
|
||||
~TBarView();
|
||||
|
||||
virtual void AttachedToWindow();
|
||||
|
||||
Reference in New Issue
Block a user