diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-05-04 15:27:56 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 03:24:18 +0200 |
commit | 9fb539085eb0cb415fb1b02708eda72c5d372353 (patch) | |
tree | 1d2a1b9a0969b2b28ab3ee6e5f207163aa9b8298 /src/corelib/tools | |
parent | 7e0562c5ff18e2ddd72bccd133a762fd37e50eba (diff) |
QtCore: mark some classes as shared
Change-Id: I811d3eebd87c230883cc579c20f9fa4e14ff9521
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qdatetime.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qregularexpression.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index c38e780dfb..83c5ed8c2e 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -271,7 +271,7 @@ private: friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDateTime &); #endif }; -Q_DECLARE_TYPEINFO(QDateTime, Q_MOVABLE_TYPE); +Q_DECLARE_SHARED(QDateTime) #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDate &); diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h index 57cb29035b..2502323e09 100644 --- a/src/corelib/tools/qregularexpression.h +++ b/src/corelib/tools/qregularexpression.h @@ -133,9 +133,9 @@ private: QExplicitlySharedDataPointer<QRegularExpressionPrivate> d; }; +Q_DECLARE_SHARED(QRegularExpression) Q_DECLARE_OPERATORS_FOR_FLAGS(QRegularExpression::PatternOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QRegularExpression::MatchOptions) -Q_DECLARE_TYPEINFO(QRegularExpression, Q_MOVABLE_TYPE); #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream &operator<<(QDataStream &out, const QRegularExpression &re); @@ -198,7 +198,7 @@ private: QSharedDataPointer<QRegularExpressionMatchPrivate> d; }; -Q_DECLARE_TYPEINFO(QRegularExpressionMatch, Q_MOVABLE_TYPE); +Q_DECLARE_SHARED(QRegularExpressionMatch) #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QRegularExpressionMatch &match); @@ -235,7 +235,7 @@ private: QSharedDataPointer<QRegularExpressionMatchIteratorPrivate> d; }; -Q_DECLARE_TYPEINFO(QRegularExpressionMatchIterator, Q_MOVABLE_TYPE); +Q_DECLARE_SHARED(QRegularExpressionMatchIterator) QT_END_NAMESPACE |