diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/GHOST_Rect.h | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemPaths.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Window.h | 6 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QJacobianSolver.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QSegment.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QTask.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_Solver.cpp | 2 | ||||
-rw-r--r-- | intern/iksolver/intern/MT_ExpMap.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/cmat.h | 2 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/vec.h | 2 |
11 files changed, 18 insertions, 19 deletions
diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index e52d6a7e6a0..aa7969d68ad 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -70,8 +70,7 @@ public: /** * Destructor. */ - virtual ~GHOST_Rect() - {}; + virtual ~GHOST_Rect() {} /** * Access to rectangle width. diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h index 2baf0f6fa42..2c213752f94 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.h +++ b/intern/ghost/intern/GHOST_NDOFManager.h @@ -107,7 +107,7 @@ class GHOST_NDOFManager public: GHOST_NDOFManager(GHOST_System&); - virtual ~GHOST_NDOFManager() {}; + virtual ~GHOST_NDOFManager() {} // whether multi-axis functionality is available (via the OS or driver) // does not imply that a device is plugged in or being used diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h index 53cad347293..22879c71e1e 100644 --- a/intern/ghost/intern/GHOST_SystemPaths.h +++ b/intern/ghost/intern/GHOST_SystemPaths.h @@ -40,13 +40,13 @@ protected: * Constructor. * Protected default constructor to force use of static createSystem member. */ - GHOST_SystemPaths() {}; + GHOST_SystemPaths() {} /** * Destructor. * Protected default constructor to force use of static dispose member. */ - virtual ~GHOST_SystemPaths() {}; + virtual ~GHOST_SystemPaths() {} public: diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 3043b107aa1..fe21b91b991 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -192,14 +192,14 @@ public: */ virtual GHOST_TSuccess setProgressBar(float progress) { return GHOST_kFailure; - }; + } /** * Hides the progress bar in the icon */ virtual GHOST_TSuccess endProgressBar() { return GHOST_kFailure; - }; + } /** * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop @@ -284,7 +284,7 @@ protected: */ virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode) { return GHOST_kSuccess; - }; + } /** * Sets the cursor shape on the window using diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index ead2b150b40..646f952b9ff 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -53,12 +53,12 @@ class IK_QJacobianSolver { public: IK_QJacobianSolver(); - ~IK_QJacobianSolver() {}; + ~IK_QJacobianSolver() {} // setup pole vector constraint void SetPoleVectorConstraint(IK_QSegment *tip, MT_Vector3& goal, MT_Vector3& polegoal, float poleangle, bool getangle); - float GetPoleAngle() { return m_poleangle; }; + float GetPoleAngle() { return m_poleangle; } // call setup once before solving, if it fails don't solve bool Setup(IK_QSegment *root, std::list<IK_QTask*>& tasks); diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index 25a8fbc0804..b40bf3739ff 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -158,10 +158,10 @@ public: virtual void UpdateAngleApply()=0; // set joint limits - virtual void SetLimit(int, MT_Scalar, MT_Scalar) {}; + virtual void SetLimit(int, MT_Scalar, MT_Scalar) {} // set joint weights (per axis) - virtual void SetWeight(int, MT_Scalar) {}; + virtual void SetWeight(int, MT_Scalar) {} virtual void SetBasis(const MT_Matrix3x3& basis) { m_basis = basis; } diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h index 45b1e59e606..baf1c346d62 100644 --- a/intern/iksolver/intern/IK_QTask.h +++ b/intern/iksolver/intern/IK_QTask.h @@ -49,7 +49,7 @@ public: bool active, const IK_QSegment *segment ); - virtual ~IK_QTask() {}; + virtual ~IK_QTask() {} int Id() const { return m_size; } @@ -119,7 +119,7 @@ public: const MT_Matrix3x3& goal ); - MT_Scalar Distance() const { return m_distance; }; + MT_Scalar Distance() const { return m_distance; } void ComputeJacobian(IK_QJacobian& jacobian); private: diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index ef4ab1f2f91..c1a4ffcb1e8 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -43,7 +43,7 @@ using namespace std; class IK_QSolver { public: IK_QSolver() : root(NULL) { - }; + } IK_QJacobianSolver solver; IK_QSegment *root; diff --git a/intern/iksolver/intern/MT_ExpMap.h b/intern/iksolver/intern/MT_ExpMap.h index 9485428dc9f..65bbe4d4ad5 100644 --- a/intern/iksolver/intern/MT_ExpMap.h +++ b/intern/iksolver/intern/MT_ExpMap.h @@ -103,7 +103,7 @@ public: const MT_Quaternion &q ) { setRotation(q); - }; + } /** * Accessors @@ -118,7 +118,7 @@ public: vector( ) const { return m_v; - }; + } /** * Set the exponential map from a quaternion diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h index 146afdc79d7..fd3a1851262 100644 --- a/intern/iksolver/intern/TNT/cmat.h +++ b/intern/iksolver/intern/TNT/cmat.h @@ -182,7 +182,7 @@ class Matrix // constructors - Matrix() : m_(0), n_(0), mn_(0), v_(0), row_(0), vm1_(0), rowm1_(0) {}; + Matrix() : m_(0), n_(0), mn_(0), v_(0), row_(0), vm1_(0), rowm1_(0) {} Matrix(const Matrix<T> &A) { diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index ff1b5c0ea0e..5d4ef14bf73 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -164,7 +164,7 @@ class Vector // constructors - Vector() : v_(0), vm1_(0), n_(0) {}; + Vector() : v_(0), vm1_(0), n_(0) {} Vector(const Vector<T> &A) : v_(0), vm1_(0), n_(0) { |