summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.cpp
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-02-18 12:52:19 +0100
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-02-18 15:51:54 +0200
commitc285f59ce2a05703e3a1232fcaf3ee3aea714b3f (patch)
tree1dbc789653709c93dbdc6d0db6759c6c264f9ba8 /indra/newview/llmediactrl.cpp
parente83eff446802694ef2b556c230937a6c4fef7654 (diff)
Replace BOOL with bool in llwindow and dependent classes
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r--indra/newview/llmediactrl.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 36ac1bdf97..e8450f8d6b 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -183,9 +183,9 @@ void LLMediaCtrl::setTakeFocusOnClick( bool take_focus )
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleHover(x, y, mask)) return TRUE;
+ if (LLPanel::handleHover(x, y, mask)) return true;
convertInputCoords(x, y);
if (mMediaSource)
@@ -201,40 +201,40 @@ BOOL LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask )
handleToolTip(x, y, mask);
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
+bool LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
{
- if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE;
+ if (LLPanel::handleScrollWheel(x, y, clicks)) return true;
if (mMediaSource && mMediaSource->hasMedia())
{
convertInputCoords(x, y);
- mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
+ mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(true));
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleScrollHWheel(S32 x, S32 y, S32 clicks)
+bool LLMediaCtrl::handleScrollHWheel(S32 x, S32 y, S32 clicks)
{
- if (LLPanel::handleScrollHWheel(x, y, clicks)) return TRUE;
+ if (LLPanel::handleScrollHWheel(x, y, clicks)) return true;
if (mMediaSource && mMediaSource->hasMedia())
{
convertInputCoords(x, y);
- mMediaSource->scrollWheel(x, y, clicks, 0, gKeyboard->currentMask(TRUE));
+ mMediaSource->scrollWheel(x, y, clicks, 0, gKeyboard->currentMask(true));
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
// virtual
-BOOL LLMediaCtrl::handleToolTip(S32 x, S32 y, MASK mask)
+bool LLMediaCtrl::handleToolTip(S32 x, S32 y, MASK mask)
{
std::string hover_text;
@@ -243,7 +243,7 @@ BOOL LLMediaCtrl::handleToolTip(S32 x, S32 y, MASK mask)
if(hover_text.empty())
{
- return FALSE;
+ return false;
}
else
{
@@ -258,14 +258,14 @@ BOOL LLMediaCtrl::handleToolTip(S32 x, S32 y, MASK mask)
.sticky_rect(sticky_rect_screen));
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleMouseUp(x, y, mask)) return TRUE;
+ if (LLPanel::handleMouseUp(x, y, mask)) return true;
convertInputCoords(x, y);
if (mMediaSource)
@@ -275,14 +275,14 @@ BOOL LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
gFocusMgr.setMouseCapture( NULL );
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleMouseDown(x, y, mask)) return TRUE;
+ if (LLPanel::handleMouseDown(x, y, mask)) return true;
convertInputCoords(x, y);
if (mMediaSource)
@@ -292,17 +292,17 @@ BOOL LLMediaCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
if (mTakeFocusOnClick)
{
- setFocus( TRUE );
+ setFocus( true );
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleRightMouseUp( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleRightMouseUp( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleRightMouseUp(x, y, mask)) return TRUE;
+ if (LLPanel::handleRightMouseUp(x, y, mask)) return true;
convertInputCoords(x, y);
if (mMediaSource)
@@ -320,14 +320,14 @@ BOOL LLMediaCtrl::handleRightMouseUp( S32 x, S32 y, MASK mask )
gFocusMgr.setMouseCapture( NULL );
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleRightMouseDown(x, y, mask)) return TRUE;
+ if (LLPanel::handleRightMouseDown(x, y, mask)) return true;
S32 media_x = x, media_y = y;
convertInputCoords(media_x, media_y);
@@ -339,7 +339,7 @@ BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
if (mTakeFocusOnClick)
{
- setFocus( TRUE );
+ setFocus( true );
}
auto menu = mContextMenuHandle.get();
@@ -371,14 +371,14 @@ BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
LLMenuGL::showPopup(this, menu, x, y);
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
+bool LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
{
- if (LLPanel::handleDoubleClick(x, y, mask)) return TRUE;
+ if (LLPanel::handleDoubleClick(x, y, mask)) return true;
convertInputCoords(x, y);
if (mMediaSource)
@@ -388,10 +388,10 @@ BOOL LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
if (mTakeFocusOnClick)
{
- setFocus( TRUE );
+ setFocus( true );
}
- return TRUE;
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
@@ -491,9 +491,9 @@ void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
////////////////////////////////////////////////////////////////////////////////
//
-BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
+bool LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
{
- BOOL result = FALSE;
+ bool result = false;
if (mMediaSource)
{