Skip to content

Commit 4cccf8a

Browse files
marchcatakleshchev
authored andcommitted
Restore missing 'override'
1 parent 8c5d144 commit 4cccf8a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

indra/llui/llflatlistview.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,20 @@ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
113113
};
114114

115115
// disable traversal when finding widget to hand focus off to
116-
/*virtual*/ bool canFocusChildren() const { return false; }
116+
/*virtual*/ bool canFocusChildren() const override { return false; }
117117

118118
/**
119119
* Connects callback to signal called when Return key is pressed.
120120
*/
121121
boost::signals2::connection setReturnCallback( const commit_signal_t::slot_type& cb ) { return mOnReturnSignal.connect(cb); }
122122

123123
/** Overridden LLPanel's reshape, height is ignored, the list sets its height to accommodate all items */
124-
virtual void reshape(S32 width, S32 height, bool called_from_parent = true);
124+
virtual void reshape(S32 width, S32 height, bool called_from_parent = true) override;
125125

126126
/** Returns full rect of child panel */
127127
const LLRect& getItemsRect() const;
128128

129-
LLRect getRequiredRect() const { return getItemsRect(); }
129+
LLRect getRequiredRect() override { return getItemsRect(); }
130130

131131
/** Returns distance between items */
132132
const S32 getItemsPad() const { return mItemPad; }
@@ -270,7 +270,7 @@ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
270270
U32 size(const bool only_visible_items = true) const;
271271

272272
/** Removes all items from the list */
273-
virtual void clear();
273+
virtual void clear() override;
274274

275275
/**
276276
* Removes all items that can be detached from the list but doesn't destroy
@@ -297,7 +297,7 @@ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
297297
void selectFirstItem();
298298
void selectLastItem();
299299

300-
virtual S32 notify(const LLSD& info) ;
300+
virtual S32 notify(const LLSD& info) override;
301301

302302
virtual ~LLFlatListView();
303303

@@ -346,8 +346,8 @@ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
346346

347347
virtual bool selectNextItemPair(bool is_up_direction, bool reset_selection);
348348

349-
virtual bool canSelectAll() const;
350-
virtual void selectAll();
349+
virtual bool canSelectAll() const override;
350+
virtual void selectAll() override;
351351

352352
virtual bool isSelected(item_pair_t* item_pair) const;
353353

@@ -364,15 +364,15 @@ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
364364
*/
365365
void notifyParentItemsRectChanged();
366366

367-
virtual bool handleKeyHere(KEY key, MASK mask);
367+
virtual bool handleKeyHere(KEY key, MASK mask) override;
368368

369-
virtual bool postBuild();
369+
virtual bool postBuild() override;
370370

371-
virtual void onFocusReceived();
371+
virtual void onFocusReceived() override;
372372

373-
virtual void onFocusLost();
373+
virtual void onFocusLost() override;
374374

375-
virtual void draw();
375+
virtual void draw() override;
376376

377377
LLRect getLastSelectedItemRect();
378378

indra/llui/lltextbox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class LLTextBox :
7878
bool mShowCursorHand;
7979

8080
protected:
81-
virtual std::string _getSearchText() const
81+
virtual std::string _getSearchText() const override
8282
{
8383
return LLTextBase::_getSearchText() + mText.getString();
8484
}

0 commit comments

Comments
 (0)