diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-01 15:20:23 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-11-20 14:34:22 +0100 |
| commit | b119b177177d0a0fd43e2a85f5dea4782c8906cf (patch) | |
| tree | 82c1f0704bddcac8d035e9b5f768d12bd0827669 /src | |
| parent | dda6a7497e6fbc89ad91a10d20ca20cc49733259 (diff) | |
QScopedPointer: streamline code with qExchange
Change-Id: I88059d2c484fa2762ec0fc526d81db543043b58b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 314e89374b..a4c57aab8a 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -156,8 +156,7 @@ public: { if (d == other) return; - T *oldD = d; - d = other; + T *oldD = qExchange(d, other); Cleanup::cleanup(oldD); } @@ -165,8 +164,7 @@ public: QT_DEPRECATED_VERSION_X_6_1("Use std::unique_ptr instead, and call release().") T *take() noexcept { - T *oldD = d; - d = nullptr; + T *oldD = qExchange(d, nullptr); return oldD; } #endif |