Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark notify stuffs final/override

Browse Source
This commit is contained in:
Liru Færs
2019-12-22 21:06:37 -05:00
parent 949190b48d
commit a432c3429c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llgroupnotify.h
View File

@@ -43,7 +43,7 @@ class LLButton;
// NotifyBox - for notifications that require a response from the // NotifyBox - for notifications that require a response from the
// user. Replaces LLMessageBox. // user. Replaces LLMessageBox.
class LLGroupNotifyBox class LLGroupNotifyBox final
: public LLPanel, : public LLPanel,
public LLInitClass<LLGroupNotifyBox> public LLInitClass<LLGroupNotifyBox>
{ {
@@ -70,10 +70,10 @@ protected:
/*virtual*/ ~LLGroupNotifyBox(); /*virtual*/ ~LLGroupNotifyBox();
/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
// Animate as sliding onto the screen. // Animate as sliding onto the screen.
/*virtual*/ void draw(); /*virtual*/ void draw() override;
void moveToBack(); void moveToBack();

16
indra/newview/llnotify.h
View File

@@ -43,7 +43,7 @@ class LLNotifyBoxTemplate;
class LLTextEditor; class LLTextEditor;
// NotifyBox - for notifications that require a response from the user. // NotifyBox - for notifications that require a response from the user.
class LLNotifyBox : class LLNotifyBox final :
public LLPanel, public LLPanel,
public LLEventTimer, public LLEventTimer,
public LLInitClass<LLNotifyBox>, public LLInitClass<LLNotifyBox>,
@@ -54,7 +54,7 @@ public:
bool isTip() const { return mIsTip; } bool isTip() const { return mIsTip; }
bool isCaution() const { return mIsCaution; } bool isCaution() const { return mIsCaution; }
/*virtual*/ void setVisible(BOOL visible); /*virtual*/ void setVisible(BOOL visible) override;
void stopAnimation() { mAnimating = false; } void stopAnimation() { mAnimating = false; }
void close(); void close();
@@ -70,12 +70,12 @@ protected:
LLButton* addButton(const std::string& name, const std::string& label, bool is_option, bool is_default, bool layout_script_dialog); LLButton* addButton(const std::string& name, const std::string& label, bool is_option, bool is_default, bool layout_script_dialog);
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
// Animate as sliding onto the screen. // Animate as sliding onto the screen.
/*virtual*/ void draw(); /*virtual*/ void draw() override;
/*virtual*/ BOOL tick(); /*virtual*/ BOOL tick() override;
void moveToBack(bool getfocus = false); void moveToBack(bool getfocus = false);
@@ -111,13 +111,13 @@ protected:
bool mAddedDefaultBtn; bool mAddedDefaultBtn;
}; };
class LLNotifyBoxView : public LLUICtrl class LLNotifyBoxView final : public LLUICtrl
{ {
public: public:
LLNotifyBoxView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE); LLNotifyBoxView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
void showOnly(LLView* ctrl); void showOnly(LLView* ctrl);
LLNotifyBox* getFirstNontipBox() const; LLNotifyBox* getFirstNontipBox() const;
/*virtual*/ void deleteAllChildren(); /*virtual*/ void deleteAllChildren() override;
struct Matcher struct Matcher
{ {