diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2023-04-17 16:48:51 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-05-11 12:31:56 -0700 |
commit | 34914099a1044beba7fdd1b71b079c4130ca0cd4 (patch) | |
tree | 1c91a83bf1f26f4186d2f77572c99a933e6b8fa7 /src/corelib/thread/qreadwritelock.h | |
parent | 834c755977bbfe66e041aba6d2dfa69954eb3808 (diff) |
QReadWriteLock: remove the untimed tryLockForXxxx functions
They're unnecessary now because the timed function is fast enough.
Note: the default argument will move to the QDeadlineTimer functions
before the Qt 6.6 release.
Change-Id: I3d728c4197df49169066fffd1756ddc0e4f796d3
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/thread/qreadwritelock.h')
-rw-r--r-- | src/corelib/thread/qreadwritelock.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 675b247642..1a94386386 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -22,12 +22,16 @@ public: ~QReadWriteLock(); void lockForRead(); +#if QT_CORE_REMOVED_SINCE(6, 6) bool tryLockForRead(); - bool tryLockForRead(int timeout); +#endif + bool tryLockForRead(int timeout = 0); void lockForWrite(); +#if QT_CORE_REMOVED_SINCE(6, 6) bool tryLockForWrite(); - bool tryLockForWrite(int timeout); +#endif + bool tryLockForWrite(int timeout = 0); void unlock(); |