From d5efbfcd2874dd7045baabe33944da37e738872e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 16 Nov 2009 12:36:35 -0800
Subject: Convert mForcePressedState to bool from BOOL

---
 indra/llui/llbutton.cpp     | 2 +-
 indra/llui/llbutton.h       | 4 ++--
 indra/llui/llmenubutton.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index bbaf908d2e..b65f248db2 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -146,7 +146,7 @@ LLButton::LLButton(const LLButton::Params& p)
 	mHoverGlowStrength(p.hover_glow_amount),
 	mCommitOnReturn(p.commit_on_return),
 	mFadeWhenDisabled(FALSE),
-	mForcePressedState(FALSE),
+	mForcePressedState(false),
 	mLastDrawCharsCount(0)
 {
 	static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 08f289092f..3c1b57c4be 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -238,7 +238,7 @@ public:
 	static void		setDockableFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname);
 	static void		showHelp(LLUICtrl* ctrl, const LLSD& sdname);
 
-	void		setForcePressedState(BOOL b) { mForcePressedState = b; }
+	void		setForcePressedState(bool b) { mForcePressedState = b; }
 	
 protected:
 	LLPointer<LLUIImage> getImageUnselected() const	{ return mImageUnselected; }
@@ -315,7 +315,7 @@ private:
 	BOOL						mNeedsHighlight;
 	BOOL						mCommitOnReturn;
 	BOOL						mFadeWhenDisabled;
-	BOOL						mForcePressedState;
+	bool						mForcePressedState;
 
 	LLFrameTimer				mFlashingTimer;
 };
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
index a657ed039a..cdbd17e4dc 100644
--- a/indra/llui/llmenubutton.cpp
+++ b/indra/llui/llmenubutton.cpp
@@ -133,11 +133,11 @@ void LLMenuButton::draw()
 	
 	if (mMenuVisibleLastFrame)
 	{
-		setForcePressedState(TRUE);
+		setForcePressedState(true);
 	}
 
 	LLButton::draw();
 
-	setForcePressedState(FALSE);
+	setForcePressedState(false);
 }
 
-- 
cgit v1.2.3