AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark QLocale as shared

Browse Source 
It was already movable, so it's BC. Only needed to add
nothrow member-swap and nothrow move assignment.

Change-Id: Iefedb877078da8ee075eb67185eef221143ddec1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2015-07-22 12:41:40 +02:00
parent c5e4417d6d
commit 6b9c4480bc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qlocale.cpp
View File

@ -868,6 +868,14 @@ bool QLocale::operator!=(const QLocale &other) const
return d->m_data != other.d->m_data || d->m_numberOptions != other.d->m_numberOptions; return d->m_data != other.d->m_data || d->m_numberOptions != other.d->m_numberOptions;
} }
/*!
\fn void QLocale::swap(QLocale &other)
\since 5.6
Swaps locale \a other with this locale. This operation is very fast and
never fails.
*/
/*! /*!
\since 5.6 \since 5.6
\relates QLocale \relates QLocale

8
src/corelib/tools/qlocale.h
View File

@ -866,9 +866,13 @@ public:
QLocale(Language language, Country country = AnyCountry); QLocale(Language language, Country country = AnyCountry);
QLocale(Language language, Script script, Country country); QLocale(Language language, Script script, Country country);
QLocale(const QLocale &other); QLocale(const QLocale &other);
#ifdef Q_COMPILER_RVALUE_REFS
QLocale &operator=(QLocale &&other) Q_DECL_NOTHROW { swap(other); return *this; }
#endif
QLocale &operator=(const QLocale &other);
~QLocale(); ~QLocale();
QLocale &operator=(const QLocale &other); void swap(QLocale &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
Language language() const; Language language() const;
Script script() const; Script script() const;
@ -994,7 +998,7 @@ private:
QSharedDataPointer<QLocalePrivate> d; QSharedDataPointer<QLocalePrivate> d;
}; };
Q_DECLARE_TYPEINFO(QLocale, Q_MOVABLE_TYPE); Q_DECLARE_SHARED(QLocale)
Q_DECLARE_OPERATORS_FOR_FLAGS(QLocale::NumberOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QLocale::NumberOptions)
inline QString QLocale::toString(short i) const inline QString QLocale::toString(short i) const