VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-17 16:24:08 -04:00
Code Issues Projects Releases Wiki Activity

Replace deprecated QMutex(Recursive) with QRecursiveMutex

Browse Source
This commit is contained in:
Jiří Pinkava
2022-09-15 21:59:42 +02:00
parent b20b3ea343
commit 0df2d75e6d
234 changed files with 310 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logging/logger.cpp
+4 -3
View File
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <QMutex>
#include <QRecursiveMutex>
#include <QDateTime>
#include <QThread>
#include <QObject>
@@ -19,7 +20,7 @@ Logger* Logger::defaultLogger=0;
QThreadStorage<QHash<QString,QString>*> Logger::logVars;
QMutex Logger::mutex;
QRecursiveMutex Logger::mutex;
Logger::Logger(QObject* parent)
@@ -43,8 +44,8 @@ Logger::Logger(const QString msgFormat, const QString timestampFormat, const QtM
void Logger::msgHandler(const QtMsgType type, const QString &message, const QString &file, const QString &function, const int line)
{
static QMutex recursiveMutex(QMutex::Recursive);
static QMutex nonRecursiveMutex(QMutex::NonRecursive);
static QRecursiveMutex recursiveMutex;
static QMutex nonRecursiveMutex;
// Prevent multiple threads from calling this method simultaneoulsy.
// But allow recursive calls, which is required to prevent a deadlock