summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-05-07 20:19:40 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-06 16:08:02 +0200
commit7d63fa6edcbe706bf0eab2c7e24efa1ed8940e6d (patch)
treed70ab41cbfb283b8f8ff6444dd8454d581791f81 /src/gui/image/qpixmap.cpp
parent8f2c57ddb2842c0983a36bca44c1810d58cbc370 (diff)
QtGui: replace some copies with swaps
This provides move speed even for non-C++11 compilers and avoids having to call the copy assignment operator from within copy ctors. (which will result in infinite recursion when using the copy-swap idiom). Change-Id: I379bc8bf2c72d9f986c0f17f9eef56cd592e7a06 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
-rw-r--r--src/gui/image/qpixmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 183c13698a..c1a63f5101 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -226,7 +226,7 @@ QPixmap::QPixmap(const QPixmap &pixmap)
return;
}
if (pixmap.paintingActive()) { // make a deep copy
- operator=(pixmap.copy());
+ pixmap.copy().swap(*this);
} else {
data = pixmap.data;
}
@@ -384,7 +384,7 @@ QPixmap &QPixmap::operator=(const QPixmap &pixmap)
return *this;
}
if (pixmap.paintingActive()) { // make a deep copy
- *this = pixmap.copy();
+ pixmap.copy().swap(*this);
} else {
data = pixmap.data;
}