Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus

1 files changed, 35 insertions, 34 deletions

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index d21e8dc1c6..c56c3c43a4 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -39,8 +39,8 @@
 #include "llviewmodel.h"        // *TODO move dependency to .cpp file
 #include "llsearchablecontrol.h"
 
-const BOOL TAKE_FOCUS_YES = TRUE;
-const BOOL TAKE_FOCUS_NO  = FALSE;
+const bool TAKE_FOCUS_YES = true;
+const bool TAKE_FOCUS_NO  = false;
 const S32 DROP_SHADOW_FLOATER = 5;
 
 class LLUICtrl
@@ -147,27 +147,28 @@ protected:
     // We shouldn't ever need to set this directly
     //virtual void    setViewModel(const LLViewModelPtr&);
 
-    virtual BOOL    postBuild();
+    /*virtual*/ bool    postBuild() override;
 
 public:
     // LLView interface
-    /*virtual*/ BOOL    setLabelArg( const std::string& key, const LLStringExplicit& text );
-    /*virtual*/ BOOL    isCtrl() const;
-    /*virtual*/ void    onMouseEnter(S32 x, S32 y, MASK mask);
-    /*virtual*/ void    onMouseLeave(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL    canFocusChildren() const;
-    /*virtual*/ BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
+    /*virtual*/ bool    setLabelArg( const std::string& key, const LLStringExplicit& text ) override;
+    /*virtual*/ bool    isCtrl() const override;
+    /*virtual*/ void    onMouseEnter(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ void    onMouseLeave(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ bool    canFocusChildren() const override;
+    /*virtual*/ bool    handleMouseDown(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ bool    handleMouseUp(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ bool    handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ bool    handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+    /*virtual*/ bool    handleDoubleClick(S32 x, S32 y, MASK mask) override;
 
     // From LLFocusableElement
-    /*virtual*/ void    setFocus( BOOL b );
-    /*virtual*/ BOOL    hasFocus() const;
+    /*virtual*/ void    setFocus( bool b ) override;
+    /*virtual*/ bool    hasFocus() const override;
 
     // New virtuals
 
+
     // Return NULL by default (overrride if the class has the appropriate interface)
     virtual class LLCtrlSelectionInterface* getSelectionInterface();
     virtual class LLCtrlListInterface* getListInterface();
@@ -187,22 +188,22 @@ public:
 
     void setFunctionName(const std::string& function_name);
 
-    virtual void    setTentative(BOOL b);
-    virtual BOOL    getTentative() const;
+    virtual void    setTentative(bool b);
+    virtual bool    getTentative() const;
     virtual void    setValue(const LLSD& value);
     virtual LLSD    getValue() const;
     /// When two widgets are displaying the same data (e.g. during a skin
     /// change), share their ViewModel.
     virtual void    shareViewModelFrom(const LLUICtrl& other);
 
-    virtual BOOL    setTextArg(  const std::string& key, const LLStringExplicit& text );
-    virtual void    setIsChrome(BOOL is_chrome);
+    virtual bool    setTextArg(  const std::string& key, const LLStringExplicit& text );
+    virtual void    setIsChrome(bool is_chrome);
 
-    virtual BOOL    acceptsTextInput() const; // Defaults to false
+    virtual bool    acceptsTextInput() const; // Defaults to false
 
     // A control is dirty if the user has modified its value.
     // Editable controls should override this.
-    virtual BOOL    isDirty() const; // Defauls to false
+    virtual bool    isDirty() const; // Defauls to false
     virtual void    resetDirty(); //Defaults to no-op
 
     // Call appropriate callback
@@ -223,16 +224,16 @@ public:
     void                setTransparencyType(ETypeTransparency type);
     ETypeTransparency   getTransparencyType() const {return mTransparencyType;}
 
-    BOOL    focusNextItem(BOOL text_entry_only);
-    BOOL    focusPrevItem(BOOL text_entry_only);
-    BOOL    focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
+    bool    focusNextItem(bool text_entry_only);
+    bool    focusPrevItem(bool text_entry_only);
+    bool    focusFirstItem(bool prefer_text_fields = false, bool focus_flash = true );
 
     // Non Virtuals
     LLHandle<LLUICtrl> getHandle() const { return getDerivedHandle<LLUICtrl>(); }
-    BOOL            getIsChrome() const;
+    bool            getIsChrome() const;
 
-    void            setTabStop( BOOL b );
-    BOOL            hasTabStop() const;
+    void            setTabStop( bool b );
+    bool            hasTabStop() const;
 
     LLUICtrl*       getParentUICtrl() const;
 
@@ -267,7 +268,7 @@ public:
         LLSINGLETON_EMPTY_CTOR(LLTextInputFilter);
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override
         {
-            return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), TRUE);
+            return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), true);
         }
     };
 
@@ -319,14 +320,14 @@ protected:
     static F32 sActiveControlTransparency;
     static F32 sInactiveControlTransparency;
 
-    virtual void addInfo(LLSD & info);
+    /*virtual*/ void addInfo(LLSD & info) override;
 
 private:
 
-    BOOL            mIsChrome;
-    BOOL            mRequestsFront;
-    BOOL            mTabStop;
-    BOOL            mTentative;
+    bool            mIsChrome;
+    bool            mRequestsFront;
+    bool            mTabStop;
+    bool            mTentative;
 
     ETypeTransparency mTransparencyType;
 };
@@ -334,7 +335,7 @@ private:
 // Build time optimization, generate once in .cpp file
 #ifndef LLUICTRL_CPP
 extern template class LLUICtrl* LLView::getChild<class LLUICtrl>(
-    const std::string& name, BOOL recurse) const;
+    const std::string& name, bool recurse) const;
 #endif
 
 #endif  // LL_LLUICTRL_H