diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/purchasing/qthangman/hangmangame.cpp b/examples/purchasing/qthangman/hangmangame.cpp index 6852d77..9af8df0 100644 --- a/examples/purchasing/qthangman/hangmangame.cpp +++ b/examples/purchasing/qthangman/hangmangame.cpp @@ -55,9 +55,10 @@ #include <QRandomGenerator> #include <QtConcurrent/QtConcurrentRun> +#include <mutex> + HangmanGame::HangmanGame(QObject *parent) : QObject(parent) - , m_lock(QMutex::Recursive) , m_vowelsUnlocked(false) { connect(this, &HangmanGame::vowelBought, this, &HangmanGame::registerLetterBought); @@ -228,7 +229,7 @@ void HangmanGame::registerLetterBought(const QChar &letter) void HangmanGame::chooseRandomWord() { - QMutexLocker locker(&m_lock); + const std::lock_guard<QRecursiveMutex> locker(m_lock); if (m_wordList.isEmpty()) return; @@ -238,7 +239,7 @@ void HangmanGame::chooseRandomWord() void HangmanGame::initWordList() { - QMutexLocker locker(&m_lock); + const std::lock_guard<QRecursiveMutex> locker(m_lock); QFile file(":/enable2.txt"); if (file.open(QIODevice::ReadOnly)) { QByteArray allData = file.readAll(); diff --git a/examples/purchasing/qthangman/hangmangame.h b/examples/purchasing/qthangman/hangmangame.h index dc71678..7b03bf6 100644 --- a/examples/purchasing/qthangman/hangmangame.h +++ b/examples/purchasing/qthangman/hangmangame.h @@ -120,7 +120,7 @@ private: QString m_word; QString m_lettersOwned; QStringList m_wordList; - QMutex m_lock; + QRecursiveMutex m_lock; bool m_vowelsUnlocked; QSettings m_persistentSettings; int m_vowelsAvailable; diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp index ee00591..aab454c 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp +++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp @@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE QAndroidInAppPurchaseBackend::QAndroidInAppPurchaseBackend(QObject *parent) : QInAppPurchaseBackend(parent) - , m_mutex(QMutex::Recursive) , m_isReady(false) { #if defined(QANDROIDINAPPPURCHASEBACKEND_DEBUG) diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h index 62ac31c..917d8d0 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h +++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h @@ -126,7 +126,7 @@ private: QDateTime timestamp; }; - mutable QMutex m_mutex; + mutable QRecursiveMutex m_mutex; bool m_isReady; QAndroidJniObject m_javaObject; QHash<QString, QInAppProduct::ProductType> m_productTypeForPendingId; |