diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:01:17 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-19 16:37:33 +0000 |
commit | 13034e67c0fa1a5ae1899dcb62869da42d84626f (patch) | |
tree | 08f5f3fae7d7aefe1aa7d7b52c4f269c3c6c069c /src/gui/painting/qpen.h | |
parent | 3f4eba746d23550be19dc4edafe193fa5ce0d3d4 (diff) | |
download | qtbase-13034e67c0fa1a5ae1899dcb62869da42d84626f.tar.gz |
Make public headers compile with -Wzero-as-null-pointer-constant
... or similar.
This amends previous commits that converted the majority of
cases.
Task-number: QTBUG-45291
Change-Id: I219cdeddca7063a56efeb4fee0e5bb2cbdc7732b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/painting/qpen.h')
-rw-r--r-- | src/gui/painting/qpen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h index 6ce50ae1d0..bfa1553c68 100644 --- a/src/gui/painting/qpen.h +++ b/src/gui/painting/qpen.h @@ -65,7 +65,7 @@ public: QPen &operator=(const QPen &pen) Q_DECL_NOTHROW; #ifdef Q_COMPILER_RVALUE_REFS QPen(QPen &&other) Q_DECL_NOTHROW - : d(other.d) { other.d = 0; } + : d(other.d) { other.d = Q_NULLPTR; } QPen &operator=(QPen &&other) Q_DECL_NOTHROW { qSwap(d, other.d); return *this; } #endif |