Merge pull request #2494 from secondlife/marchcat/b-develop

Maint B sync

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 2741db24e8..43a33a2b3c 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -57,8 +57,8 @@ public:
     class LLTabComparator
     {
     public:
-        LLTabComparator() {};
-        virtual ~LLTabComparator() {};
+        LLTabComparator() = default;
+        virtual ~LLTabComparator() = default;
 
         /** Returns true if tab1 < tab2, false otherwise */
         virtual bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const = 0;
@@ -88,12 +88,12 @@ public:
     LLAccordionCtrl();
     virtual ~LLAccordionCtrl();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
-    virtual BOOL handleRightMouseDown   ( S32 x, S32 y, MASK mask);
-    virtual BOOL handleScrollWheel      ( S32 x, S32 y, S32 clicks );
-    virtual BOOL handleKeyHere          (KEY key, MASK mask);
-    virtual BOOL handleDragAndDrop      (S32 x, S32 y, MASK mask, BOOL drop,
+    virtual bool handleRightMouseDown   ( S32 x, S32 y, MASK mask);
+    virtual bool handleScrollWheel      ( S32 x, S32 y, S32 clicks );
+    virtual bool handleKeyHere          (KEY key, MASK mask);
+    virtual bool handleDragAndDrop      (S32 x, S32 y, MASK mask, bool drop,
                                          EDragAndDropType cargo_type,
                                          void* cargo_data,
                                          EAcceptance* accept,
@@ -101,10 +101,10 @@ public:
     //
 
     // Call reshape after changing splitter's size
-    virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+    virtual void reshape(S32 width, S32 height, bool called_from_parent = true);
 
-    void addCollapsibleCtrl(LLView* view);
-    void removeCollapsibleCtrl(LLView* view);
+    void addCollapsibleCtrl(LLAccordionCtrlTab* accordion_tab);
+    void removeCollapsibleCtrl(LLAccordionCtrlTab* accordion_tab);
     void arrange();
 
 
@@ -161,7 +161,7 @@ private:
     void    showScrollbar           (S32 width, S32 height);
     void    hideScrollbar           (S32 width, S32 height);
 
-    BOOL    autoScroll              (S32 x, S32 y);
+    bool    autoScroll              (S32 x, S32 y);
 
     /**
      * An adaptor for LLTabComparator
@@ -180,20 +180,20 @@ private:
 
 private:
     LLRect          mInnerRect;
-    LLScrollbar*    mScrollbar;
-    bool            mSingleExpansion;
-    bool            mFitParent;
-    bool            mAutoScrolling;
-    F32             mAutoScrollRate;
-    LLTextBox*      mNoVisibleTabsHelpText;
+    LLScrollbar*    mScrollbar = nullptr;
+    bool            mSingleExpansion = false;
+    bool            mFitParent = false;
+    bool            mAutoScrolling = false;
+    F32             mAutoScrollRate = 0.f;
+    LLTextBox*      mNoVisibleTabsHelpText = nullptr;
 
-    bool            mSkipScrollToChild;
+    bool            mSkipScrollToChild = false;
 
     std::string     mNoMatchedTabsOrigString;
     std::string     mNoVisibleTabsOrigString;
 
-    LLAccordionCtrlTab*     mSelectedTab;
-    const LLTabComparator*  mTabComparator;
+    LLAccordionCtrlTab*     mSelectedTab = nullptr;
+    const LLTabComparator*  mTabComparator = nullptr;
 };