diff options
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qmutex.h | 18 | ||||
-rw-r--r-- | src/corelib/thread/qthread.h | 6 |
2 files changed, 0 insertions, 24 deletions
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) }; diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 878a13c882..bc529fd53b 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -116,12 +116,6 @@ protected: static void msleep(unsigned long); static void usleep(unsigned long); -#ifdef QT3_SUPPORT -public: - inline QT3_SUPPORT bool finished() const { return isFinished(); } - inline QT3_SUPPORT bool running() const { return isRunning(); } -#endif - protected: QThread(QThreadPrivate &dd, QObject *parent = 0); |