Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi
Commits
a07f9c45
Commit
a07f9c45
authored
Jan 10, 2021
by
Laurent Montel
😁
Browse files
Using QMutex in recursive mode is deprecated.
parent
0c790cf7
Pipeline
#47205
passed with stage
in 12 minutes and 43 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/server/fakeclient.cpp
View file @
a07f9c45
...
...
@@ -37,7 +37,7 @@ using namespace Akonadi::Server;
FakeClient
::
FakeClient
(
QObject
*
parent
)
:
QThread
(
parent
)
,
mMutex
(
QMutex
::
Recursive
)
,
mMutex
()
{
moveToThread
(
this
);
}
...
...
autotests/server/fakeclient.h
View file @
a07f9c45
...
...
@@ -9,7 +9,7 @@
#define AKONADI_SERVER_FAKECLIENT_H
#include <QThread>
#include <QMutex>
#include <Q
Recursive
Mutex>
#include "datastream_p_p.h"
#include "fakeakonadiserver.h"
...
...
@@ -41,7 +41,7 @@ private Q_SLOTS:
void
connectionLost
();
private:
mutable
QMutex
mMutex
;
mutable
Q
Recursive
Mutex
mMutex
;
TestScenario
::
List
mScenarios
;
QLocalSocket
*
mSocket
=
nullptr
;
...
...
src/server/aggregatedfetchscope.cpp
View file @
a07f9c45
...
...
@@ -7,7 +7,7 @@
#include "aggregatedfetchscope.h"
#include <shared/akranges.h>
#include <QMutex>
#include <Q
Recursive
Mutex>
#include <QMutexLocker>
#define LOCKED_D(name) \
...
...
@@ -22,7 +22,7 @@ class AggregatedFetchScopePrivate
{
public:
AggregatedFetchScopePrivate
()
:
lock
(
QMutex
::
Recursive
)
// recursive so that we can call our own getters/setters
:
lock
()
// recursive so that we can call our own getters/setters
{}
inline
void
addToSet
(
const
QByteArray
&
value
,
QSet
<
QByteArray
>
&
set
,
QHash
<
QByteArray
,
int
>
&
count
)
...
...
@@ -67,7 +67,7 @@ public:
}
public:
mutable
QMutex
lock
;
mutable
Q
Recursive
Mutex
lock
;
};
class
AggregatedCollectionFetchScopePrivate
:
public
AggregatedFetchScopePrivate
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment