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

QPalette: fix function swap and move operator

Browse Source 
Additional data should also be taken into account when using move
operator and function swap. This is already implemented for move
constructor.

Task-number: QTBUG-78544
Change-Id: I24ba34b0957a8fba7e15a934f2d08222dc95650f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Vitaly Fanaskov 2020-01-16 17:21:15 +01:00
parent 983432effd
commit 63b0b857f3
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/kernel/qpalette.h
View File

@ -72,11 +72,12 @@ public:
{ other.d = nullptr; } { other.d = nullptr; }
inline QPalette &operator=(QPalette &&other) noexcept inline QPalette &operator=(QPalette &&other) noexcept
{ {
qSwap(d, other.d); return *this; swap(other); return *this;
} }
void swap(QPalette &other) noexcept void swap(QPalette &other) noexcept
{ {
qSwap(data, other.data);
qSwap(d, other.d); qSwap(d, other.d);
} }

26
tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
View File

@ -124,23 +124,35 @@ void tst_QPalette::resolve()
QVERIFY(p2ResolvedTo1 != p2); QVERIFY(p2ResolvedTo1 != p2);
} }
static void compareAllPaletteData(const QPalette &firstPalette, const QPalette &secondPalette)
{
QCOMPARE(firstPalette, secondPalette);
// For historical reasons, operator== compares only brushes, but it's not enough for proper
// comparison after move/copy, because some additional data can also be moved/copied.
// Let's compare this data here.
QCOMPARE(firstPalette.resolve(), secondPalette.resolve());
QCOMPARE(firstPalette.currentColorGroup(), secondPalette.currentColorGroup());
}
void tst_QPalette::copySemantics() void tst_QPalette::copySemantics()
{ {
QPalette src(Qt::red), dst; QPalette src(Qt::red), dst;
const QPalette control = src; // copy construction const QPalette control = src; // copy construction
QVERIFY(src != dst); QVERIFY(src != dst);
QVERIFY(!src.isCopyOf(dst)); QVERIFY(!src.isCopyOf(dst));
QCOMPARE(src, control); compareAllPaletteData(src, control);
QVERIFY(src.isCopyOf(control)); QVERIFY(src.isCopyOf(control));
dst = src; // copy assignment dst = src; // copy assignment
QCOMPARE(dst, src); compareAllPaletteData(dst, src);
QCOMPARE(dst, control); compareAllPaletteData(dst, control);
QVERIFY(dst.isCopyOf(src)); QVERIFY(dst.isCopyOf(src));
dst = QPalette(Qt::green); dst = QPalette(Qt::green);
QVERIFY(dst != src); QVERIFY(dst != src);
QVERIFY(dst != control); QVERIFY(dst != control);
QCOMPARE(src, control); compareAllPaletteData(src, control);
QVERIFY(!dst.isCopyOf(src)); QVERIFY(!dst.isCopyOf(src));
QVERIFY(src.isCopyOf(control)); QVERIFY(src.isCopyOf(control));
} }
@ -150,13 +162,13 @@ void tst_QPalette::moveSemantics()
QPalette src(Qt::red), dst; QPalette src(Qt::red), dst;
const QPalette control = src; const QPalette control = src;
QVERIFY(src != dst); QVERIFY(src != dst);
QCOMPARE(src, control); compareAllPaletteData(src, control);
QVERIFY(!dst.isCopyOf(src)); QVERIFY(!dst.isCopyOf(src));
QVERIFY(!dst.isCopyOf(control)); QVERIFY(!dst.isCopyOf(control));
dst = std::move(src); // move assignment dst = std::move(src); // move assignment
QVERIFY(!dst.isCopyOf(src)); // isCopyOf() works on moved-from palettes, too QVERIFY(!dst.isCopyOf(src)); // isCopyOf() works on moved-from palettes, too
QVERIFY(dst.isCopyOf(control)); QVERIFY(dst.isCopyOf(control));
QCOMPARE(dst, control); compareAllPaletteData(dst, control);
src = control; // check moved-from 'src' can still be assigned to (doesn't crash) src = control; // check moved-from 'src' can still be assigned to (doesn't crash)
QVERIFY(src.isCopyOf(dst)); QVERIFY(src.isCopyOf(dst));
QVERIFY(src.isCopyOf(control)); QVERIFY(src.isCopyOf(control));
@ -164,7 +176,7 @@ void tst_QPalette::moveSemantics()
QVERIFY(!src.isCopyOf(dst)); QVERIFY(!src.isCopyOf(dst));
QVERIFY(!src.isCopyOf(dst2)); QVERIFY(!src.isCopyOf(dst2));
QVERIFY(!src.isCopyOf(control)); QVERIFY(!src.isCopyOf(control));
QCOMPARE(dst2, control); compareAllPaletteData(dst2, control);
QVERIFY(dst2.isCopyOf(dst)); QVERIFY(dst2.isCopyOf(dst));
QVERIFY(dst2.isCopyOf(control)); QVERIFY(dst2.isCopyOf(control));
// check moved-from 'src' can still be destroyed (doesn't crash) // check moved-from 'src' can still be destroyed (doesn't crash)