summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r--indra/newview/lltoast.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 2e00b2c382..638a01a080 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -44,13 +44,13 @@ LLToastLifeTimer::LLToastLifeTimer(LLToast* toast, F32 period)
}
/*virtual*/
-BOOL LLToastLifeTimer::tick()
+bool LLToastLifeTimer::tick()
{
if (mEventTimer.hasExpired())
{
mToast->expire();
}
- return FALSE;
+ return false;
}
void LLToastLifeTimer::stop()
@@ -68,7 +68,7 @@ void LLToastLifeTimer::restart()
mEventTimer.reset();
}
-BOOL LLToastLifeTimer::getStarted()
+bool LLToastLifeTimer::getStarted()
{
return mEventTimer.getStarted();
}
@@ -121,11 +121,11 @@ LLToast::LLToast(const LLToast::Params& p)
buildFromFile("panel_toast.xml");
- setCanDrag(FALSE);
+ setCanDrag(false);
mWrapperPanel = getChild<LLPanel>("wrapper_panel");
- setBackgroundOpaque(TRUE); // *TODO: obsolete
+ setBackgroundOpaque(true); // *TODO: obsolete
updateTransparency();
if(p.panel())
@@ -151,7 +151,7 @@ LLToast::LLToast(const LLToast::Params& p)
}
}
-void LLToast::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLToast::reshape(S32 width, S32 height, bool called_from_parent)
{
// We shouldn't use reshape from LLModalDialog since it changes toasts position.
// Toasts position should be controlled only by toast screen channel, see LLScreenChannelBase.
@@ -160,14 +160,14 @@ void LLToast::reshape(S32 width, S32 height, BOOL called_from_parent)
}
//--------------------------------------------------------------------------
-BOOL LLToast::postBuild()
+bool LLToast::postBuild()
{
if(!mCanFade)
{
mTimer->stop();
}
- return TRUE;
+ return true;
}
//--------------------------------------------------------------------------
@@ -209,7 +209,7 @@ void LLToast::hide()
{
if (!mIsHidden)
{
- setVisible(FALSE);
+ setVisible(false);
setFading(false);
mTimer->stop();
mIsHidden = true;
@@ -218,7 +218,7 @@ void LLToast::hide()
}
/*virtual*/
-void LLToast::setFocus(BOOL b)
+void LLToast::setFocus(bool b)
{
if (b
&& !hasFocus()
@@ -226,9 +226,9 @@ void LLToast::setFocus(BOOL b)
&& mWrapperPanel
&& !mWrapperPanel->getChildList()->empty())
{
- LLModalDialog::setFocus(TRUE);
+ LLModalDialog::setFocus(true);
// mostly for buttons
- mPanel->setFocus(TRUE);
+ mPanel->setFocus(true);
}
else
{
@@ -391,7 +391,7 @@ void LLToast::draw()
}
//--------------------------------------------------------------------------
-void LLToast::setVisible(BOOL show)
+void LLToast::setVisible(bool show)
{
if(mIsHidden)
{
@@ -495,7 +495,7 @@ void LLToast::updateHoveredState()
sendChildToFront(mHideBtn);
if(mHideBtn && mHideBtn->getEnabled())
{
- mHideBtn->setVisible(TRUE);
+ mHideBtn->setVisible(true);
}
mToastMouseEnterSignal(this, getValue());
@@ -518,7 +518,7 @@ void LLToast::updateHoveredState()
mHideBtnPressed = false;
return;
}
- mHideBtn->setVisible(FALSE);
+ mHideBtn->setVisible(false);
}
mToastMouseLeaveSignal(this, getValue());
@@ -526,7 +526,7 @@ void LLToast::updateHoveredState()
}
}
-void LLToast::setBackgroundOpaque(BOOL b)
+void LLToast::setBackgroundOpaque(bool b)
{
if(mWrapperPanel && !isBackgroundVisible())
{
@@ -583,7 +583,7 @@ void LLNotificationsUI::LLToast::startTimer()
//--------------------------------------------------------------------------
-BOOL LLToast::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLToast::handleMouseDown(S32 x, S32 y, MASK mask)
{
if(mHideBtn && mHideBtn->getEnabled())
{