From 00b235134cddc3212e449dff3153c94f523c78aa Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Wed, 5 Nov 2014 11:10:53 +0000 Subject: [PATCH] Alignment: To use default copy constructor in the constraints [Problem] Klocwork issues [Cause] Class defines a copy contructor, but not assignment operator [Solution] The default copy contructor has the same behaviour with the current defined ones So remove them and use the default one instead Change-Id: I0ff86d4b44d4ed07f2929b530359d83461712279 --- .../internal/controls/alignment/alignment-impl.cpp | 58 ---------------------- 1 file changed, 58 deletions(-) diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp index 095b278..48ae00e 100644 --- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp +++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp @@ -54,14 +54,6 @@ struct ScaleToFillConstraint {} /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - ScaleToFillConstraint( const ScaleToFillConstraint& rhs ) - : mPadding( rhs.mPadding ) - {} - - /** * Called by render thread */ Vector3 operator()( const Vector3& currentSize, @@ -100,16 +92,6 @@ struct ScaleToFitKeepAspectConstraint {} /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - ScaleToFitKeepAspectConstraint( const ScaleToFitKeepAspectConstraint& rhs ) - : mPadding( rhs.mPadding ), - mSizeStored( rhs.mSizeStored ), - mOriginalSize( rhs.mOriginalSize ) - {} - - /** * Called by render thread */ Vector3 operator()( const Vector3& currentSize, @@ -158,16 +140,6 @@ struct ScaleToFillKeepAspectConstraint { } /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - ScaleToFillKeepAspectConstraint( const ScaleToFillKeepAspectConstraint& rhs ) - : mPadding( rhs.mPadding ), - mSizeStored( rhs.mSizeStored ), - mOriginalSize( rhs.mOriginalSize ) - {} - - /** * Called by render thread */ Vector3 operator()( const Vector3& currentSize, @@ -216,16 +188,6 @@ struct ShrinkToFitConstraint {} /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - ShrinkToFitConstraint( const ShrinkToFitConstraint& rhs ) - : mPadding( rhs.mPadding ), - mSizeStored( rhs.mSizeStored ), - mOriginalSize( rhs.mOriginalSize ) - { } - - /** * Called by render thread */ Vector3 operator()( const Vector3& currentSize, @@ -277,16 +239,6 @@ struct ShrinkToFitKeepAspectConstraint {} /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - ShrinkToFitKeepAspectConstraint( const ShrinkToFitKeepAspectConstraint& rhs ) - : mPadding( rhs.mPadding ), - mSizeStored( rhs.mSizeStored ), - mOriginalSize( rhs.mOriginalSize ) - { } - - /** * Called by render thread */ Vector3 operator()( const Vector3& currentSize, @@ -340,16 +292,6 @@ struct PositionConstraint {} /** - * CopyConstructor. Used by Boost. - * @param rhs Copying from. - */ - PositionConstraint( const PositionConstraint& rhs ) - : mPadding( rhs.mPadding ), - mHorizontalAlignment( rhs.mHorizontalAlignment ), - mVerticalAlignment( rhs.mVerticalAlignment ) - {} - - /** * Called by render thread. */ Vector3 operator()( const Vector3& currentPosition, -- 2.7.4