diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h
index 5d05c69f2e45cb77bf1eb15152937914c0610da2..aba84ea6ecc345ebc4691f9b1a4973dc4f3ff45c 100644
--- a/indra/llui/llchatentry.h
+++ b/indra/llui/llchatentry.h
@@ -34,7 +34,7 @@
#include "lltexteditor.h"
-class LLChatEntry : public LLTextEditor
+class LLChatEntry final : public LLTextEditor
{
public:
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index 2a7c16e1067400965cc1f6893b906ab2e9aefb6d..4f312bc9ee99258d6eed086779b7be16956ff407 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -114,11 +114,6 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p)
addChild(mButton);
}
-LLCheckBoxCtrl::~LLCheckBoxCtrl()
-{
- // Children all cleaned up by default view destructor.
-}
-
void LLCheckBoxCtrl::onCommit()
{
if( getEnabled() )
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index c06064861aad8c84154ae94ab6a1a7769f2be161..03f994268c8f64b639c3b31323d14daa9da1b11a 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -63,7 +63,7 @@ public:
Params();
};
- virtual ~LLCheckBoxCtrl();
+ virtual ~LLCheckBoxCtrl() = default;
protected:
LLCheckBoxCtrl(const Params&);
@@ -72,23 +72,23 @@ protected:
public:
// LLView interface
- void setEnabled( BOOL b ) override;
+ void setEnabled( BOOL b ) final override;
- void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
+ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) final override;
// LLUICtrl interface
void setValue(const LLSD& value ) override;
- LLSD getValue() const override;
+ LLSD getValue() const final override;
BOOL get() { return (BOOL)getValue().asBoolean(); }
void set(BOOL value) { setValue(value); }
- void setTentative(BOOL b) override;
- BOOL getTentative() const override;
+ void setTentative(BOOL b) final override;
+ BOOL getTentative() const final override;
- BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ) override;
+ BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ) final override;
- void clear() override;
- void onCommit() override;
+ void clear() final override;
+ void onCommit() final override;
// LLCheckBoxCtrl interface
virtual BOOL toggle() { return mButton->toggleState(); } // returns new state
@@ -104,18 +104,18 @@ public:
void setFont( const LLFontGL* font ) { mFont = font; }
const LLFontGL* getFont() { return mFont; }
- void setControlName(const std::string& control_name, LLView* context) override;
+ void setControlName(const std::string& control_name, LLView* context) final override;
- BOOL isDirty() const override; // Returns TRUE if the user has modified this control.
- void resetDirty() override; // Clear dirty state
+ BOOL isDirty() const final override; // Returns TRUE if the user has modified this control.
+ void resetDirty() final override; // Clear dirty state
protected:
- std::string _getSearchText() const override
+ std::string _getSearchText() const final override
{
return getLabel() + getToolTip();
}
- void onSetHighlight() const override // When highlight, really do highlight the label
+ void onSetHighlight() const final override // When highlight, really do highlight the label
{
if( mLabel )
mLabel->ll::ui::SearchableControl::setHighlighted( ll::ui::SearchableControl::getHighlighted() );
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 2f5e97cb1dfee69b1ffda806794df18ac2444d74..84d34dab6334513ed088d61719bcf127644c14ee 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -90,7 +90,7 @@ public:
virtual ~LLComboBox();
- /*virtual*/ BOOL postBuild() override;
+ /*virtual*/ BOOL postBuild() final override;
protected:
friend class LLUICtrlFactory;
@@ -104,25 +104,25 @@ public:
BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
BOOL handleKeyHere(KEY key, MASK mask) override;
- BOOL handleUnicodeCharHere(llwchar uni_char) override;
- BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+ BOOL handleUnicodeCharHere(llwchar uni_char) final override;
+ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) final override;
// LLUICtrl interface
- void clear() override; // select nothing
- void onCommit() override;
+ void clear() final override; // select nothing
+ void onCommit() final override;
BOOL acceptsTextInput() const override { return mAllowTextEntry; }
- BOOL isDirty() const override; // Returns TRUE if the user has modified this control.
- void resetDirty() override; // Clear dirty state
+ BOOL isDirty() const final override; // Returns TRUE if the user has modified this control.
+ void resetDirty() final override; // Clear dirty state
void setFocus(BOOL b) override;
// Selects item by underlying LLSD value, using LLSD::asString() matching.
// For simple items, this is just the name of the label.
- void setValue(const LLSD& value ) override;
+ void setValue(const LLSD& value ) final override;
// Gets underlying LLSD value for currently selected items. For simple
// items, this is just the label.
- LLSD getValue() const override;
+ LLSD getValue() const final override;
void setTextEntry(const LLStringExplicit& text);
void setKeystrokeOnEsc(BOOL enable);
@@ -167,29 +167,29 @@ public:
// LLCtrlListInterface functions
// See llscrolllistctrl.h
- S32 getItemCount() const override;
+ S32 getItemCount() const final override;
// Overwrites the default column (See LLScrollListCtrl for format)
- void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) override;
- void clearColumns() override;
- void setColumnLabel(const std::string& column, const std::string& label) override;
- LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = nullptr) override;
- LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD()) override;
- void clearRows() override;
- void sortByColumn(const std::string& name, BOOL ascending) override;
+ void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) final override;
+ void clearColumns() final override;
+ void setColumnLabel(const std::string& column, const std::string& label) final override;
+ LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = nullptr) final override;
+ LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD()) final override;
+ void clearRows() final override;
+ void sortByColumn(const std::string& name, BOOL ascending) final override;
// LLCtrlSelectionInterface functions
BOOL getCanSelect() const override { return TRUE; }
BOOL selectFirstItem() override { return setCurrentByIndex(0); }
BOOL selectNthItem( S32 index ) override { return setCurrentByIndex(index); }
- BOOL selectItemRange( S32 first, S32 last ) override;
+ BOOL selectItemRange( S32 first, S32 last ) final override;
S32 getFirstSelectedIndex() const override { return getCurrentIndex(); }
- BOOL setCurrentByID( const LLUUID& id ) override;
- LLUUID getCurrentID() const override; // LLUUID::null if no items in menu
- BOOL setSelectedByValue(const LLSD& value, BOOL selected) override;
- LLSD getSelectedValue() override;
- BOOL isSelected(const LLSD& value) const override;
- BOOL operateOnSelection(EOperation op) override;
- BOOL operateOnAll(EOperation op) override;
+ BOOL setCurrentByID( const LLUUID& id ) final override;
+ LLUUID getCurrentID() const final override; // LLUUID::null if no items in menu
+ BOOL setSelectedByValue(const LLSD& value, BOOL selected) final override;
+ LLSD getSelectedValue() final override;
+ BOOL isSelected(const LLSD& value) const final override;
+ BOOL operateOnSelection(EOperation op) final override;
+ BOOL operateOnAll(EOperation op) final override;
//========================================================================
@@ -255,7 +255,7 @@ public:
Params();
};
- /*virtual*/ std::string getSelectedItemLabel(S32 column = 0) const override;
+ /*virtual*/ std::string getSelectedItemLabel(S32 column = 0) const final override;
private:
enum EColumnIndex
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
index 9068a0ba86ec06e9e2d91d98130139e477447d20..58c03343eab928c8d0c363bd120818237befdb2f 100644
--- a/indra/llui/llconsole.h
+++ b/indra/llui/llconsole.h
@@ -34,7 +34,7 @@
class LLSD;
-class LLConsole : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>
+class LLConsole final : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>
{
public:
@@ -127,7 +127,7 @@ public:
typedef std::deque<Paragraph> paragraph_t;
paragraph_t mParagraphs;
- ~LLConsole(){};
+ ~LLConsole() = default;
// each line lasts this long after being added
void setLinePersistTime(F32 seconds);
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index b8e240234f0a726731e0f12a515b4f6c81819f14..a31b4a54810dfc3282fac79f2608677cb1372577 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -34,7 +34,7 @@
// Classes
-class LLFlyoutButton : public LLComboBox
+class LLFlyoutButton final : public LLComboBox
{
public:
struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index b07d49b551d49ac573eb285130d5f10a117f5731..9f9e9c53c75a6adc75a5e984c086b9f783d9eab0 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -63,7 +63,7 @@ class LLTextBox;
* Used for updating vertical scroll bar visibility in inventory panel.
* See LLScrollContainer::calcVisibleSize().
*/
-class LLFolderViewScrollContainer : public LLScrollContainer
+class LLFolderViewScrollContainer final : public LLScrollContainer
{
public:
/*virtual*/ ~LLFolderViewScrollContainer() {};
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 1b5c9fb96b6393a6961c39f76c2413b9d7ee1779..916937e483ec42d4b7bee2c765feecca8862cb8f 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -120,50 +120,50 @@ public:
virtual ~LLLineEditor();
// mousehandler overrides
- /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask) override;
- /*virtual*/ BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask) override;
- /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask ) override;
- /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char) override;
- /*virtual*/ void onMouseCaptureLost() override;
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask) final override;
+ /*virtual*/ BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask) final override;
+ /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask ) final override;
+ /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char) final override;
+ /*virtual*/ void onMouseCaptureLost() final override;
// LLEditMenuHandler overrides
void cut() override;
- BOOL canCut() const override;
+ BOOL canCut() const final override;
void copy() override;
- BOOL canCopy() const override;
- void paste() override;
- BOOL canPaste() const override;
+ BOOL canCopy() const final override;
+ void paste() final override;
+ BOOL canPaste() const final override;
virtual void updatePrimary();
virtual void copyPrimary();
virtual void pastePrimary();
virtual BOOL canPastePrimary() const;
- void doDelete() override;
- BOOL canDoDelete() const override;
+ void doDelete() final override;
+ BOOL canDoDelete() const final override;
- void selectAll() override;
- BOOL canSelectAll() const override;
+ void selectAll() final override;
+ BOOL canSelectAll() const final override;
- void deselect() override;
- BOOL canDeselect() const override;
+ void deselect() final override;
+ BOOL canDeselect() const final override;
// LLSpellCheckMenuHandler overrides
- /*virtual*/ bool getSpellCheck() const override;
+ /*virtual*/ bool getSpellCheck() const final override;
- /*virtual*/ const std::string& getSuggestion(U32 index) const override;
- /*virtual*/ U32 getSuggestionCount() const override;
- /*virtual*/ void replaceWithSuggestion(U32 index) override;
+ /*virtual*/ const std::string& getSuggestion(U32 index) const final override;
+ /*virtual*/ U32 getSuggestionCount() const final override;
+ /*virtual*/ void replaceWithSuggestion(U32 index) final override;
- /*virtual*/ void addToDictionary() override;
- /*virtual*/ bool canAddToDictionary() const override;
+ /*virtual*/ void addToDictionary() final override;
+ /*virtual*/ bool canAddToDictionary() const final override;
- /*virtual*/ void addToIgnore() override;
- /*virtual*/ bool canAddToIgnore() const override;
+ /*virtual*/ void addToIgnore() final override;
+ /*virtual*/ bool canAddToIgnore() const final override;
// Spell checking helper functions
std::string getMisspelledWord(S32 pos) const;
@@ -171,27 +171,27 @@ public:
void onSpellCheckSettingsChange();
// view overrides
- void draw() override;
- void reshape(S32 width,S32 height,BOOL called_from_parent=TRUE) override;
- void onFocusReceived() override;
- void onFocusLost() override;
- void setEnabled(BOOL enabled) override;
+ void draw() final override;
+ void reshape(S32 width,S32 height,BOOL called_from_parent=TRUE) final override;
+ void onFocusReceived() final override;
+ void onFocusLost() final override;
+ void setEnabled(BOOL enabled) final override;
// UI control overrides
- void clear() override;
- void onTabInto() override;
- void setFocus( BOOL b ) override;
- void setRect(const LLRect& rect) override;
- BOOL acceptsTextInput() const override;
- void onCommit() override;
- BOOL isDirty() const override; // Returns TRUE if user changed value at all
- void resetDirty() override; // Clear dirty state
+ void clear() final override;
+ void onTabInto() final override;
+ void setFocus( BOOL b ) final override;
+ void setRect(const LLRect& rect) final override;
+ BOOL acceptsTextInput() const final override;
+ void onCommit() final override;
+ BOOL isDirty() const final override; // Returns TRUE if user changed value at all
+ void resetDirty() final override; // Clear dirty state
// assumes UTF8 text
void setValue(const LLSD& value ) override;
LLSD getValue() const override;
- BOOL setTextArg( const std::string& key, const LLStringExplicit& text ) override;
- BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ) override;
+ BOOL setTextArg( const std::string& key, const LLStringExplicit& text ) final override;
+ BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ) final override;
void setLabel(const LLStringExplicit &new_label) { mLabel = new_label; }
const std::string& getLabel() { return mLabel.getString(); }
@@ -213,7 +213,7 @@ public:
// Selects characters 'start' to 'end'.
void setSelection(S32 start, S32 end);
- void getSelectionRange(S32 *position, S32 *length) const override;
+ void getSelectionRange(S32 *position, S32 *length) const final override;
void setCommitOnFocusLost( BOOL b ) { mCommitOnFocusLost = b; }
void setRevertOnEsc( BOOL b ) { mRevertOnEsc = b; }
@@ -307,13 +307,13 @@ private:
void updateAllowingLanguageInput();
BOOL hasPreeditString() const;
// Implementation (overrides) of LLPreeditor
- void resetPreedit() override;
+ void resetPreedit() final override;
void updatePreedit(const LLWString &preedit_string,
- const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position) override;
- void markAsPreedit(S32 position, S32 length) override;
- void getPreeditRange(S32 *position, S32 *length) const override;
- BOOL getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const override;
- S32 getPreeditFontSize() const override;
+ const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position) final override;
+ void markAsPreedit(S32 position, S32 length) final override;
+ void getPreeditRange(S32 *position, S32 *length) const final override;
+ BOOL getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const final override;
+ S32 getPreeditFontSize() const final override;
LLWString getPreeditString() const override { return getWText(); }
void setContextMenu(LLContextMenu* new_context_menu);
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
index c6e881d2ea7d81ad1817e91f6f6f8a6ace4bfcec..6efd9058ed49c65dc95ad93584de99591e6b0c6e 100644
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -44,7 +44,7 @@ static LLDefaultChildRegistry::Register<LLRadioGroup> r1("radio_group");
* buttons (usually radio buttons). Automatically handles the mutex
* condition by highlighting only one button at a time.
*/
-class LLRadioCtrl : public LLCheckBoxCtrl
+class LLRadioCtrl final : public LLCheckBoxCtrl
{
public:
typedef LLRadioGroup::ItemParams Params;
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index fee1ddf4de310a6ff7cbb030216ae9d5a8a9cac5..379989edfb0be5e80e5c4228e039ce9aa073f199 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -36,8 +36,8 @@
* buttons (usually radio buttons). Automatically handles the mutex
* condition by highlighting only one button at a time.
*/
-class LLRadioGroup
-: public LLUICtrl, public LLCtrlSelectionInterface
+class LLRadioGroup final
+ : public LLUICtrl, public LLCtrlSelectionInterface
{
public:
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index f56734c399c94d90607a6260451bb925507e832b..f2abe19012c6db8218a2175b4fe44272b3b2ee28 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -83,7 +83,7 @@ protected:
public:
virtual ~LLScrollContainer( void );
- void setValue(const LLSD& value) override { mInnerRect.setValue(value); }
+ void setValue(const LLSD& value) final override { mInnerRect.setValue(value); }
void setBorderVisible( BOOL b );
@@ -105,16 +105,16 @@ public:
// LLView functionality
void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
BOOL handleKeyHere(KEY key, MASK mask) override;
- BOOL handleUnicodeCharHere(llwchar uni_char) override;
- BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ) override;
+ BOOL handleUnicodeCharHere(llwchar uni_char) final override;
+ BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ) final override;
BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
- std::string& tooltip_msg) override;
+ std::string& tooltip_msg) final override;
void draw() override;
- bool addChild(LLView* view, S32 tab_group = 0) override;
+ bool addChild(LLView* view, S32 tab_group = 0) final override;
bool canAutoScroll(S32 x, S32 y);
bool autoScroll(S32 x, S32 y);
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
index fc18c95803b047e6709d3bfd282ca44420d9a148..6a1fd46aeb74f532a91bd8cade853c9d20d369c8 100644
--- a/indra/llui/llscrolllistcell.h
+++ b/indra/llui/llscrolllistcell.h
@@ -91,7 +91,7 @@ public:
static LLScrollListCell* create(const Params&);
LLScrollListCell(const LLScrollListCell::Params&);
- virtual ~LLScrollListCell() {};
+ virtual ~LLScrollListCell() = default;
virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const {}; // truncate to given width, if possible
virtual S32 getWidth() const {return mWidth;}
@@ -117,11 +117,11 @@ private:
std::string mToolTip;
};
-class LLScrollListSpacer : public LLScrollListCell
+class LLScrollListSpacer final : public LLScrollListCell
{
public:
LLScrollListSpacer(const LLScrollListCell::Params& p) : LLScrollListCell(p) {}
- /*virtual*/ ~LLScrollListSpacer() {};
+ /*virtual*/ ~LLScrollListSpacer() = default;
/*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const override {}
};
@@ -134,23 +134,23 @@ public:
LLScrollListText(const LLScrollListCell::Params&);
/*virtual*/ ~LLScrollListText();
- /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const override;
- /*virtual*/ S32 getContentWidth() const override;
- /*virtual*/ S32 getHeight() const override;
+ /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const final override;
+ /*virtual*/ S32 getContentWidth() const final override;
+ /*virtual*/ S32 getHeight() const final override;
/*virtual*/ void setValue(const LLSD& value) override;
/*virtual*/ const LLSD getValue() const override;
- /*virtual*/ BOOL getVisible() const override;
- /*virtual*/ void highlightText(S32 offset, S32 num_chars) override;
+ /*virtual*/ BOOL getVisible() const final override;
+ /*virtual*/ void highlightText(S32 offset, S32 num_chars) final override;
- /*virtual*/ void setColor(const LLColor4&) override;
- /*virtual*/ BOOL isText() const override;
- /*virtual*/ const std::string & getToolTip() const override;
- /*virtual*/ BOOL needsToolTip() const override;
+ /*virtual*/ void setColor(const LLColor4&) final override;
+ /*virtual*/ BOOL isText() const final override;
+ /*virtual*/ const std::string & getToolTip() const final override;
+ /*virtual*/ BOOL needsToolTip() const final override;
S32 getTextWidth() const { return mTextWidth;}
void setTextWidth(S32 value) { mTextWidth = value;}
- void setWidth(S32 width) override
+ void setWidth(S32 width) final override
{ LLScrollListCell::setWidth(width); mTextWidth = width; }
void setText(const LLStringExplicit& text);
@@ -175,7 +175,7 @@ private:
/*
* Cell displaying an image.
*/
-class LLScrollListIcon : public LLScrollListCell
+class LLScrollListIcon final : public LLScrollListCell
{
public:
LLScrollListIcon(const LLScrollListCell::Params& p);
@@ -202,7 +202,7 @@ private:
/*
* An interactive cell containing a check box.
*/
-class LLScrollListCheck : public LLScrollListCell
+class LLScrollListCheck final : public LLScrollListCell
{
public:
LLScrollListCheck( const LLScrollListCell::Params&);
@@ -222,7 +222,7 @@ private:
LLCheckBoxCtrl* mCheckBox;
};
-class LLScrollListDate : public LLScrollListText
+class LLScrollListDate final : public LLScrollListText
{
public:
LLScrollListDate( const LLScrollListCell::Params& p );
@@ -233,7 +233,7 @@ private:
LLDate mDate;
};
-class LLScrollListLineEditor : public LLScrollListCell
+class LLScrollListLineEditor final : public LLScrollListCell
{
public:
LLScrollListLineEditor( const LLScrollListCell::Params&);
diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h
index a0579c8bfdf5282d6cf0b762aa5533dacd208c5e..ed39fa547ce5743ebcbbc95e94c847f898e8332c 100644
--- a/indra/llui/llscrolllistcolumn.h
+++ b/indra/llui/llscrolllistcolumn.h
@@ -37,7 +37,7 @@ class LLScrollListColumn;
class LLResizeBar;
class LLScrollListCtrl;
-class LLScrollColumnHeader : public LLButton
+class LLScrollColumnHeader final : public LLButton
{
public:
struct Params : public LLInitParam::Block<Params, LLButton::Params>
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index ddd14b0194f5253c2ad4d20258f8dfc39eefd41c..99ec5aa7a2cd5d72e919d875c923d61f2387e669 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -92,19 +92,19 @@ public:
// LLMouseHandler interface
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) final 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;
+ /*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask) final override;
+ /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask) final override;
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+ /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) final override;
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
- /*virtual*/ const std::string& getName() const override;
- /*virtual*/ void onMouseCaptureLost() override;
- /*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const override;
- /*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const override;
- /*virtual*/ BOOL hasMouseCapture() override;
+ /*virtual*/ const std::string& getName() const final override;
+ /*virtual*/ void onMouseCaptureLost() final override;
+ /*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const final override;
+ /*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const final override;
+ /*virtual*/ BOOL hasMouseCapture() final override;
S32 getStart() const { return mStart; }
void setStart(S32 start) { mStart = start; }
@@ -161,7 +161,7 @@ protected:
// This text segment is the same as LLNormalTextSegment, the only difference
// is that LLNormalTextSegment draws value of LLTextBase (LLTextBase::getWText()),
// but LLLabelTextSegment draws label of the LLTextBase (LLTextBase::mLabel)
-class LLLabelTextSegment : public LLNormalTextSegment
+class LLLabelTextSegment final : public LLNormalTextSegment
{
public:
LLLabelTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor );
@@ -174,7 +174,7 @@ protected:
};
// Text segment that changes it's style depending of mouse pointer position ( is it inside or outside segment)
-class LLOnHoverChangeableTextSegment : public LLNormalTextSegment
+class LLOnHoverChangeableTextSegment final : public LLNormalTextSegment
{
public:
LLOnHoverChangeableTextSegment( LLStyleConstSP style, LLStyleConstSP normal_style, S32 start, S32 end, LLTextBase& editor );
@@ -188,13 +188,13 @@ protected:
};
-class LLIndexSegment : public LLTextSegment
+class LLIndexSegment final : public LLTextSegment
{
public:
LLIndexSegment() : LLTextSegment(0, 0) {}
};
-class LLInlineViewSegment : public LLTextSegment
+class LLInlineViewSegment final : public LLTextSegment
{
public:
struct Params : public LLInitParam::Block<Params>
@@ -226,7 +226,7 @@ private:
bool mForceNewLine;
};
-class LLLineBreakTextSegment : public LLTextSegment
+class LLLineBreakTextSegment final : public LLTextSegment
{
public:
@@ -241,7 +241,7 @@ private:
S32 mFontHeight;
};
-class LLImageTextSegment : public LLTextSegment
+class LLImageTextSegment final : public LLTextSegment
{
public:
LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor);
@@ -335,13 +335,13 @@ public:
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) final override;
/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask) final override;
/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
- /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
- /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) final override;
+ /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) final override;
// LLView interface
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
@@ -349,32 +349,32 @@ public:
// LLUICtrl interface
/*virtual*/ BOOL acceptsTextInput() const override { return !mReadOnly; }
- /*virtual*/ void setColor( const LLColor4& c ) override;
+ /*virtual*/ void setColor( const LLColor4& c ) final override;
virtual void setReadOnlyColor(const LLColor4 &c);
void onVisibilityChange( BOOL new_visibility ) override;
/*virtual*/ void setValue(const LLSD& value ) override;
- /*virtual*/ LLTextViewModel* getViewModel() const override;
+ /*virtual*/ LLTextViewModel* getViewModel() const final override;
// LLEditMenuHandler interface
- /*virtual*/ BOOL canDeselect() const override;
- /*virtual*/ void deselect() override;
+ /*virtual*/ BOOL canDeselect() const final override;
+ /*virtual*/ void deselect() final override;
void onFocusReceived() override;
void onFocusLost() override;
// LLSpellCheckMenuHandler overrides
- /*virtual*/ bool getSpellCheck() const override;
+ /*virtual*/ bool getSpellCheck() const final override;
- /*virtual*/ const std::string& getSuggestion(U32 index) const override;
- /*virtual*/ U32 getSuggestionCount() const override;
- /*virtual*/ void replaceWithSuggestion(U32 index) override;
+ /*virtual*/ const std::string& getSuggestion(U32 index) const final override;
+ /*virtual*/ U32 getSuggestionCount() const final override;
+ /*virtual*/ void replaceWithSuggestion(U32 index) final override;
- /*virtual*/ void addToDictionary() override;
- /*virtual*/ bool canAddToDictionary() const override;
+ /*virtual*/ void addToDictionary() final override;
+ /*virtual*/ bool canAddToDictionary() const final override;
- /*virtual*/ void addToIgnore() override;
- /*virtual*/ bool canAddToIgnore() const override;
+ /*virtual*/ void addToIgnore() final override;
+ /*virtual*/ bool canAddToIgnore() const final override;
// Spell checking helper functions
std::string getMisspelledWord(S32 pos) const;
@@ -406,7 +406,7 @@ public:
void appendText(const std::string &new_text, bool prepend_newline, const LLStyle::Params& input_params = LLStyle::Params());
void setLabel(const LLStringExplicit& label);
- BOOL setLabelArg(const std::string& key, const LLStringExplicit& text ) override;
+ BOOL setLabelArg(const std::string& key, const LLStringExplicit& text ) final override;
const std::string& getLabel() { return mLabel.getString(); }
const LLWString& getWlabel() { return mLabel.getWString();}
@@ -611,7 +611,6 @@ protected:
void appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());
void appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false);
- S32 normalizeUri(std::string& uri);
protected:
std::string _getSearchText() const override
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 5416cca796da3985509ca6329155430ace1d821f..bee568b2fd172d4967296d38b00225ea5ca1c4f3 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -47,9 +47,6 @@ LLTextBox::LLTextBox(const LLTextBox::Params& p)
mShowCursorHand(true)
{}
-LLTextBox::~LLTextBox()
-{}
-
BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLTextBase::handleMouseDown(x, y, mask);
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index e18b9de0370fdcad95cdf8c4c9a2f7020645c513..6eab4666fece4b5b71fa67165cbaa4c76efc7646 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -46,15 +46,15 @@ protected:
friend class LLUICtrlFactory;
public:
- virtual ~LLTextBox();
+ virtual ~LLTextBox() = default;
- BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
- BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
- BOOL handleHover(S32 x, S32 y, MASK mask) override;
+ BOOL handleMouseDown(S32 x, S32 y, MASK mask) final override;
+ BOOL handleMouseUp(S32 x, S32 y, MASK mask) final override;
+ BOOL handleHover(S32 x, S32 y, MASK mask) final override;
- void setEnabled(BOOL enabled) override;
+ void setEnabled(BOOL enabled) final override;
- void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() ) override;
+ void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() ) final override;
void setRightAlign() { mHAlign = LLFontGL::RIGHT; }
void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; }
@@ -66,7 +66,7 @@ public:
S32 getTextPixelHeight();
LLSD getValue() const override;
- BOOL setTextArg( const std::string& key, const LLStringExplicit& text ) override;
+ BOOL setTextArg( const std::string& key, const LLStringExplicit& text ) final override;
void updateCurrencySymbols();
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 4468b5b7ddaf6d45f40b93193f27a128f409277f..1db7b7d209283acebc833ac2c0bca29fd855ee3e 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -80,7 +80,7 @@ const F32 SPELLCHECK_DELAY = 0.5f; // delay between the last keypress and spell
///////////////////////////////////////////////////////////////////
-class LLTextEditor::TextCmdInsert : public LLTextBase::TextCmd
+class LLTextEditor::TextCmdInsert final: public LLTextBase::TextCmd
{
public:
TextCmdInsert(S32 pos, BOOL group_with_next, const LLWString &ws, LLTextSegmentPtr segment)
@@ -114,7 +114,7 @@ private:
};
///////////////////////////////////////////////////////////////////
-class LLTextEditor::TextCmdAddChar : public LLTextBase::TextCmd
+class LLTextEditor::TextCmdAddChar final: public LLTextBase::TextCmd
{
public:
TextCmdAddChar( S32 pos, BOOL group_with_next, llwchar wc, LLTextSegmentPtr segment)
@@ -176,7 +176,7 @@ private:
///////////////////////////////////////////////////////////////////
-class LLTextEditor::TextCmdOverwriteChar : public LLTextBase::TextCmd
+class LLTextEditor::TextCmdOverwriteChar final : public LLTextBase::TextCmd
{
public:
TextCmdOverwriteChar( S32 pos, BOOL group_with_next, llwchar wc)
@@ -209,7 +209,7 @@ private:
///////////////////////////////////////////////////////////////////
-class LLTextEditor::TextCmdRemove : public LLTextBase::TextCmd
+class LLTextEditor::TextCmdRemove final : public LLTextBase::TextCmd
{
public:
TextCmdRemove( S32 pos, BOOL group_with_next, S32 len, segment_vec_t& segments ) :
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 315445429af396504cccca5ed50d9446fa0d6afa..f41692e44abe3abf5d597b10b7cb1ae9394cec60 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -94,50 +94,50 @@ public:
// mousehandler overrides
BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
- BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) final override;
BOOL handleHover(S32 x, S32 y, MASK mask) override;
BOOL handleDoubleClick(S32 x, S32 y, MASK mask ) override;
- BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask) override;
+ BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask) final override;
- BOOL handleKeyHere(KEY key, MASK mask ) override;
- BOOL handleUnicodeCharHere(llwchar uni_char) override;
+ BOOL handleKeyHere(KEY key, MASK mask ) final override;
+ BOOL handleUnicodeCharHere(llwchar uni_char) final override;
- void onMouseCaptureLost() override;
+ void onMouseCaptureLost() final override;
// view overrides
void draw() override;
void onFocusReceived() override;
void onFocusLost() override;
void onCommit() override;
- void setEnabled(BOOL enabled) override;
+ void setEnabled(BOOL enabled) final override;
// uictrl overrides
- void clear() override;
- void setFocus( BOOL b ) override;
- BOOL isDirty() const override;
+ void clear() final override;
+ void setFocus( BOOL b ) final override;
+ BOOL isDirty() const final override;
// LLEditMenuHandler interface
- void undo() override;
- BOOL canUndo() const override;
- void redo() override;
- BOOL canRedo() const override;
-
- void cut() override;
- BOOL canCut() const override;
- void copy() override;
- BOOL canCopy() const override;
- void paste() override;
- BOOL canPaste() const override;
+ void undo() final override;
+ BOOL canUndo() const final override;
+ void redo() final override;
+ BOOL canRedo() const final override;
+
+ void cut() final override;
+ BOOL canCut() const final override;
+ void copy() final override;
+ BOOL canCopy() const final override;
+ void paste() final override;
+ BOOL canPaste() const final override;
virtual void updatePrimary();
virtual void copyPrimary();
virtual void pastePrimary();
virtual BOOL canPastePrimary() const;
- void doDelete() override;
- BOOL canDoDelete() const override;
- void selectAll() override;
- BOOL canSelectAll() const override;
+ void doDelete() final override;
+ BOOL canDoDelete() const final override;
+ void selectAll() final override;
+ BOOL canSelectAll() const final override;
void selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_pos);
@@ -164,7 +164,7 @@ public:
autoreplace_callback_t mAutoreplaceCallback;
void setAutoreplaceCallback(autoreplace_callback_t cb) { mAutoreplaceCallback = cb; }
- /*virtual*/ void onSpellCheckPerformed() override;
+ /*virtual*/ void onSpellCheckPerformed() final override;
//
// Text manipulation
@@ -174,7 +174,7 @@ public:
void insertText(const std::string &text);
void insertText(LLWString &text);
- void appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo) override;
+ void appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo) final override;
// Non-undoable
void setText(const LLStringExplicit &utf8str, const LLStyle::Params& input_params = LLStyle::Params()) override;
@@ -257,14 +257,14 @@ protected:
BOOL hasPreeditString() const;
// Overrides LLPreeditor
- void resetPreedit() override;
+ void resetPreedit() final override;
void updatePreedit(const LLWString &preedit_string,
- const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position) override;
- void markAsPreedit(S32 position, S32 length) override;
- void getPreeditRange(S32 *position, S32 *length) const override;
- void getSelectionRange(S32 *position, S32 *length) const override;
- BOOL getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const override;
- S32 getPreeditFontSize() const override;
+ const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position) final override;
+ void markAsPreedit(S32 position, S32 length) final override;
+ void getPreeditRange(S32 *position, S32 *length) const final override;
+ void getSelectionRange(S32 *position, S32 *length) const final override;
+ BOOL getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const final override;
+ S32 getPreeditFontSize() const final override;
LLWString getPreeditString() const override { return getWText(); }
//
// Protected data
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index aa0e185fa5838a72bbfa68e3df13e8f8021e19f5..3687f463c076a53dab2e1c2520a72501936b5f46 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -74,7 +74,7 @@ static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history");
const static std::string NEW_LINE(rawstr_to_utf8("\n"));
// support for secondlife:///app/objectim/{UUID}/ SLapps
-class LLObjectIMHandler : public LLCommandHandler
+class LLObjectIMHandler final : public LLCommandHandler
{
public:
// requests will be throttled from a non-trusted browser
@@ -105,7 +105,7 @@ public:
};
LLObjectIMHandler gObjectIMHandler;
-class LLChatHistoryHeader: public LLPanel
+class LLChatHistoryHeader final : public LLPanel
{
public:
LLChatHistoryHeader()
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h
index 37bfbb4c77285d87e7e225b6b0c5534aa89b4a84..45c4a7e6057b651b23881b65cf707a2a49922c01 100644
--- a/indra/newview/llchathistory.h
+++ b/indra/newview/llchathistory.h
@@ -32,7 +32,7 @@
#include "llviewerchat.h"
//Chat log widget allowing addition of a message as a widget
-class LLChatHistory : public LLUICtrl
+class LLChatHistory final : public LLUICtrl
{
public:
struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 2d54c58205152accaf07b3b47807de11be48e86b..096d286f96537c240530507533bbd1b26ee9d89f 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -49,12 +49,12 @@ static const S32 msg_height_pad = 5;
// <alchemy>
void set_view_width(LLView* view, const LLSD& value)
{
- LLRect rect(view->getRect());
- int width_diff(value.asInteger() - rect.getWidth());
- if (!width_diff)
- return;
- rect.mRight += width_diff;
- view->reshape(value, rect.getHeight(), true);
+ LLRect rect(view->getRect());
+ int width_diff(value.asInteger() - rect.getWidth());
+ if (!width_diff)
+ return;
+ rect.mRight += width_diff;
+ view->reshape(value, rect.getHeight(), true);
}
//<alchemy>
@@ -63,7 +63,7 @@ void set_view_width(LLView* view, const LLSD& value)
//*******************************************************************************************************************
// handle secondlife:///app/object/<ID>/inspect SLURLs
-class LLObjectHandler : public LLCommandHandler
+class LLObjectHandler final : public LLCommandHandler
{
public:
LLObjectHandler() : LLCommandHandler("object", UNTRUSTED_BLOCK) { }
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h
index 66d6fca4962c0af748e2203543610bbb745f5e9f..f0fb88e7e346ca5a3d4c7282fca3aefb4131e43c 100644
--- a/indra/newview/llchatitemscontainerctrl.h
+++ b/indra/newview/llchatitemscontainerctrl.h
@@ -40,7 +40,7 @@ typedef enum e_show_item_header
CHATITEMHEADER_SHOW_BOTH
} EShowItemHeader;
-class LLFloaterIMNearbyChatToastPanel : public LLPanel
+class LLFloaterIMNearbyChatToastPanel final : public LLPanel
{
protected:
LLFloaterIMNearbyChatToastPanel()
diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp
index 20b9292cc519af3be91673eb7d9606d73b378977..810fdb124b9eba8535b45e01f910ae9ee7a17771 100644
--- a/indra/newview/llchatmsgbox.cpp
+++ b/indra/newview/llchatmsgbox.cpp
@@ -33,7 +33,7 @@
static LLDefaultChildRegistry::Register<LLChatMsgBox> r("text_chat");
-class ChatSeparator : public LLTextSegment
+class ChatSeparator final : public LLTextSegment
{
public:
ChatSeparator(S32 start, S32 end)
diff --git a/indra/newview/llchatmsgbox.h b/indra/newview/llchatmsgbox.h
index 7e008dba46dbf3773a20ad43a9d2f271c8ea15e8..c8a61fbe704afa394c2c225e24d623348274ca3d 100644
--- a/indra/newview/llchatmsgbox.h
+++ b/indra/newview/llchatmsgbox.h
@@ -39,11 +39,11 @@
/// visual separated from the previous block (e.g., with a horizontal
/// line).
///
-class LLChatMsgBox :
+class LLChatMsgBox final :
public LLTextBox
{
public:
- struct Params : public LLInitParam::Block<Params, LLTextBox::Params>
+ struct Params final : public LLInitParam::Block<Params, LLTextBox::Params>
{
Optional<S32> block_spacing;
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index df8bbebe85a712acd0cf01469c136797dfa57575..38d37a1596744713f9c4d8f883a3ed2f0b37e444 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -38,7 +38,7 @@ class LLFloaterIMSession;
/**
* Class for displaying amount of messages/notifications(unread).
*/
-class LLChicletNotificationCounterCtrl : public LLTextBox
+class LLChicletNotificationCounterCtrl final : public LLTextBox
{
public:
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index ceca33e8393e7a464ad9e082028c511b9e207fca..52e4da217ab17a2048d6732680af5cf17490a804 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -34,7 +34,7 @@
static LLDefaultChildRegistry::Register<LLExpandableTextBox> t1("expandable_text");
-class LLExpanderSegment : public LLTextSegment
+class LLExpanderSegment final : public LLTextSegment
{
public:
LLExpanderSegment(const LLStyleSP& style, S32 start, S32 end, const std::string& more_text, LLTextBase& editor )
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index 75c3c3267af44fbc6dc0cd0a4eb417c2a07e6705..8a976e9c29d80d5176408a158430fdd92388c944 100644
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -35,7 +35,7 @@
* if text doesn't fit into text box. After pressing "More" the text box will expand to show
* all text. If text is still too big, a scroll bar will appear inside expanded text box.
*/
-class LLExpandableTextBox : public LLUICtrl
+class LLExpandableTextBox final : public LLUICtrl
{
protected:
@@ -43,7 +43,7 @@ protected:
* Extended text box. "More" link will appear at end of text if
* text is too long to fit into text box size.
*/
- class LLTextBoxEx : public LLTextEditor
+ class LLTextBoxEx final : public LLTextEditor
{
public:
struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
index f275483f505e4b3ee184e1853d4f1b701623dd07..fbeff5e339ad5a859aeb7b57667e792b2d3a18a5 100644
--- a/indra/newview/llfloaterimnearbychat.h
+++ b/indra/newview/llfloaterimnearbychat.h
@@ -34,7 +34,7 @@
class LLResizeBar;
-class LLFloaterIMNearbyChat : public LLFloaterIMSessionTab
+class LLFloaterIMNearbyChat final : public LLFloaterIMSessionTab
{
public:
// constructor for inline chat-bars (e.g. hosted in chat history window)
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 59f42dc56a77c6b5cc01a54c18fea613197c6eb0..88a482b9fd97d58d45ec4bcdcbc9c1cdaeb5871e 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -50,7 +50,7 @@ typedef boost::signals2::signal<void(const LLUUID& session_id)> floater_showed_s
* Individual IM window that appears at the bottom of the screen,
* optionally "docked" to the bottom tray.
*/
-class LLFloaterIMSession
+class LLFloaterIMSession final
: public LLVoiceClientStatusObserver
, public LLFloaterIMSessionTab
{
diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h
index e267541a5b9907e9be73bd3839e7619ff5dca3b8..8ce5fc70c11b43e1554205c8ddf87ecbb7521a44 100644
--- a/indra/newview/llfloaterlinkreplace.h
+++ b/indra/newview/llfloaterlinkreplace.h
@@ -37,7 +37,7 @@
class LLButton;
class LLTextBox;
-class LLInventoryLinkReplaceDropTarget : public LLLineEditor
+class LLInventoryLinkReplaceDropTarget final : public LLLineEditor
{
public:
struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>
@@ -48,7 +48,7 @@ public:
LLInventoryLinkReplaceDropTarget(const Params& p)
: LLLineEditor(p) {}
- ~LLInventoryLinkReplaceDropTarget() {}
+ ~LLInventoryLinkReplaceDropTarget() = default;
typedef boost::signals2::signal<void(const LLUUID& id)> item_dad_callback_t;
boost::signals2::connection setDADCallback(const item_dad_callback_t::slot_type& cb)
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 2221f5dd493e2d89a281eb228e123eaa24963d2b..4d737842574441920fdf6cdaf1fd59e4cf970cfe 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -48,7 +48,7 @@ class LLPathfindingNavMeshStatus;
*
* @see LLNavigationBar
*/
-class LLLocationInputCtrl
+class LLLocationInputCtrl final
: public LLComboBox
{
LOG_CLASS(LLLocationInputCtrl);
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
index f36ae6720442eb06a3ec0c6d26ecaa08eb55e4ae..499fa5039d4033952e9fc663a23a61b869049375 100644
--- a/indra/newview/llnamebox.h
+++ b/indra/newview/llnamebox.h
@@ -33,7 +33,7 @@
#include "llfontgl.h"
#include "lltextbox.h"
-class LLNameBox
+class LLNameBox final
: public LLTextBox
{
public:
diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h
index 2c4ad7b008fb5d453bc90e8457888efadb06a0de..72b1ef494716acb4ec76cfdb38be302635c3bf84 100644
--- a/indra/newview/llnameeditor.h
+++ b/indra/newview/llnameeditor.h
@@ -35,7 +35,7 @@
#include "lllineeditor.h"
-class LLNameEditor
+class LLNameEditor final
: public LLLineEditor
{
public:
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 34f2ab9e46f726ad1d8623c9523ae1ae77ce5b7b..caee9c378b8b8968175ab3a66085512f4618e497 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -39,7 +39,7 @@ class LLAvatarName;
* We don't use LLScrollListItem to be able to override getUUID(), which is needed
* because the name list item value is not simply an UUID but a map (uuid, is_group).
*/
-class LLNameListItem : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
+class LLNameListItem final : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
{
public:
bool isGroup() const { return mIsGroup; }
@@ -71,7 +71,7 @@ private:
};
-class LLNameListCtrl
+class LLNameListCtrl final
: public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
{
public:
diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
index b9bf1a22ca01ef0c470ed814b5bc449508c0a020..ecf603d146aada46207fdafcdbd26b4305b3982d 100644
--- a/indra/newview/llscripteditor.h
+++ b/indra/newview/llscripteditor.h
@@ -30,7 +30,7 @@
#include "lltexteditor.h"
-class LLScriptEditor : public LLTextEditor
+class LLScriptEditor final : public LLTextEditor
{
public:
@@ -41,7 +41,7 @@ public:
Params();
};
- virtual ~LLScriptEditor() {};
+ virtual ~LLScriptEditor() = default;
// LLView override
void draw() override;
diff --git a/indra/newview/llsearchcombobox.h b/indra/newview/llsearchcombobox.h
index 6cf2b90a71a312ecea6ebdef377c3e45b1f8e196..93801077de040e0dc265bdf0a2e4783ee2821abe 100644
--- a/indra/newview/llsearchcombobox.h
+++ b/indra/newview/llsearchcombobox.h
@@ -35,7 +35,7 @@
* with recent queries. Supports text auto-complete and filtering of drop down list
* according to typed text.
*/
-class LLSearchComboBox : public LLComboBox
+class LLSearchComboBox final : public LLComboBox
{
public:
diff --git a/indra/newview/llurllineeditorctrl.h b/indra/newview/llurllineeditorctrl.h
index 2c47d57874d93cbdda2759ee5e64c57d6cc7c3e9..664562e777ed7d2586d76ee558eb329642489251 100644
--- a/indra/newview/llurllineeditorctrl.h
+++ b/indra/newview/llurllineeditorctrl.h
@@ -30,7 +30,7 @@
#include "lllineeditor.h"
// LLURLLineEditor class performing escaping of an URL while copying or cutting the target text
-class LLURLLineEditor: public LLLineEditor {
+class LLURLLineEditor final : public LLLineEditor {
LOG_CLASS( LLURLLineEditor);
public:
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 300c6832cfd38afeda7f2eccfdcd28276aa145cf..342d2b3eddc40304d2338a8b05f5c0f0a5bb030c 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -66,7 +66,7 @@ static LLDefaultChildRegistry::Register<LLViewerTextEditor> r("text_editor");
///-----------------------------------------------------------------------
/// Class LLEmbeddedLandmarkCopied
///-----------------------------------------------------------------------
-class LLEmbeddedLandmarkCopied: public LLInventoryCallback
+class LLEmbeddedLandmarkCopied final : public LLInventoryCallback
{
public:
@@ -118,7 +118,7 @@ public:
///----------------------------------------------------------------------------
/// Class LLEmbeddedNotecardOpener
///----------------------------------------------------------------------------
-class LLEmbeddedNotecardOpener : public LLInventoryCallback
+class LLEmbeddedNotecardOpener final : public LLInventoryCallback
{
LLViewerTextEditor* mTextEditor;
@@ -161,7 +161,7 @@ public:
const S32 EMBEDDED_ITEM_LABEL_PADDING = 2;
-class LLEmbeddedItemSegment : public LLTextSegment
+class LLEmbeddedItemSegment final : public LLTextSegment
{
public:
LLEmbeddedItemSegment(S32 pos, LLUIImagePtr image, LLPointer<LLInventoryItem> inv_item, LLTextEditor& editor)
@@ -592,7 +592,7 @@ void LLEmbeddedItems::markSaved()
///////////////////////////////////////////////////////////////////
-class LLViewerTextEditor::TextCmdInsertEmbeddedItem : public LLTextBase::TextCmd
+class LLViewerTextEditor::TextCmdInsertEmbeddedItem final: public LLTextBase::TextCmd
{
public:
TextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item )
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 79b17d75e33cbfbea00bfb42ca7e05723c254fcb..a2f0b199774680ef04d25ae1eb151aad097d852f 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -32,7 +32,7 @@
//
// Classes
//
-class LLViewerTextEditor : public LLTextEditor
+class LLViewerTextEditor final : public LLTextEditor
{
public:
struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>