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

Convert state variable from a uint32 to an int32

Browse Source
This commit is contained in:
John Scipione
2013-04-14 02:49:32 -04:00
parent 2de4b0463f
commit ee78e4de9f
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarApp.cpp
+2 -2
View File
@@ -191,7 +191,7 @@ TBarApp::SaveSettings()
prefs.AddBool("vertical", fSettings.vertical); prefs.AddBool("vertical", fSettings.vertical);
prefs.AddBool("left", fSettings.left); prefs.AddBool("left", fSettings.left);
prefs.AddBool("top", fSettings.top); prefs.AddBool("top", fSettings.top);
prefs.AddUInt32("state", fSettings.state); prefs.AddInt32("state", fSettings.state);
prefs.AddFloat("width", fSettings.width); prefs.AddFloat("width", fSettings.width);
prefs.AddPoint("switcherLoc", fSettings.switcherLoc); prefs.AddPoint("switcherLoc", fSettings.switcherLoc);
prefs.AddBool("showClock", fSettings.showClock); prefs.AddBool("showClock", fSettings.showClock);
@@ -291,7 +291,7 @@ TBarApp::InitSettings()
fDefaultSettings.left); fDefaultSettings.left);
settings.top = prefs.GetBool("top", settings.top = prefs.GetBool("top",
fDefaultSettings.top); fDefaultSettings.top);
settings.state = prefs.GetUInt32("state", settings.state = prefs.GetInt32("state",
fDefaultSettings.state); fDefaultSettings.state);
settings.width = prefs.GetFloat("width", settings.width = prefs.GetFloat("width",
fDefaultSettings.width); fDefaultSettings.width);
src/apps/deskbar/BarSettings.h
+1 -1
View File
@@ -40,7 +40,7 @@ struct desk_settings {
bool vertical; bool vertical;
bool left; bool left;
bool top; bool top;
uint32 state; int32 state;
float width; float width;
BPoint switcherLoc; BPoint switcherLoc;
bool showClock; bool showClock;
src/apps/deskbar/BarView.cpp
+4 -3
View File
@@ -126,9 +126,10 @@ BarViewMessageFilter::Filter(BMessage* message, BHandler** target)
TBarView::TBarView(BRect frame, bool vertical, bool left, bool top, 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), BView(frame, "BarView", B_FOLLOW_ALL_SIDES, B_WILL_DRAW),
fBarApp(static_cast<TBarApp*>(be_app)),
fInlineScrollView(NULL), fInlineScrollView(NULL),
fBarMenuBar(NULL), fBarMenuBar(NULL),
fExpandoMenuBar(NULL), fExpandoMenuBar(NULL),
@@ -136,7 +137,7 @@ TBarView::TBarView(BRect frame, bool vertical, bool left, bool top,
fVertical(vertical), fVertical(vertical),
fTop(top), fTop(top),
fLeft(left), fLeft(left),
fState(static_cast<int32>(state)), fState(state),
fRefsRcvdOnly(true), fRefsRcvdOnly(true),
fDragMessage(NULL), fDragMessage(NULL),
fCachedTypesList(NULL), fCachedTypesList(NULL),
@@ -625,7 +626,7 @@ TBarView::SaveSettings()
settings->vertical = fVertical; settings->vertical = fVertical;
settings->left = fLeft; settings->left = fLeft;
settings->top = fTop; settings->top = fTop;
settings->state = (uint32)fState; settings->state = fState;
settings->width = 0; settings->width = 0;
fReplicantTray->SaveTimeSettings(); fReplicantTray->SaveTimeSettings();
src/apps/deskbar/BarView.h
+1 -1
View File
@@ -77,7 +77,7 @@ class TTeamMenuItem;
class TBarView : public BView { class TBarView : public BView {
public: public:
TBarView(BRect frame, bool vertical, bool left, bool top, TBarView(BRect frame, bool vertical, bool left, bool top,
uint32 state, float width); int32 state, float width);
~TBarView(); ~TBarView();
virtual void AttachedToWindow(); virtual void AttachedToWindow();