diff options
| author | Olivier Goffart <ogoffart@kde.org> | 2011-10-20 17:11:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 12:16:11 +0100 |
| commit | 73b682d816ec12afbf8064a44e462dd89e4c38df (patch) | |
| tree | 667bc44e7fce3b618b2ceb3e70b7d087f7bff77b /src/corelib/thread/qmutex.h | |
| parent | 72257f642944a347b806ac34934d0fb8bc472b1c (diff) | |
QRecursiveMutexPrivate should not inherit from QMutexPrivate
QMutexPrivate takes more memory than necessary, and also initialize
platform specific ressources.
Change-Id: I70be1b89b1c21499645785ae47693a6b2514e28b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/thread/qmutex.h')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 2342892a94..086a289569 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -54,7 +54,7 @@ QT_MODULE(Core) #if !defined(QT_NO_THREAD) && !defined(qdoc) -class QMutexPrivate; +class QMutexData; class Q_CORE_EXPORT QBasicMutex { @@ -83,13 +83,13 @@ private: bool lockInternal(int timeout = -1); void unlockInternal(); - QBasicAtomicPointer<QMutexPrivate> d_ptr; - static inline QMutexPrivate *dummyLocked() { - return reinterpret_cast<QMutexPrivate *>(quintptr(1)); + QBasicAtomicPointer<QMutexData> d_ptr; + static inline QMutexData *dummyLocked() { + return reinterpret_cast<QMutexData *>(quintptr(1)); } friend class QMutex; - friend class QMutexPrivate; + friend class QMutexData; }; class Q_CORE_EXPORT QMutex : public QBasicMutex { |