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

QMacKeyValueObserver: code tidies

Browse Source 
Fix the constructors and the signature of swap().

Change-Id: Ib294bb2c054510170b166b5c8bd3180d22177efc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2020-10-02 17:38:40 +02:00
parent 257d5888e8
commit c441e2cc47
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/kernel/qcore_mac_p.h
View File

@ -367,7 +367,7 @@ class Q_CORE_EXPORT QMacKeyValueObserver
public:
using Callback = std::function<void()>;
QMacKeyValueObserver() {}
QMacKeyValueObserver() = default;
#if defined( __OBJC__)
// Note: QMacKeyValueObserver must not outlive the object observed!
@ -381,13 +381,13 @@ public:
QMacKeyValueObserver(const QMacKeyValueObserver &other);
QMacKeyValueObserver(QMacKeyValueObserver &&other) { swap(other, *this); }
QMacKeyValueObserver(QMacKeyValueObserver &&other) noexcept { swap(other); }
~QMacKeyValueObserver() { removeObserver(); }
QMacKeyValueObserver &operator=(const QMacKeyValueObserver &other) {
QMacKeyValueObserver tmp(other);
swap(tmp, *this);
swap(tmp);
return *this;
}
@ -399,13 +399,14 @@ public:
void removeObserver();
private:
void swap(QMacKeyValueObserver &first, QMacKeyValueObserver &second) {
std::swap(first.object, second.object);
std::swap(first.keyPath, second.keyPath);
std::swap(first.callback, second.callback);
void swap(QMacKeyValueObserver &other) noexcept
{
qSwap(object, other.object);
qSwap(keyPath, other.keyPath);
qSwap(callback, other.callback);
}
private:
#if defined( __OBJC__)
void addObserver(NSKeyValueObservingOptions options);
#endif