Skip to content
Snippets Groups Projects
Commit 81593a10 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Merge remote-tracking branch 'origin/xenhat/fixes/virtual-override'

parents 4625e097 fded37f4
No related branches found
No related tags found
1 merge request!124Xenhat/fixes/virtual override
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloaterimnearbychat.h
+ 10
− 10
View file @ 81593a10
...@@ -56,12 +56,12 @@ class LLFloaterIMNearbyChat final ...@@ -56,12 +56,12 @@ class LLFloaterIMNearbyChat final
static LLFloaterIMNearbyChat* buildFloater(const LLSD& key); static LLFloaterIMNearbyChat* buildFloater(const LLSD& key);
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild() override;
/*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onOpen(const LLSD& key) override;
/*virtual*/ void onClose(bool app_quitting); /*virtual*/ void onClose(bool app_quitting) override;
/*virtual*/ void setVisible(BOOL visible); /*virtual*/ void setVisible(BOOL visible) override;
/*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()) override;
/*virtual*/ void closeHostedFloater(); /*virtual*/ void closeHostedFloater() override;
void loadHistory(); void loadHistory();
void reloadMessages(bool clean_messages = false); void reloadMessages(bool clean_messages = false);
...@@ -79,7 +79,7 @@ class LLFloaterIMNearbyChat final ...@@ -79,7 +79,7 @@ class LLFloaterIMNearbyChat final
std::string getCurrentChat(); std::string getCurrentChat();
S32 getMessageArchiveLength() {return mMessageArchive.size();} S32 getMessageArchiveLength() {return mMessageArchive.size();}
virtual BOOL handleKeyHere( KEY key, MASK mask ); BOOL handleKeyHere( KEY key, MASK mask ) override;
static void startChat(const char* line); static void startChat(const char* line);
static void stopChat(); static void stopChat();
...@@ -112,8 +112,8 @@ class LLFloaterIMNearbyChat final ...@@ -112,8 +112,8 @@ class LLFloaterIMNearbyChat final
void onChatBoxCommit(); void onChatBoxCommit();
void onChatFontChange(LLFontGL* fontp); void onChatFontChange(LLFontGL* fontp);
/*virtual*/ void onTearOffClicked(); /*virtual*/ void onTearOffClicked() override;
/*virtual*/ void onClickCloseBtn(bool app_qutting = false); /*virtual*/ void onClickCloseBtn(bool app_qutting = false) override;
public: public:
static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
...@@ -134,7 +134,7 @@ class LLFloaterIMNearbyChat final ...@@ -134,7 +134,7 @@ class LLFloaterIMNearbyChat final
S32 mExpandedHeight; S32 mExpandedHeight;
private: private:
/*virtual*/ void refresh(); /*virtual*/ void refresh() override;
std::vector<LLChat> mMessageArchive; std::vector<LLChat> mMessageArchive;
......
indra/newview/llfloaterworldmap.h
+ 8
− 8
View file @ 81593a10
...@@ -61,19 +61,19 @@ class LLFloaterWorldMap final : public LLRemoteParcelInfoObserver, public LLFloa ...@@ -61,19 +61,19 @@ class LLFloaterWorldMap final : public LLRemoteParcelInfoObserver, public LLFloa
static LLFloaterWorldMap* getInstance(); static LLFloaterWorldMap* getInstance();
static void *createWorldMapView(void* data); static void *createWorldMapView(void* data);
BOOL postBuild(); BOOL postBuild() override;
/*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onOpen(const LLSD& key) override;
/*virtual*/ void onClose(bool app_quitting); /*virtual*/ void onClose(bool app_quitting) override;
static void reloadIcons(void*); static void reloadIcons(void*);
/*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE ); /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE ) override;
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
/*virtual*/ void draw(); /*virtual*/ void draw() override;
/*virtual*/ void onFocusLost(); /*virtual*/ void onFocusLost() override;
// methods for dealing with inventory. The observe() method is // methods for dealing with inventory. The observe() method is
// called during program startup. inventoryUpdated() will be // called during program startup. inventoryUpdated() will be
......
indra/newview/llscripteditor.h
+ 3
− 3
View file @ 81593a10
...@@ -44,7 +44,7 @@ class LLScriptEditor : public LLTextEditor ...@@ -44,7 +44,7 @@ class LLScriptEditor : public LLTextEditor
virtual ~LLScriptEditor(); virtual ~LLScriptEditor();
// LLView override // LLView override
virtual void draw(); virtual void draw() override;
BOOL postBuild() override; BOOL postBuild() override;
void initKeywords(); void initKeywords();
...@@ -59,8 +59,8 @@ class LLScriptEditor : public LLTextEditor ...@@ -59,8 +59,8 @@ class LLScriptEditor : public LLTextEditor
private: private:
void drawLineNumbers(); void drawLineNumbers();
/* virtual */ void updateSegments(); /* virtual */ void updateSegments() override;
/* virtual */ void drawSelectionBackground(); /* virtual */ void drawSelectionBackground() override;
void loadKeywords(const std::string& filename_keywords, void loadKeywords(const std::string& filename_keywords,
const std::string& filename_colors); const std::string& filename_colors);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment