From 3f6ed5566fcfbbba4cadfade460460f8ebf06ad3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 3 Sep 2013 09:44:30 +0200 Subject: 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 --- src/corelib/tools/qscopedpointer.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'src/corelib/tools/qscopedpointer.cpp') diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index 22155d6d3ad..fb0025c1ff9 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -133,31 +133,6 @@ QT_BEGIN_NAMESPACE Constructs this QScopedPointer instance and sets its pointer to \a p. */ -/*! - \fn QScopedPointer::QScopedPointer(QScopedPointer &&other) - - Move-constructs a QScopedPointer instance, making it point at the same - object that \a other was pointing to. \a other is reset to point to \c{NULL}. - - \since 5.2 -*/ - -/*! - \fn QScopedPointer &operator=(QScopedPointer &&other) - - Move-assigns \a other to this QScopedPointer instance, transferring the - ownership of the managed pointer to this instance. - - If \a other and this instance are actually the same object, this operator - does nothing. - - Otherwise, this instance is set to point to the object \a other - is pointing to, and \a other is set to point to \c{NULL}. - If this instance was pointing to an object, that object is destroyed. - - \since 5.2 -*/ - /*! \fn QScopedPointer::~QScopedPointer() -- cgit v1.2.3