From 3ee2d860c3abb0c9ed7314b4396551bfad95a8a3 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:53:24 -0400
Subject: [PATCH] Default empty destructors in llcharacter
---
indra/llcharacter/llanimationstates.cpp | 7 -------
indra/llcharacter/llanimationstates.h | 2 +-
indra/llcharacter/lleditingmotion.cpp | 8 --------
indra/llcharacter/lleditingmotion.h | 2 +-
indra/llcharacter/llheadrotmotion.cpp | 16 ----------------
indra/llcharacter/llheadrotmotion.h | 4 ++--
indra/llcharacter/lljointsolverrp3.cpp | 8 --------
indra/llcharacter/lljointsolverrp3.h | 2 +-
indra/llcharacter/lljointstate.h | 4 +---
indra/llcharacter/llkeyframefallmotion.cpp | 9 ---------
indra/llcharacter/llkeyframefallmotion.h | 2 +-
indra/llcharacter/llkeyframestandmotion.cpp | 9 ---------
indra/llcharacter/llkeyframestandmotion.h | 2 +-
indra/llcharacter/llkeyframewalkmotion.cpp | 8 --------
indra/llcharacter/llkeyframewalkmotion.h | 2 +-
indra/llcharacter/llmotion.cpp | 8 --------
indra/llcharacter/llmotion.h | 6 +++---
indra/llcharacter/llmultigesture.cpp | 12 ------------
indra/llcharacter/llmultigesture.h | 12 ++++++------
indra/llcharacter/llpose.cpp | 7 -------
indra/llcharacter/llpose.h | 2 +-
indra/llcharacter/llstatemachine.cpp | 10 ----------
indra/llcharacter/llstatemachine.h | 4 ++--
indra/llcharacter/lltargetingmotion.cpp | 8 --------
indra/llcharacter/lltargetingmotion.h | 2 +-
indra/llcharacter/llvisualparam.h | 2 +-
26 files changed, 23 insertions(+), 135 deletions(-)
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
index ba771c92d96..2465cbb52c5 100644
--- a/indra/llcharacter/llanimationstates.cpp
+++ b/indra/llcharacter/llanimationstates.cpp
@@ -339,13 +339,6 @@ LLAnimationLibrary::LLAnimationLibrary() :
mAnimMap[ANIM_AGENT_YOGA_FLOAT]= mAnimStringTable.addString("yoga_float");
}
-//-----------------------------------------------------------------------------
-// ~LLAnimationLibrary()
-//-----------------------------------------------------------------------------
-LLAnimationLibrary::~LLAnimationLibrary()
-{
-}
-
//-----------------------------------------------------------------------------
// Return the text name of an animation state
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llanimationstates.h b/indra/llcharacter/llanimationstates.h
index 7a999e86ade..244f811bf52 100644
--- a/indra/llcharacter/llanimationstates.h
+++ b/indra/llcharacter/llanimationstates.h
@@ -209,7 +209,7 @@ class LLAnimationLibrary
public:
LLAnimationLibrary();
- ~LLAnimationLibrary();
+ ~LLAnimationLibrary() = default;
//-----------------------------------------------------------------------------
// Return the text name of a single animation state,
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index ddf89f30f22..c65a4bbfc87 100644
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -66,14 +66,6 @@ LLEditingMotion::LLEditingMotion( const LLUUID &id) : LLMotion(id)
}
-//-----------------------------------------------------------------------------
-// ~LLEditingMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLEditingMotion::~LLEditingMotion()
-{
-}
-
//-----------------------------------------------------------------------------
// LLEditingMotion::onInitialize(LLCharacter *character)
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
index b11398ae78e..418eca7d2b0 100644
--- a/indra/llcharacter/lleditingmotion.h
+++ b/indra/llcharacter/lleditingmotion.h
@@ -50,7 +50,7 @@ class LLEditingMotion final :
LLEditingMotion(const LLUUID &id);
// Destructor
- virtual ~LLEditingMotion();
+ virtual ~LLEditingMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
index 9554664ca18..6d5d2fef65e 100644
--- a/indra/llcharacter/llheadrotmotion.cpp
+++ b/indra/llcharacter/llheadrotmotion.cpp
@@ -81,14 +81,6 @@ LLHeadRotMotion::LLHeadRotMotion(const LLUUID &id) :
}
-//-----------------------------------------------------------------------------
-// ~LLHeadRotMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLHeadRotMotion::~LLHeadRotMotion()
-{
-}
-
//-----------------------------------------------------------------------------
// LLHeadRotMotion::onInitialize(LLCharacter *character)
//-----------------------------------------------------------------------------
@@ -292,14 +284,6 @@ LLEyeMotion::LLEyeMotion(const LLUUID &id) : LLMotion(id)
}
-//-----------------------------------------------------------------------------
-// ~LLEyeMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLEyeMotion::~LLEyeMotion()
-{
-}
-
//-----------------------------------------------------------------------------
// LLEyeMotion::onInitialize(LLCharacter *character)
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
index 66612f84646..d72e9fc420e 100644
--- a/indra/llcharacter/llheadrotmotion.h
+++ b/indra/llcharacter/llheadrotmotion.h
@@ -47,7 +47,7 @@ class LLHeadRotMotion final :
LLHeadRotMotion(const LLUUID &id);
// Destructor
- virtual ~LLHeadRotMotion();
+ virtual ~LLHeadRotMotion() = default;
public:
//-------------------------------------------------------------------------
@@ -130,7 +130,7 @@ class LLEyeMotion :
LLEyeMotion(const LLUUID &id);
// Destructor
- virtual ~LLEyeMotion();
+ virtual ~LLEyeMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/lljointsolverrp3.cpp b/indra/llcharacter/lljointsolverrp3.cpp
index 69a7e3dc6e7..87990863450 100644
--- a/indra/llcharacter/lljointsolverrp3.cpp
+++ b/indra/llcharacter/lljointsolverrp3.cpp
@@ -54,14 +54,6 @@ LLJointSolverRP3::LLJointSolverRP3()
}
-//-----------------------------------------------------------------------------
-// Destructor
-//-----------------------------------------------------------------------------
-/*virtual*/ LLJointSolverRP3::~LLJointSolverRP3()
-{
-}
-
-
//-----------------------------------------------------------------------------
// setupJoints()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/lljointsolverrp3.h b/indra/llcharacter/lljointsolverrp3.h
index 88b5d087104..04a8d6bed92 100644
--- a/indra/llcharacter/lljointsolverrp3.h
+++ b/indra/llcharacter/lljointsolverrp3.h
@@ -113,7 +113,7 @@ class LLJointSolverRP3
// Constructor/Destructor
//-------------------------------------------------------------------------
LLJointSolverRP3();
- virtual ~LLJointSolverRP3();
+ virtual ~LLJointSolverRP3() = default;
//-------------------------------------------------------------------------
// setupJoints()
diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h
index 1ccc6b50937..ae2eed1109d 100644
--- a/indra/llcharacter/lljointstate.h
+++ b/indra/llcharacter/lljointstate.h
@@ -114,9 +114,7 @@ class LLJointState : public LLRefCount
protected:
// Destructor
- virtual ~LLJointState()
- {
- }
+ virtual ~LLJointState() = default;
};
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
index 60ab2e99296..eb74eee65fd 100644
--- a/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/indra/llcharacter/llkeyframefallmotion.cpp
@@ -50,15 +50,6 @@ LLKeyframeFallMotion::LLKeyframeFallMotion(const LLUUID &id) : LLKeyframeMotion(
}
-//-----------------------------------------------------------------------------
-// ~LLKeyframeFallMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLKeyframeFallMotion::~LLKeyframeFallMotion()
-{
-}
-
-
//-----------------------------------------------------------------------------
// LLKeyframeFallMotion::onInitialize()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframefallmotion.h b/indra/llcharacter/llkeyframefallmotion.h
index cd67475be27..9814ed8630f 100644
--- a/indra/llcharacter/llkeyframefallmotion.h
+++ b/indra/llcharacter/llkeyframefallmotion.h
@@ -44,7 +44,7 @@ class LLKeyframeFallMotion final :
LLKeyframeFallMotion(const LLUUID &id);
// Destructor
- virtual ~LLKeyframeFallMotion();
+ virtual ~LLKeyframeFallMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
index 02c1d3cdbd7..ddccdf98124 100644
--- a/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/indra/llcharacter/llkeyframestandmotion.cpp
@@ -73,15 +73,6 @@ LLKeyframeStandMotion::LLKeyframeStandMotion(const LLUUID &id) : LLKeyframeMotio
}
-//-----------------------------------------------------------------------------
-// ~LLKeyframeStandMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLKeyframeStandMotion::~LLKeyframeStandMotion()
-{
-}
-
-
//-----------------------------------------------------------------------------
// LLKeyframeStandMotion::onInitialize()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframestandmotion.h b/indra/llcharacter/llkeyframestandmotion.h
index e0d0fab17ab..7f516b94272 100644
--- a/indra/llcharacter/llkeyframestandmotion.h
+++ b/indra/llcharacter/llkeyframestandmotion.h
@@ -45,7 +45,7 @@ class LLKeyframeStandMotion final :
LLKeyframeStandMotion(const LLUUID &id);
// Destructor
- virtual ~LLKeyframeStandMotion();
+ virtual ~LLKeyframeStandMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index f180702385c..95f314577de 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -62,14 +62,6 @@ LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id)
{}
-//-----------------------------------------------------------------------------
-// ~LLKeyframeWalkMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLKeyframeWalkMotion::~LLKeyframeWalkMotion()
-{}
-
-
//-----------------------------------------------------------------------------
// LLKeyframeWalkMotion::onInitialize()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h
index 99004814004..9117b97d8a3 100644
--- a/indra/llcharacter/llkeyframewalkmotion.h
+++ b/indra/llcharacter/llkeyframewalkmotion.h
@@ -49,7 +49,7 @@ class LLKeyframeWalkMotion final :
LLKeyframeWalkMotion(const LLUUID &id);
// Destructor
- virtual ~LLKeyframeWalkMotion();
+ virtual ~LLKeyframeWalkMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index 697efc8157f..b28e66d22c8 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -58,14 +58,6 @@ LLMotion::LLMotion( const LLUUID &id ) :
memset(&mJointSignature[i][0], 0, sizeof(U8) * LL_CHARACTER_MAX_ANIMATED_JOINTS);
}
-//-----------------------------------------------------------------------------
-// ~LLMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLMotion::~LLMotion()
-{
-}
-
//-----------------------------------------------------------------------------
// fadeOut()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index 4efc6c6990d..459649be679 100644
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -63,7 +63,7 @@ class LLMotion
LLMotion(const LLUUID &id);
// Destructor
- virtual ~LLMotion();
+ virtual ~LLMotion() = default;
public:
//-------------------------------------------------------------------------
@@ -194,7 +194,7 @@ class LLTestMotion final : public LLMotion
{
public:
LLTestMotion(const LLUUID &id) : LLMotion(id){}
- ~LLTestMotion() {}
+ ~LLTestMotion() = default;
static LLMotion *create(const LLUUID& id) { return new LLTestMotion(id); }
BOOL getLoop() { return FALSE; }
F32 getDuration() { return 0.0f; }
@@ -218,7 +218,7 @@ class LLNullMotion final : public LLMotion
{
public:
LLNullMotion(const LLUUID &id) : LLMotion(id) {}
- ~LLNullMotion() {}
+ ~LLNullMotion() = default;
static LLMotion *create(const LLUUID &id) { return new LLNullMotion(id); }
// motions must specify whether or not they loop
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 2045739c7f1..f5afd3cee6e 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -244,9 +244,6 @@ LLGestureStepAnimation::LLGestureStepAnimation()
mFlags(0x0)
{ }
-LLGestureStepAnimation::~LLGestureStepAnimation()
-{ }
-
S32 LLGestureStepAnimation::getMaxSerialSize() const
{
S32 max_size = 0;
@@ -329,9 +326,6 @@ LLGestureStepSound::LLGestureStepSound()
mFlags(0x0)
{ }
-LLGestureStepSound::~LLGestureStepSound()
-{ }
-
S32 LLGestureStepSound::getMaxSerialSize() const
{
S32 max_size = 0;
@@ -391,9 +385,6 @@ LLGestureStepChat::LLGestureStepChat()
mFlags(0x0)
{ }
-LLGestureStepChat::~LLGestureStepChat()
-{ }
-
S32 LLGestureStepChat::getMaxSerialSize() const
{
S32 max_size = 0;
@@ -446,9 +437,6 @@ LLGestureStepWait::LLGestureStepWait()
mFlags(0x0)
{ }
-LLGestureStepWait::~LLGestureStepWait()
-{ }
-
S32 LLGestureStepWait::getMaxSerialSize() const
{
S32 max_size = 0;
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index 92820159d45..955f630930e 100644
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -120,8 +120,8 @@ enum EStepType
class LLGestureStep
{
public:
- LLGestureStep() {}
- virtual ~LLGestureStep() {}
+ LLGestureStep() = default;
+ virtual ~LLGestureStep() = default;
virtual EStepType getType() = 0;
@@ -144,7 +144,7 @@ class LLGestureStepAnimation : public LLGestureStep
{
public:
LLGestureStepAnimation();
- virtual ~LLGestureStepAnimation();
+ virtual ~LLGestureStepAnimation() = default;
virtual EStepType getType() { return STEP_ANIMATION; }
@@ -167,7 +167,7 @@ class LLGestureStepSound : public LLGestureStep
{
public:
LLGestureStepSound();
- virtual ~LLGestureStepSound();
+ virtual ~LLGestureStepSound() = default;
virtual EStepType getType() { return STEP_SOUND; }
@@ -190,7 +190,7 @@ class LLGestureStepChat : public LLGestureStep
{
public:
LLGestureStepChat();
- virtual ~LLGestureStepChat();
+ virtual ~LLGestureStepChat() = default;
virtual EStepType getType() { return STEP_CHAT; }
@@ -215,7 +215,7 @@ class LLGestureStepWait : public LLGestureStep
{
public:
LLGestureStepWait();
- virtual ~LLGestureStepWait();
+ virtual ~LLGestureStepWait() = default;
virtual EStepType getType() { return STEP_WAIT; }
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index e08176c08b7..afc06254075 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -39,13 +39,6 @@
// Static
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// LLPose
-//-----------------------------------------------------------------------------
-LLPose::~LLPose()
-{
-}
-
//-----------------------------------------------------------------------------
// getFirstJointState()
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index fdb7158a5eb..ba23ad489f5 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -65,7 +65,7 @@ class LLPose
// Constructor
LLPose() : mWeight(0.f) {}
// Destructor
- ~LLPose();
+ ~LLPose() = default;
// add a joint state in this pose
BOOL addJointState(const LLPointer<LLJointState>& jointState);
// remove a joint state from this pose
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index b917db31172..c4906ac7607 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -52,11 +52,6 @@ LLStateDiagram::LLStateDiagram()
mUseDefaultState = FALSE;
}
-LLStateDiagram::~LLStateDiagram()
-{
-
-}
-
// add a state to the state graph
BOOL LLStateDiagram::addState(LLFSMState *state)
{
@@ -304,11 +299,6 @@ LLStateMachine::LLStateMachine()
mStateDiagram = NULL;
}
-LLStateMachine::~LLStateMachine()
-{
-
-}
-
// returns current state
LLFSMState* LLStateMachine::getCurrentState() const
{
diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h
index ebfdbc462b8..65382579b8a 100644
--- a/indra/llcharacter/llstatemachine.h
+++ b/indra/llcharacter/llstatemachine.h
@@ -78,7 +78,7 @@ friend class LLStateMachine;
public:
LLStateDiagram();
- virtual ~LLStateDiagram();
+ virtual ~LLStateDiagram() = default;
protected:
// add a state to the state graph, executed implicitly when adding transitions
@@ -123,7 +123,7 @@ class LLStateMachine
public:
LLStateMachine();
- virtual ~LLStateMachine();
+ virtual ~LLStateMachine() = default;
// set state diagram
void setStateDiagram(LLStateDiagram* diagram);
diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp
index 69681e41970..e7331a68386 100644
--- a/indra/llcharacter/lltargetingmotion.cpp
+++ b/indra/llcharacter/lltargetingmotion.cpp
@@ -52,14 +52,6 @@ LLTargetingMotion::LLTargetingMotion(const LLUUID &id) : LLMotion(id)
}
-//-----------------------------------------------------------------------------
-// ~LLTargetingMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLTargetingMotion::~LLTargetingMotion()
-{
-}
-
//-----------------------------------------------------------------------------
// LLTargetingMotion::onInitialize(LLCharacter *character)
//-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h
index accc5a41356..0e45c0980d4 100644
--- a/indra/llcharacter/lltargetingmotion.h
+++ b/indra/llcharacter/lltargetingmotion.h
@@ -49,7 +49,7 @@ class LLTargetingMotion final :
LLTargetingMotion(const LLUUID &id);
// Destructor
- virtual ~LLTargetingMotion();
+ virtual ~LLTargetingMotion() = default;
public:
//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index 875cb2c350f..66654b36042 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -72,7 +72,7 @@ class LLVisualParamInfo
friend class LLVisualParam;
public:
LLVisualParamInfo();
- virtual ~LLVisualParamInfo() {};
+ virtual ~LLVisualParamInfo() = default;
virtual BOOL parseXml(LLXmlTreeNode *node);
--
GitLab