diff options
author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-03-15 15:56:14 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 10:42:40 +0100 |
commit | 389f2a076d3321c285fb9652177ccb3367019e51 (patch) | |
tree | 5b8f744083a4e272ee6230c882adb8c340c8b94c /src/corelib/mimetypes | |
parent | 932fdbf4dd91da9de20fdb46d21058df6f7cb14f (diff) |
Removed move constructor.
All C++-2011-specific constructors, operators and methods may be inline
only in Qt. Since an implementation in the header file does not seem to
be possible for QMimeType without breaking backward compatiblity the
move constructor has to disappear altogether.
See also the discussion at
http://codereview.qt-project.org/#change,19150
Change-Id: If07347a51a1ae5bd4c2d292dac835592ede4b370
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/mimetypes')
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 19 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.h | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index ebf687bb4b..18ce5e5000 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -181,25 +181,6 @@ QMimeType &QMimeType::operator=(const QMimeType &other) return *this; } -#ifdef Q_COMPILER_RVALUE_REFS -/*! - \fn QMimeType::QMimeType(QMimeType &&other); - Constructs this QMimeType object by moving the data of the rvalue reference \a other. - */ -QMimeType::QMimeType(QMimeType &&other) : - d(std::move(other.d)) -{ - DBG() << "name():" << name(); - //DBG() << "aliases():" << aliases(); - //DBG() << "comment():" << comment(); - DBG() << "genericIconName():" << genericIconName(); - DBG() << "iconName():" << iconName(); - DBG() << "globPatterns():" << globPatterns(); - DBG() << "suffixes():" << suffixes(); - DBG() << "preferredSuffix():" << preferredSuffix(); -} -#endif - /*! \fn QMimeType::QMimeType(const QMimeTypePrivate &dd); Assigns the data of the QMimeTypePrivate \a dd to this QMimeType object, and returns a reference to this object. diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 68d17caaba..172973e77a 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -59,8 +59,6 @@ public: QMimeType(const QMimeType &other); QMimeType &operator=(const QMimeType &other); #ifdef Q_COMPILER_RVALUE_REFS - QMimeType(QMimeType &&other); - QMimeType &operator=(QMimeType &&other) { qSwap(d, other.d); |