Fix Qt Deprecations (#6386)

Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
This commit is contained in:
sakertooth
2022-04-22 22:04:57 -04:00
committed by Johannes Lorenz
parent 96df9b006c
commit 420769a32d
12 changed files with 67 additions and 9 deletions

View File

@@ -26,6 +26,11 @@
#define AUDIO_ENGINE_H
#include <QMutex>
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
#include <QRecursiveMutex>
#endif
#include <QThread>
#include <QVector>
#include <QWaitCondition>
@@ -464,7 +469,11 @@ private:
bool m_changesSignal;
unsigned int m_changes;
QMutex m_changesMutex;
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
QRecursiveMutex m_doChangesMutex;
#else
QMutex m_doChangesMutex;
#endif
QMutex m_waitChangesMutex;
QWaitCondition m_changesAudioEngineCondition;
QWaitCondition m_changesRequestCondition;

View File

@@ -29,6 +29,9 @@
#include <QMap>
#include <QPointer>
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
#include <QRecursiveMutex>
#endif
#include "AutomationNode.h"
#include "Clip.h"
@@ -189,7 +192,11 @@ private:
// Mutex to make methods involving automation clips thread safe
// Mutable so we can lock it from const objects
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
mutable QRecursiveMutex m_clipMutex;
#else
mutable QMutex m_clipMutex;
#endif
AutomationTrack * m_autoTrack;
QVector<jo_id_t> m_idsToResolve;

View File

@@ -29,6 +29,9 @@
#include <QCheckBox>
#include <QDir>
#include <QMutex>
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
#include <QRecursiveMutex>
#endif
#include <QTreeWidget>
@@ -140,7 +143,12 @@ private:
//! This should only be accessed or modified when m_pphMutex is held
PlayHandle* m_previewPlayHandle;
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
QRecursiveMutex m_pphMutex;
#else
QMutex m_pphMutex;
#endif
QList<QAction*> getContextActions(FileItem* item, bool songEditor);

View File

@@ -28,6 +28,10 @@
#include "RemotePluginBase.h"
#include "SharedMemory.h"
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
#include <QRecursiveMutex>
#endif
namespace lmms
{
@@ -158,7 +162,11 @@ private:
QString m_exec;
QStringList m_args;
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
QRecursiveMutex m_commMutex;
#else
QMutex m_commMutex;
#endif
bool m_splitChannels;
SharedMemory<float[]> m_audioBuffer;