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

Fix clang warnings

parent f04ef355
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llui/llfloater.h
+ 17
− 17
View file @ 2ed13e24
...@@ -221,12 +221,12 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> ...@@ -221,12 +221,12 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
void initFromParams(const LLFloater::Params& p); void initFromParams(const LLFloater::Params& p);
bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL); bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL);
/*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false); /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false) override;
/*virtual*/ BOOL canSnapTo(const LLView* other_view); /*virtual*/ BOOL canSnapTo(const LLView* other_view) override;
/*virtual*/ void setSnappedTo(const LLView* snap_view); /*virtual*/ void setSnappedTo(const LLView* snap_view) override;
/*virtual*/ void setFocus( BOOL b ); /*virtual*/ void setFocus( BOOL b ) override;
/*virtual*/ void setIsChrome(BOOL is_chrome); /*virtual*/ void setIsChrome(BOOL is_chrome) override;
/*virtual*/ void setRect(const LLRect &rect); /*virtual*/ void setRect(const LLRect &rect) override;
void setIsSingleInstance(BOOL is_single_instance); void setIsSingleInstance(BOOL is_single_instance);
void initFloater(const Params& p); void initFloater(const Params& p);
...@@ -239,7 +239,7 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> ...@@ -239,7 +239,7 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
// Close the floater or its host. Use when hidding or toggling a floater instance. // Close the floater or its host. Use when hidding or toggling a floater instance.
virtual void closeHostedFloater(); virtual void closeHostedFloater();
/*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;
// Release keyboard and mouse focus // Release keyboard and mouse focus
void releaseFocus(); void releaseFocus();
...@@ -295,26 +295,26 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater> ...@@ -295,26 +295,26 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
S32 getMinHeight() const{ return mMinHeight; } S32 getMinHeight() const{ return mMinHeight; }
S32 getHeaderHeight() const { return mHeaderHeight; } S32 getHeaderHeight() const { return mHeaderHeight; }
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override;
virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 mask); BOOL handleScrollWheel(S32 x, S32 y, S32 mask) override;
virtual void draw(); void draw() override;
virtual void drawShadow(LLPanel* panel); virtual void drawShadow(LLPanel* panel);
virtual void onOpen(const LLSD& key) {} void onOpen(const LLSD& key) override {}
virtual void onClose(bool app_quitting) {} virtual void onClose(bool app_quitting) {}
// This cannot be "const" until all derived floater canClose() // This cannot be "const" until all derived floater canClose()
// methods are const as well. JC // methods are const as well. JC
virtual BOOL canClose() { return TRUE; } virtual BOOL canClose() { return TRUE; }
/*virtual*/ void setVisible(BOOL visible); // do not override void setVisible(BOOL visible) override; // do not override
/*virtual*/ void onVisibilityChange ( BOOL new_visibility ); // do not override void onVisibilityChange ( BOOL new_visibility ) override; // do not override
void setFrontmost(BOOL take_focus = TRUE, BOOL restore = TRUE); void setFrontmost(BOOL take_focus = TRUE, BOOL restore = TRUE);
virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()); virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
......
indra/llui/llview.h
+ 20
− 20
View file @ 2ed13e24
...@@ -383,9 +383,9 @@ class LLView ...@@ -383,9 +383,9 @@ class LLView
virtual void setSnappedTo(const LLView* snap_view); virtual void setSnappedTo(const LLView* snap_view);
// inherited from LLFocusableElement // inherited from LLFocusableElement
/* virtual */ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); /* virtual */ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
/* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent); /* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent) override;
/* virtual */ BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); /* virtual */ BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent) override;
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type, EDragAndDropType cargo_type,
...@@ -425,23 +425,23 @@ class LLView ...@@ -425,23 +425,23 @@ class LLView
// LLMouseHandler functions // LLMouseHandler functions
// Default behavior is to pass events to children // Default behavior is to pass events to children
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleDoubleClick(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*/ BOOL handleScrollHWheel(S32 x, S32 y, S32 clicks); /*virtual*/ BOOL handleScrollHWheel(S32 x, S32 y, S32 clicks) override;
/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
/*virtual*/ const std::string& getName() const; /*virtual*/ const std::string& getName() const override;
/*virtual*/ void onMouseCaptureLost(); /*virtual*/ void onMouseCaptureLost() override;
/*virtual*/ BOOL hasMouseCapture(); /*virtual*/ BOOL hasMouseCapture() override;
/*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const; /*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; /*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const override;
virtual LLView* childFromPoint(S32 x, S32 y, bool recur=false); virtual LLView* childFromPoint(S32 x, S32 y, bool recur=false);
......
indra/newview/llviewerjoint.h
+ 1
− 1
View file @ 2ed13e24
...@@ -57,7 +57,7 @@ class LLViewerJoint : ...@@ -57,7 +57,7 @@ class LLViewerJoint :
// Traverses the entire joint hierarchy, setting up // Traverses the entire joint hierarchy, setting up
// transforms and calling the drawShape(). // transforms and calling the drawShape().
// Derived classes may add text/graphic output. // Derived classes may add text/graphic output.
virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ); // Returns triangle count virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) override; // Returns triangle count
// Draws the shape attached to a joint. // Draws the shape attached to a joint.
// Called by render(). // Called by render().
......
indra/newview/llviewerjointmesh.h
+ 8
− 8
View file @ 2ed13e24
...@@ -56,19 +56,19 @@ class LLViewerJointMesh final : public LLAvatarJointMesh, public LLViewerJoint ...@@ -56,19 +56,19 @@ class LLViewerJointMesh final : public LLAvatarJointMesh, public LLViewerJoint
void uploadJointMatrices(); void uploadJointMatrices();
// overloaded from base class // overloaded from base class
/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy ); /*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) override;
// necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here. // necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.
// warns even though LLViewerJoint holds the only non virtual implementation. // warns even though LLViewerJoint holds the only non virtual implementation.
/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);} /*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) override { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);}
/*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area); /*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area) override;
/*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false); /*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false) override;
/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate); /*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate) override;
/*virtual*/ void updateJointGeometry(); /*virtual*/ void updateJointGeometry() override;
/*virtual*/ void dump(); /*virtual*/ void dump() override;
/*virtual*/ BOOL isAnimatable() const { return FALSE; } /*virtual*/ BOOL isAnimatable() const override { return FALSE; }
private: private:
......
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