diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2024-02-21 13:00:53 -0800 | 
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2024-02-21 15:37:06 -0800 | 
| commit | 97f049db3b396c7a12d723f3305084570866a475 (patch) | |
| tree | cf5216f90bc5f5802d2e23dcd309582154a7869d | |
| parent | 589910f445efa9690b543a37b9e2e14792a0e133 (diff) | |
secondlife/viewer-issues#72: Fix clang warnings (virtual override)
| -rw-r--r-- | indra/newview/lltexturectrl.h | 34 | 
1 files changed, 17 insertions, 17 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index a19c8b6e3d..f193b0c083 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -148,28 +148,28 @@ public:  	// LLView interface -	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask); -	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, -						BOOL drop, EDragAndDropType cargo_type, void *cargo_data, -						EAcceptance *accept, -						std::string& tooltip_msg); -	virtual BOOL	handleHover(S32 x, S32 y, MASK mask); -	virtual BOOL	handleUnicodeCharHere(llwchar uni_char); +    BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; +    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, +        BOOL drop, EDragAndDropType cargo_type, void *cargo_data, +        EAcceptance *accept, +        std::string& tooltip_msg) override; +    BOOL handleHover(S32 x, S32 y, MASK mask) override; +    BOOL handleUnicodeCharHere(llwchar uni_char) override; -	virtual void	draw(); -	virtual void	setVisible( BOOL visible ); -	virtual void	setEnabled( BOOL enabled ); +    void draw() override; +    void setVisible( BOOL visible ) override; +    void setEnabled( BOOL enabled ) override; -	void onVisibilityChange(BOOL new_visibility) override; +    void onVisibilityChange(BOOL new_visibility) override; -	void			setValid(BOOL valid); +    void setValid(BOOL valid); -	// LLUICtrl interface -	virtual void	clear(); +    // LLUICtrl interface +    void clear() override; -	// Takes a UUID, wraps get/setImageAssetID -	virtual void	setValue(const LLSD& value); -	virtual LLSD	getValue() const; +    // Takes a UUID, wraps get/setImageAssetID +    void setValue(const LLSD& value) override; +    LLSD getValue() const override;  	// LLTextureCtrl interface  	void			showPicker(BOOL take_focus);  | 
