summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qlockfile.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-07-07 13:32:29 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-07-07 18:15:40 +0200
commit508629522d8c6580161a2fd9bfd2fe26f6c4c034 (patch)
tree47af71c44f9eaba10ace4ef69ba4bdceaade1893 /src/corelib/io/qlockfile.cpp
parent44fd4a3ba0814761a87b8ec69f9670020aba5db8 (diff)
QLockFile: remove unneeded tryLock_impl middle-man
It's perfectly ok to de-inline a function, even an exported one, so remove the tryLock_impl() middle-man and pull the Qt 7 pre-programming into the here and now. Amends 5cea5fc80b9e1b19d620ec6be1acd5cdbd220971. Pick-to: 6.6 Change-Id: I7e9626a91d8ebd64e02c3784c74621950da669fb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/io/qlockfile.cpp')
-rw-r--r--src/corelib/io/qlockfile.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qlockfile.cpp b/src/corelib/io/qlockfile.cpp
index c90d2886c2..0eb6acb694 100644
--- a/src/corelib/io/qlockfile.cpp
+++ b/src/corelib/io/qlockfile.cpp
@@ -257,7 +257,7 @@ bool QLockFile::tryLock(int timeout)
return tryLock(std::chrono::milliseconds{ timeout });
}
-/*! \fn bool QLockFile::tryLock(std::chrono::milliseconds timeout)
+/*!
\overload
\since 6.2
@@ -275,11 +275,7 @@ bool QLockFile::tryLock(int timeout)
\sa lock(), unlock()
*/
-#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)
bool QLockFile::tryLock(std::chrono::milliseconds timeout)
-#else
-bool QLockFile::tryLock_impl(std::chrono::milliseconds timeout)
-#endif
{
using namespace std::chrono_literals;
using Msec = std::chrono::milliseconds;