Base: Use std::recursive_mutex

src/Base/Sequencer.cpp

@@ -24,12 +24,11 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QMutexLocker>
+#include <mutex>
+#include <vector>
 #endif
 
 #include "Sequencer.h"
-#include "Mutex.h"
-
 
 using namespace Base;
 
@@ -40,7 +39,7 @@ struct SequencerP
     // members
     static std::vector<SequencerBase*> _instances; /**< A vector of all created instances */
     static SequencerLauncher* _topLauncher;        /**< The outermost launcher */
-    static QRecursiveMutex mutex;                  /**< A mutex-locker for the launcher */
+    static std::recursive_mutex mutex;             /**< A mutex-locker for the launcher */
     /** Sets a global sequencer object.
      * Access to the last registered object is performed by @see Sequencer().
      */
@@ -66,7 +65,7 @@ struct SequencerP
  */
 std::vector<SequencerBase*> SequencerP::_instances;
 SequencerLauncher* SequencerP::_topLauncher = nullptr;
-QRecursiveMutex SequencerP::mutex;
+std::recursive_mutex SequencerP::mutex;
 }  // namespace Base
 
 SequencerBase& SequencerBase::Instance()
@@ -160,7 +159,7 @@ bool SequencerBase::isBlocking() const
 
 bool SequencerBase::setLocked(bool bLocked)
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     bool old = this->_bLocked;
     this->_bLocked = bLocked;
     return old;
@@ -168,19 +167,19 @@ bool SequencerBase::setLocked(bool bLocked)
 
 bool SequencerBase::isLocked() const
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     return this->_bLocked;
 }
 
 bool SequencerBase::isRunning() const
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     return (SequencerP::_topLauncher != nullptr);
 }
 
 bool SequencerBase::wasCanceled() const
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     return this->_bCanceled;
 }
 
@@ -236,7 +235,7 @@ void ConsoleSequencer::resetData()
 
 SequencerLauncher::SequencerLauncher(const char* pszStr, size_t steps)
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     // Have we already an instance of SequencerLauncher created?
     if (!SequencerP::_topLauncher) {
         SequencerBase::Instance().start(pszStr, steps);
@@ -246,24 +245,22 @@ SequencerLauncher::SequencerLauncher(const char* pszStr, size_t steps)
 
 SequencerLauncher::~SequencerLauncher()
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     if (SequencerP::_topLauncher == this) {
         SequencerBase::Instance().stop();
-    }
-    if (SequencerP::_topLauncher == this) {
         SequencerP::_topLauncher = nullptr;
     }
 }
 
 void SequencerLauncher::setText(const char* pszTxt)
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     SequencerBase::Instance().setText(pszTxt);
 }
 
 bool SequencerLauncher::next(bool canAbort)
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     if (SequencerP::_topLauncher != this) {
         return true;  // ignore
     }
@@ -272,13 +269,13 @@ bool SequencerLauncher::next(bool canAbort)
 
 void SequencerLauncher::setProgress(size_t pos)
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     SequencerBase::Instance().setProgress(pos);
 }
 
 size_t SequencerLauncher::numberOfSteps() const
 {
-    QMutexLocker locker(&SequencerP::mutex);
+    std::lock_guard<std::recursive_mutex> locker(SequencerP::mutex);
     return SequencerBase::Instance().numberOfSteps();
 }