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

Add compatible weak pointer move operations

Browse Source 
We have those on QSharedPointer, so adding them for consistency.

Change-Id: Iab5eddc79206605a4bcce46f63e0fb685aed40ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Allan Sandfeld Jensen 2021-10-28 13:07:47 +02:00
parent 740d652f2d
commit c677b3b8af
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/tools/qsharedpointer_impl.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Copyright (C) 2020 Intel Corporation. ** Copyright (C) 2020 Intel Corporation.
** Copyright (C) 2019 Klarälvdalens Datakonsult AB. ** Copyright (C) 2019 Klarälvdalens Datakonsult AB.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
@ -583,6 +583,23 @@ public:
other.value = nullptr; other.value = nullptr;
} }
QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QWeakPointer) QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QWeakPointer)
template <class X, IfCompatible<X> = true>
QWeakPointer(QWeakPointer<X> &&other) noexcept
: d(other.d), value(other.value)
{
other.d = nullptr;
other.value = nullptr;
}
template <class X, IfCompatible<X> = true>
QWeakPointer &operator=(QWeakPointer<X> &&other) noexcept
{
QWeakPointer moved(std::move(other));
swap(moved);
return *this;
}
QWeakPointer &operator=(const QWeakPointer &other) noexcept QWeakPointer &operator=(const QWeakPointer &other) noexcept
{ {
QWeakPointer copy(other); QWeakPointer copy(other);