Skip to content

Commit 7a0b6cf

Browse files
Nicky-Drohvani
Nicky-D
authored and
rohvani
committed
Remove 'virtual' comment and replace it with override.
This uncovered some methods that used to override base methods which are long gone. Those have been deleted.
1 parent 0f90b56 commit 7a0b6cf

11 files changed

+66
-70
lines changed

‎indra/llappearanceutility/llappappearanceutility.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class LLProcessUsage : public LLBakingProcess
137137
public:
138138
LLProcessUsage(LLAppAppearanceUtility* app) :
139139
LLBakingProcess(app) {}
140-
/*virtual*/ void process(std::ostream& output)
140+
void process(std::ostream& output) override
141141
{
142142
mApp->usage(output);
143143
}

‎indra/llappearanceutility/llappappearanceutility.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class LLAppAppearanceUtility : public LLApp
7171
virtual ~LLAppAppearanceUtility();
7272

7373
// LLApp interface.
74-
/*virtual*/ bool init();
75-
/*virtual*/ bool cleanup();
76-
/*virtual*/ bool frame();
74+
bool init() override;
75+
bool cleanup() override;
76+
bool frame() override;
7777

7878
private:
7979
// Option parsing.

‎indra/llappearanceutility/llbakingavatar.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void LLBakingAvatar::bakedTextureDatasAsLLSD(LLSD& sd) const
9191
// (Ignored) Non-implemented methods.
9292
//-----------------------------------------------------------------------------
9393

94-
void LLBakingAvatar::bodySizeChanged() {}
9594
void LLBakingAvatar::applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components,
9695
LLAvatarAppearanceDefines::EBakedTextureIndex index) {}
9796
void LLBakingAvatar::invalidateComposite(LLTexLayerSet* layerset) {}

‎indra/llappearanceutility/llbakingavatar.h

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,41 @@ class LLBakingAvatar : public LLAvatarAppearance
6666
// LLCharacter interface
6767
//--------------------------------------------------------------------
6868
public:
69-
/*virtual*/ LLVector3 getCharacterPosition();
70-
/*virtual*/ LLQuaternion getCharacterRotation();
71-
/*virtual*/ LLVector3 getCharacterVelocity();
72-
/*virtual*/ LLVector3 getCharacterAngularVelocity();
73-
74-
/*virtual*/ const LLUUID& getID() const;
75-
/*virtual*/ void addDebugText(const std::string& text);
76-
/*virtual*/ F32 getTimeDilation();
77-
/*virtual*/ void getGround(const LLVector3 &inPos, LLVector3 &outPos, LLVector3 &outNorm);
78-
/*virtual*/ F32 getPixelArea() const;
79-
/*virtual*/ LLVector3d getPosGlobalFromAgent(const LLVector3 &position);
80-
/*virtual*/ LLVector3 getPosAgentFromGlobal(const LLVector3d &position);
69+
LLVector3 getCharacterPosition() override;
70+
LLQuaternion getCharacterRotation() override;
71+
LLVector3 getCharacterVelocity() override;
72+
LLVector3 getCharacterAngularVelocity() override;
73+
74+
const LLUUID& getID() const override;
75+
void addDebugText(const std::string& text) override;
76+
F32 getTimeDilation() override;
77+
void getGround(const LLVector3 &inPos, LLVector3 &outPos, LLVector3 &outNorm) override;
78+
F32 getPixelArea() const override;
79+
LLVector3d getPosGlobalFromAgent(const LLVector3 &position) override;
80+
LLVector3 getPosAgentFromGlobal(const LLVector3d &position) override;
8181

