diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-09-03 09:44:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 08:20:19 +0200 |
| commit | 3f6ed5566fcfbbba4cadfade460460f8ebf06ad3 (patch) | |
| tree | 213de5a21d8e942daded1c988560d11b76e92709 /src/corelib/tools/qscopedpointer.h | |
| parent | 5a02d30a78991240c3355d863f52b0d376ebf911 (diff) | |
Revert "Implement move-ctor and move-assignment-op for QScopedPointer"
This reverts commit 5b9006bbdba7dcab01b8e640554a7d7a4b64f76b.
Also revert "Doc: Enable documentation for QScopedPointer's rvalue ref functions"
This reverts commit 5f8416ec659b134db90df7e7f857db77fd27b6ab.
Adding a move contructor to QScopedPointer makes no sense, because moving
means 'escaping the scope', which breaks the fundamental point of
QScopedPointer.
Change-Id: I4ac1b108bf199af6e436fa1629aa2d3b93c27724
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qscopedpointer.h')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index dba37dae23..dd6e5bd57b 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -109,19 +109,6 @@ public: Cleanup::cleanup(oldD); } -#ifdef Q_COMPILER_RVALUE_REFS - inline QScopedPointer(QScopedPointer<T, Cleanup> &&other) - : d(other.take()) - { - } - - inline QScopedPointer<T, Cleanup> &operator=(QScopedPointer<T, Cleanup> &&other) - { - reset(other.take()); - return *this; - } -#endif - inline T &operator*() const { Q_ASSERT(d); |