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

Merge QReadWriteLock constructor overloads per Qt 5 comment.

Browse Source 
Change-Id: I3b569b1240a0bc5b2589de353dbf62c175472448
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Robin Burchell 2011-12-20 18:28:49 +01:00 committed by Qt by Nokia
parent 341b62d308
commit e5f84ebf01
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/thread/qreadwritelock.cpp
View File

@ -106,20 +106,13 @@ QT_BEGIN_NAMESPACE
\sa QReadWriteLock() \sa QReadWriteLock()
*/ */
/*!
Constructs a QReadWriteLock object in NonRecursive mode.
\sa lockForRead(), lockForWrite()
*/
QReadWriteLock::QReadWriteLock()
:d(new QReadWriteLockPrivate(NonRecursive))
{ }
/*! /*!
\since 4.4 \since 4.4
Constructs a QReadWriteLock object in the given \a recursionMode. Constructs a QReadWriteLock object in the given \a recursionMode.
The default recursion mode is NonRecursive.
\sa lockForRead(), lockForWrite(), RecursionMode \sa lockForRead(), lockForWrite(), RecursionMode
*/ */
QReadWriteLock::QReadWriteLock(RecursionMode recursionMode) QReadWriteLock::QReadWriteLock(RecursionMode recursionMode)

3
src/corelib/thread/qreadwritelock.h
View File

@ -60,8 +60,7 @@ class Q_CORE_EXPORT QReadWriteLock
public: public:
enum RecursionMode { NonRecursive, Recursive }; enum RecursionMode { NonRecursive, Recursive };
QReadWriteLock(); // ### Qt 5: merge with below explicit QReadWriteLock(RecursionMode recursionMode = NonRecursive);
QReadWriteLock(RecursionMode recursionMode);
~QReadWriteLock(); ~QReadWriteLock();
void lockForRead(); void lockForRead();