8282
//--------------------------------------------------------------------
8383
// LLAvatarAppearance interface
8484
//--------------------------------------------------------------------
8585
public:
86-
/*virtual*/ void bodySizeChanged();
87-
/*virtual*/ void applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components,
88-
LLAvatarAppearanceDefines::EBakedTextureIndex index);
89-
/*virtual*/ void invalidateComposite(LLTexLayerSet* layerset);
90-
/*virtual*/ void updateMeshTextures();
91-
/*virtual*/ void dirtyMesh(); // Dirty the avatar mesh
92-
/*virtual*/ void onGlobalColorChanged(const LLTexGlobalColor* global_color);
93-
/*virtual*/ bool isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index = 0) const;
94-
/*virtual*/ bool isUsingLocalAppearance() const { return FALSE; }
95-
/*virtual*/ bool isUsingServerBakes() const { return FALSE; }
96-
/*virtual*/ bool isEditingAppearance() const { return FALSE; }
86+
void applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components,
87+
LLAvatarAppearanceDefines::EBakedTextureIndex index) override;
88+
void invalidateComposite(LLTexLayerSet* layerset) override;
89+
void updateMeshTextures() override;
90+
void dirtyMesh() override; // Dirty the avatar mesh
91+
void onGlobalColorChanged(const LLTexGlobalColor* global_color) override;
92+
bool isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index = 0) const override;
93+
bool isUsingLocalAppearance() const override { return FALSE; }
94+
bool isEditingAppearance() const override { return FALSE; }
9795
private:
98-
/*virtual*/ void dirtyMesh(S32 priority); // Dirty the avatar mesh, with priority
96+
void dirtyMesh(S32 priority) override; // Dirty the avatar mesh, with priority
9997

10098
// LLAvatarAppearance instance factories:
10199
protected:
102-
/*virtual*/ LLAvatarJoint* createAvatarJoint();
103-
/*virtual*/ LLAvatarJoint* createAvatarJoint(S32 joint_num);
104-
/*virtual*/ LLAvatarJointMesh* createAvatarJointMesh();
105-
/*virtual*/ LLTexLayerSet* createTexLayerSet();
100+
LLAvatarJoint* createAvatarJoint() override;
101+
LLAvatarJoint* createAvatarJoint(S32 joint_num) override;
102+
LLAvatarJointMesh* createAvatarJointMesh() override;
103+
LLTexLayerSet* createTexLayerSet() override;
106104

107105

108106
/** Inherited
@@ -114,9 +112,8 @@ class LLBakingAvatar : public LLAvatarAppearance
114112
** STATE
115113
**/
116114
public:
117-
/*virtual*/ bool isSelf() const { return true; }
118-
/*virtual*/ bool isValid() const { return TRUE; }
119-
/*virtual*/ bool isUsingBakedTextures() const { return TRUE; }
115+
bool isSelf() const override { return true; }
116+
bool isValid() const override { return TRUE; }
120117

121118
/** State
122119
** **

‎indra/llappearanceutility/llbakingshadermgr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class LLBakingShaderMgr: public LLShaderMgr
3636
static bool sSkipReload;
3737

3838
LLBakingShaderMgr();
39-
/* virtual */ ~LLBakingShaderMgr();
39+
~LLBakingShaderMgr();
4040

4141
// singleton pattern implementation
4242
static LLBakingShaderMgr * instance();
@@ -111,9 +111,9 @@ class LLBakingShaderMgr: public LLShaderMgr
111111
shader_iter beginShaders() const;
112112
shader_iter endShaders() const;
113113

114-
/* virtual */ std::string getShaderDirPrefix(void);
114+
std::string getShaderDirPrefix(void) override;
115115

116-
/* virtual */ void updateShaderUniforms(LLGLSLShader * shader);
116+
void updateShaderUniforms(LLGLSLShader * shader) override;
117117

118118
private:
119119

‎indra/llappearanceutility/llbakingtexlayer.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class LLBakingTexLayerSetBuffer : public LLTexLayerSetBuffer, public LLBakingTex
4444
LLImageJ2C* getCompressedImage() { return mCompressedImage; }
4545

4646
bool render();
47-
/*virtual*/ bool bindDebugImage(const S32 stage = 0) { return false; }
48-
/*virtual*/ bool isActiveFetching() { return false; };
47+
bool bindDebugImage(const S32 stage = 0) override { return false; }
48+
bool isActiveFetching() override { return false; };
4949

5050
private:
51-
/*virtual*/ S32 getCompositeOriginX() const { return 0; }
52-
/*virtual*/ S32 getCompositeOriginY() const { return 0; }
53-
/*virtual*/ S32 getCompositeWidth() const { return getFullWidth(); }
54-
/*virtual*/ S32 getCompositeHeight() const { return getFullHeight(); }
55-
/*virtual*/ void midRenderTexLayerSet(bool success);
51+
S32 getCompositeOriginX() const override { return 0; }
52+
S32 getCompositeOriginY() const override { return 0; }
53+
S32 getCompositeWidth() const override { return getFullWidth(); }
54+
S32 getCompositeHeight() const override { return getFullHeight(); }
55+
void midRenderTexLayerSet(bool success) override;
5656

