Use qSwap instead of std::swap so platforms without STL still compile

Andy Shaw · Andy Shaw · commit c0b2c4e88eda · 2015-03-20T10:24:17.000Z
Change-Id: Ieee4c1e795b13b3c2fd26d05c5655b4b596bd061
Reviewed-by: Laszlo Agocs &lt;laszlo.agocs@theqtcompany.com&gt;
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
@@ -4781,7 +4781,7 @@ template<class T> inline void do_mirror_data(QImageData *dst, QImageData *src,
             T *srcPtr = (T *) (src->data + srcY * src->bytes_per_line);
             T *dstPtr = (T *) (dst->data + dstY * dst->bytes_per_line);
             for (int srcX = 0, dstX = dstX0; srcX < srcXEnd; ++srcX, dstX += dstXIncr)
-                std::swap(srcPtr[srcX], dstPtr[dstX]);
+                qSwap(srcPtr[srcX], dstPtr[dstX]);
         }
     } else {
         for (int srcY = 0, dstY = dstY0; srcY < h; ++srcY, dstY += dstYIncr) {

Original file line number	Diff line number	Diff line change
`@@ -4781,7 +4781,7 @@ template<class T> inline void do_mirror_data(QImageData dst, QImageData src,`
`4781`	`4781`	`T srcPtr = (T ) (src->data + srcY * src->bytes_per_line);`
`4782`	`4782`	`T dstPtr = (T ) (dst->data + dstY * dst->bytes_per_line);`
`4783`	`4783`	`for (int srcX = 0, dstX = dstX0; srcX < srcXEnd; ++srcX, dstX += dstXIncr)`
`4784`		`- std::swap(srcPtr[srcX], dstPtr[dstX]);`
	`4784`	`+ qSwap(srcPtr[srcX], dstPtr[dstX]);`
`4785`	`4785`	`}`
`4786`	`4786`	`} else {`
`4787`	`4787`	`for (int srcY = 0, dstY = dstY0; srcY < h; ++srcY, dstY += dstYIncr) {`