diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-04-05 16:42:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 03:24:24 +0200 |
commit | 7c8d2592313acd023270b273754692677d1749c3 (patch) | |
tree | 09492cc4fc6439f30d6e35b5f7f4db384ab61af2 /src/corelib/io | |
parent | 9fb539085eb0cb415fb1b02708eda72c5d372353 (diff) |
Q_DECLARE_SHARED: mark the type movable
All implicitly shared classes are by definition movable,
so this patch adds Q_DECLARE_TYPEINFO(Type, Q_MOVABLE_TYPE)
to Q_DECLARE_SHARED.
Change-Id: Idf8989ae1a7ed6d1ac13fccb7eaef7395a875350
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qfileinfo.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qurl.h | 1 | ||||
-rw-r--r-- | src/corelib/io/qurlquery.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 41db9d711d..6b1f79ab3c 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -150,7 +150,7 @@ private: } }; -Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE); +Q_DECLARE_SHARED(QFileInfo) typedef QList<QFileInfo> QFileInfoList; diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 90b29ed958..5096d9c1d9 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -329,7 +329,6 @@ public: inline DataPtr &data_ptr() { return d; } }; -Q_DECLARE_TYPEINFO(QUrl, Q_MOVABLE_TYPE); Q_DECLARE_SHARED(QUrl) Q_DECLARE_OPERATORS_FOR_FLAGS(QUrl::ComponentFormattingOptions) //Q_DECLARE_OPERATORS_FOR_FLAGS(QUrl::FormattingOptions) diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h index 5939fd938a..5eac44f327 100644 --- a/src/corelib/io/qurlquery.h +++ b/src/corelib/io/qurlquery.h @@ -111,7 +111,6 @@ public: inline DataPtr &data_ptr() { return d; } }; -Q_DECLARE_TYPEINFO(QUrlQuery, Q_MOVABLE_TYPE); Q_DECLARE_SHARED(QUrlQuery) #if QT_DEPRECATED_SINCE(5,0) |