[Libreoffice-commits] core.git: slideshow/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Aug 1 20:19:09 UTC 2021
slideshow/source/engine/eventqueue.cxx | 16 ++++++++--------
slideshow/source/inc/eventqueue.hxx | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit c0ce120b55ba389729e97babf80f2cb39ce38e9f
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 18:49:14 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 22:18:33 2021 +0200
osl::Mutex->std::mutex in EventQueue
Change-Id: Ia936a28dd2ae5b5cb1797a0e703e9d96841a1f3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119829
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 6094fa43bf89..0e888db85567 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -77,7 +77,7 @@ namespace slideshow::internal
bool EventQueue::addEvent( const EventSharedPtr& rEvent )
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
SAL_INFO("slideshow.eventqueue", "adding event \"" << rEvent->GetDescription()
<< "\" [" << rEvent.get()
@@ -103,7 +103,7 @@ namespace slideshow::internal
bool EventQueue::addEventForNextRound( EventSharedPtr const& rEvent )
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
SAL_INFO("slideshow.eventqueue", "adding event \"" << rEvent->GetDescription()
<< "\" [" << rEvent.get()
@@ -120,7 +120,7 @@ namespace slideshow::internal
bool EventQueue::addEventWhenQueueIsEmpty (const EventSharedPtr& rpEvent)
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
SAL_INFO("slideshow.eventqueue", "adding event \"" << rpEvent->GetDescription()
<< "\" [" << rpEvent.get()
@@ -140,14 +140,14 @@ namespace slideshow::internal
void EventQueue::forceEmpty()
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
process_(true);
}
void EventQueue::process()
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
process_(false);
}
@@ -257,14 +257,14 @@ namespace slideshow::internal
bool EventQueue::isEmpty() const
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
return maEvents.empty() && maNextEvents.empty() && maNextNextEvents.empty();
}
double EventQueue::nextTimeout() const
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
// return time for next entry (if any)
double nTimeout (::std::numeric_limits<double>::max());
@@ -281,7 +281,7 @@ namespace slideshow::internal
void EventQueue::clear()
{
- ::osl::MutexGuard aGuard( maMutex );
+ std::lock_guard aGuard( maMutex );
// TODO(P1): Maybe a plain vector and vector.swap will
// be faster here. Profile.
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx
index 63c93f7a302d..fb0f1b8536eb 100644
--- a/slideshow/source/inc/eventqueue.hxx
+++ b/slideshow/source/inc/eventqueue.hxx
@@ -21,10 +21,10 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_EVENTQUEUE_HXX
#include <canvas/elapsedtime.hxx>
-#include <osl/mutex.hxx>
#include "event.hxx"
+#include <mutex>
#include <queue>
#include <vector>
@@ -116,7 +116,7 @@ namespace slideshow::internal
getTimer() const { return mpTimer; }
private:
- mutable ::osl::Mutex maMutex;
+ mutable std::mutex maMutex;
struct EventEntry
{
More information about the Libreoffice-commits
mailing list