1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QEasingCurve: implement copy assignment operator inline

Browse Source 
Implement the copy-assignment operator inline, using the
copy-swap idiom. This makes assignment strongly exception
safe, but also simplifies maintainence, because op= is
formulated in terms of the copy constructor now.

Change-Id: I803c9100a520d659b685992237cb76fd114222c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2012-02-19 20:55:09 +01:00 committed by Qt by Nokia
parent 4fc6bc4804
commit ca588f40db
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/tools/qeasingcurve.cpp
View File

@ -1100,22 +1100,9 @@ QEasingCurve::~QEasingCurve()
}
/*!
\fn QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other)
Copy \a other.
*/
QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other)
{
// ### non-atomic, requires malloc on shallow copy
if (d_ptr->config) {
delete d_ptr->config;
d_ptr->config = 0;
}
*d_ptr = *other.d_ptr;
if (other.d_ptr->config)
d_ptr->config = other.d_ptr->config->copy();
return *this;
}
/*!
\fn void QEasingCurve::swap(QEasingCurve &other)

3
src/corelib/tools/qeasingcurve.h
View File

@ -82,7 +82,8 @@ public:
QEasingCurve(const QEasingCurve &other);
~QEasingCurve();
QEasingCurve &operator=(const QEasingCurve &other);
QEasingCurve &operator=(const QEasingCurve &other)
{ if ( this != &other ) { QEasingCurve copy(other); swap(copy); } return *this; }
#ifdef Q_COMPILER_RVALUE_REFS
QEasingCurve(QEasingCurve &&other) : d_ptr(other.d_ptr) { other.d_ptr = 0; }
QEasingCurve &operator=(QEasingCurve &&other)