From 952d06f7d6cb8ad2b84b0d80bce936abdd0be196 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 24 Feb 2012 17:15:25 +0100 Subject: QModelIndex: remove user-defined copy operations They're identical to the ones the compiler will synthesize and their presence prevents move constructor and assignment operators from being synthesized alongside their copy counterparts. The destructor can go, too. Change-Id: Ia9cc26ba1ffaa670f03642af457e632f44bd69c2 Reviewed-by: Thiago Macieira --- src/corelib/itemmodels/qabstractitemmodel.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/corelib/itemmodels/qabstractitemmodel.h') diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 4cdafdd9d8..26d4cb53d1 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -61,9 +61,7 @@ class Q_CORE_EXPORT QModelIndex friend class QProxyModel; public: inline QModelIndex() : r(-1), c(-1), p(0), m(0) {} - inline QModelIndex(const QModelIndex &other) - : r(other.r), c(other.c), p(other.p), m(other.m) {} - inline ~QModelIndex() { p = 0; m = 0; } + // compiler-generated copy/move ctors/assignment operators are fine! inline int row() const { return r; } inline int column() const { return c; } inline void *internalPointer() const { return p; } -- cgit v1.2.3