From 400b4c9dbeba968e354d0e50c3652f4c76e39b0c Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Thu, 28 Oct 2021 15:11:47 +0800 Subject: [PATCH] klipper: Remove deprecated QMutex usage This constructor is not available in Qt6 https://doc.qt.io/qt-5/qmutex.html#QMutex-1 Using QRecursiveMutex instead --- klipper/historymodel.cpp | 1 - klipper/historymodel.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/klipper/historymodel.cpp b/klipper/historymodel.cpp index 1d8dedbd6..b873a22db 100644 --- a/klipper/historymodel.cpp +++ b/klipper/historymodel.cpp @@ -13,7 +13,6 @@ HistoryModel::HistoryModel(QObject *parent) : QAbstractListModel(parent) , m_maxSize(0) , m_displayImages(true) - , m_mutex(QMutex::Recursive) { } diff --git a/klipper/historymodel.h b/klipper/historymodel.h index 388c239fd..ec291be98 100644 --- a/klipper/historymodel.h +++ b/klipper/historymodel.h @@ -6,7 +6,7 @@ #pragma once #include -#include +#include class HistoryItem; @@ -44,7 +44,7 @@ public: void insert(QSharedPointer item); - QMutex *mutex() + QRecursiveMutex *mutex() { return &m_mutex; } @@ -54,7 +54,7 @@ private: QList> m_items; int m_maxSize; bool m_displayImages; - QMutex m_mutex; + QRecursiveMutex m_mutex; }; inline int HistoryModel::maxSize() const