From 865e4610328b381b252e22cbdec23cbcfac90dec Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 15 Dec 2019 19:31:34 +0100 Subject: [PATCH] Avoid using QAtomicInteger functions deprecated in Qt 5.14.0 --- renamingutility/renamingengine.cpp | 4 ++++ renamingutility/renamingengine.h | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/renamingutility/renamingengine.cpp b/renamingutility/renamingengine.cpp index c969288..d7e3b24 100644 --- a/renamingutility/renamingengine.cpp +++ b/renamingutility/renamingengine.cpp @@ -145,7 +145,11 @@ void RenamingEngine::processChangingsApplied() void RenamingEngine::resetStatus() { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + m_aborted.storeRelaxed(false); +#else m_aborted.store(false); +#endif m_itemsProcessed = 0; m_errorsOccured = 0; } diff --git a/renamingutility/renamingengine.h b/renamingutility/renamingengine.h index aa031fb..a0789bb 100644 --- a/renamingutility/renamingengine.h +++ b/renamingutility/renamingengine.h @@ -162,12 +162,20 @@ inline bool RenamingEngine::isBusy() inline void RenamingEngine::abort() { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + m_aborted.storeRelaxed(1); +#else m_aborted.store(1); +#endif } inline bool RenamingEngine::isAborted() { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + return m_aborted.loadRelaxed(); +#else return m_aborted.load(); +#endif } } // namespace RenamingUtility