5757
LLPointer<LLImageJ2C> mCompressedImage;
5858
};
@@ -69,8 +69,8 @@ class LLBakingTexLayerSet : public LLTexLayerSet
6969
const layer_list_t& layer_list,
7070
bool& is_visible) const;
7171

72-
/*virtual*/void requestUpdate();
73-
/*virtual*/void createComposite();
72+
void requestUpdate() override;
73+
void createComposite() override;
7474
};
7575

7676
#endif /* LL_LLBAKINGTEXLAYER_H */

‎indra/llappearanceutility/llbakingtexture.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ class LLBakingTexture : public LLGLTexture
4444
LLBakingTexture(const LLUUID& id, const LLImageRaw* raw);
4545
LLBakingTexture(bool usemipmaps);
4646
LLBakingTexture(const U32 width, const U32 height, const U8 components, bool usemipmaps = TRUE);
47-
/*virtual*/ const LLUUID& getID() const { return mID; }
47+
const LLUUID& getID() const override { return mID; }
4848
virtual S8 getType() const { return BAKING_TEXTURE; }
4949

5050
// Not implemented.
51-
/*virtual*/ void setKnownDrawSize(S32 width, S32 height);
52-
/*virtual*/ bool bindDefaultImage(const S32 stage = 0) ;
53-
/*virtual*/ void forceImmediateUpdate();
54-
/*virtual*/ void updateBindStatsForTester() ;
55-
/*virtual*/ bool bindDebugImage(const S32 stage = 0) { return false; }
56-
/*virtual*/ bool isActiveFetching() { return false; }
51+
void setKnownDrawSize(S32 width, S32 height) override;
52+
bool bindDefaultImage(const S32 stage = 0) override ;
53+
void forceImmediateUpdate() override;
54+
void updateBindStatsForTester() override ;
55+
bool bindDebugImage(const S32 stage = 0) override { return false; }
56+
bool isActiveFetching() override { return false; }
5757

5858
protected:
5959
virtual ~LLBakingTexture();

‎indra/llappearanceutility/llprocessparams.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ using namespace LLAvatarAppearanceDefines;
5858
class LLNullTextureManagerBridge : public LLTextureManagerBridge
5959
{
6060
public:
61-
/*virtual*/ LLPointer<LLGLTexture> getLocalTexture(bool usemipmaps = TRUE, bool generate_gl_tex = TRUE)
61+
LLPointer<LLGLTexture> getLocalTexture(bool usemipmaps = TRUE, bool generate_gl_tex = TRUE) override
6262
{
63-
return NULL;
63+
return nullptr;
6464
}
6565

66-
/*virtual*/ LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, bool usemipmaps, bool generate_gl_tex = TRUE)
66+
LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, bool usemipmaps, bool generate_gl_tex = TRUE) override
6767
{
68-
return NULL;
68+
return nullptr;
6969
}
7070

71-
/*virtual*/ LLGLTexture* getFetchedTexture(const LLUUID &image_id)
71+
LLGLTexture* getFetchedTexture(const LLUUID &image_id) override
7272
{
73-
return NULL;
73+
return nullptr;
7474
}
7575
};
7676

‎indra/llappearanceutility/llprocessparams.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class LLProcessParams : public LLBakingProcess
3636
LLProcessParams(LLAppAppearanceUtility* app) :
3737
LLBakingProcess(app) {}
3838

39-
/*virtual*/ void process(std::ostream& output);
39+
void process(std::ostream& output) override;
4040
private:
4141

4242
bool processInputDataForJointInfo( LLBakingAvatar& avatar );

‎indra/llappearanceutility/llprocessskin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class LLProcessSkin : public LLBakingProcess
3333
public:
3434
LLProcessSkin(LLAppAppearanceUtility* app) :
3535
LLBakingProcess(app) {}
36-
/*virtual*/ void process(std::ostream& output);
36+
void process(std::ostream& output) override;
3737

3838
private:
3939

0 commit comments

Comments
 (0)