1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed move constructor.

Browse Source 
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>
This commit is contained in:
Wolf-Michael Bolle 2012-03-15 15:56:14 +01:00 committed by Qt by Nokia
parent 932fdbf4dd
commit 389f2a076d
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/mimetypes/qmimetype.cpp
View File

@ -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.

2
src/corelib/mimetypes/qmimetype.h
View File

@ -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);