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/gui | |
| 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/gui')
| -rw-r--r-- | src/gui/image/qicon.h | 1 | ||||
| -rw-r--r-- | src/gui/image/qimage.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qkeysequence.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qbrush.h | 1 | ||||
| -rw-r--r-- | src/gui/painting/qpen.h | 2 |
5 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 264b672c8c..ca1a1af961 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -128,7 +128,6 @@ public: }; Q_DECLARE_SHARED(QIcon) -Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE); #if !defined(QT_NO_DATASTREAM) Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index aa81061c24..eafd7eb598 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -304,7 +304,6 @@ public: }; Q_DECLARE_SHARED(QImage) -Q_DECLARE_TYPEINFO(QImage, Q_MOVABLE_TYPE); // Inline functions... diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 4cae253b50..4e0f1dfbff 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -211,7 +211,7 @@ public: typedef QKeySequencePrivate * DataPtr; inline DataPtr &data_ptr() { return d; } }; -Q_DECLARE_TYPEINFO(QKeySequence, Q_MOVABLE_TYPE); + Q_DECLARE_SHARED(QKeySequence) #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index b4cffc45db..df41f2ad89 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -145,7 +145,6 @@ public: inline void QBrush::setColor(Qt::GlobalColor acolor) { setColor(QColor(acolor)); } -Q_DECLARE_TYPEINFO(QBrush, Q_MOVABLE_TYPE); Q_DECLARE_SHARED(QBrush) /***************************************************************************** diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h index 35b3f5eec6..f461f1b59e 100644 --- a/src/gui/painting/qpen.h +++ b/src/gui/painting/qpen.h @@ -130,7 +130,7 @@ public: typedef QPenPrivate * DataPtr; inline DataPtr &data_ptr() { return d; } }; -Q_DECLARE_TYPEINFO(QPen, Q_MOVABLE_TYPE); + Q_DECLARE_SHARED(QPen) #ifndef QT_NO_DEBUG_STREAM |