From 03deed59ba31bd2e5ac1e799e0eb03cd4e8f5e41 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 28 Jun 2011 23:43:58 +0200 Subject: Remove the remaining QT3_SUPPORT code in corelib Change-Id: I6641c62d75d2034a46ea7cc869ae65285ae8b8f4 Reviewed-on: http://codereview.qt.nokia.com/866 Reviewed-by: Qt Sanity Bot Reviewed-by: Liang Qi --- src/corelib/thread/qmutex.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/corelib/thread/qmutex.h') diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 0f3a72d43f..cc667560db 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -76,20 +76,6 @@ public: void unlock(); //### Qt5: make inline; inline void unlockInline(); -#if defined(QT3_SUPPORT) - inline QT3_SUPPORT bool locked() - { - if (!tryLock()) - return true; - unlock(); - return false; - } - inline QT3_SUPPORT_CONSTRUCTOR QMutex(bool recursive) - { - new (this) QMutex(recursive ? Recursive : NonRecursive); - } -#endif - private: void lockInternal(); void unlockInternal(); @@ -217,10 +203,6 @@ public: static inline void unlock() {} static inline void unlockInline() {} -#if defined(QT3_SUPPORT) - static inline QT3_SUPPORT bool locked() { return false; } -#endif - private: Q_DISABLE_COPY(QMutex) }; -- cgit v1.2.3