From 73b682d816ec12afbf8064a44e462dd89e4c38df Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 20 Oct 2011 17:11:18 +0200 Subject: 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 --- src/corelib/thread/qmutex.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/corelib/thread/qmutex.h') 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 d_ptr; - static inline QMutexPrivate *dummyLocked() { - return reinterpret_cast(quintptr(1)); + QBasicAtomicPointer d_ptr; + static inline QMutexData *dummyLocked() { + return reinterpret_cast(quintptr(1)); } friend class QMutex; - friend class QMutexPrivate; + friend class QMutexData; }; class Q_CORE_EXPORT QMutex : public QBasicMutex { -- cgit v1.2.3