diff options
author | Be <be@mixxx.org> | 2021-09-17 14:06:27 -0500 |
---|---|---|
committer | Be <be@mixxx.org> | 2021-09-17 14:16:36 -0500 |
commit | 44170cc85cc2ff4298265a58e07ef2d9004a4c3d (patch) | |
tree | 4edc7e50591e184c9e30278fb95fa98cf611df8a /src/waveform | |
parent | 62daaf7f845d0084a44d4b57eacdfe486c81438a (diff) |
use Qt5/6 QMutex & QMutexLocker compatibility macros
Diffstat (limited to 'src/waveform')
-rw-r--r-- | src/waveform/waveform.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h index e9df058148..f6019e57b5 100644 --- a/src/waveform/waveform.h +++ b/src/waveform/waveform.h @@ -1,16 +1,16 @@ #pragma once -#include <vector> - -#include <QMutex> -#include <QByteArray> -#include <QString> #include <QAtomicInt> -#include <QSharedPointer> +#include <QByteArray> +#include <QMutex> #include <QMutexLocker> +#include <QSharedPointer> +#include <QString> +#include <vector> #include "util/class.h" #include "util/compatibility.h" +#include "util/qtmutex.h" enum FilterIndex { Low = 0, Mid = 1, High = 2, FilterCount = 3}; enum ChannelIndex { Left = 0, Right = 1, ChannelCount = 2}; @@ -43,32 +43,32 @@ class Waveform { virtual ~Waveform(); int getId() const { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); return m_id; } void setId(int id) { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); m_id = id; } QString getVersion() const { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); return m_version; } void setVersion(const QString& version) { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); m_version = version; } QString getDescription() const { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); return m_description; } void setDescription(const QString& description) { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); m_description = description; } |