From 789e391420bb43b10c2c31d316bed14d243934f8 Mon Sep 17 00:00:00 2001
From: jerrrrycho <jurek.pakula@gmail.com>
Date: Sat, 10 Oct 2026 15:06:48 +0200
Subject: [PATCH] refactor(sonar): use std::scoped_lock instead of
 std::lock_guard (cpp:S5997)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 scripting/PyInt.cpp              | 12 ++++++------
 scripting/pythonscreenviewer.cpp |  2 +-
 utilities/Logs.cpp               |  4 ++--
 utilities/utilities.h            |  2 +-
 widgets/cameraview_extcam.cpp    |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp
index 8ffa29e1..6cc6c902 100644
--- a/scripting/PyInt.cpp
+++ b/scripting/PyInt.cpp
@@ -363,7 +363,7 @@ void python_taskqueue::exit()
 	// document intent. clearing the deque also actually releases the tasks,
 	// which the previous code did not do (cancel() is a no-op stub).
 	{
-		std::lock_guard<std::mutex> lock(m_tasks.mutex);
+		std::scoped_lock lock(m_tasks.mutex);
 		for (auto &task : m_tasks.data)
 		{
 			task->cancel();
@@ -371,7 +371,7 @@ void python_taskqueue::exit()
 		m_tasks.data.clear();
 	}
 	{
-		std::lock_guard<std::mutex> lock(m_uploadtasks.mutex);
+		std::scoped_lock lock(m_uploadtasks.mutex);
 		m_uploadtasks.data.clear();
 	}
 	// reclaim cached python objects while the interpreter is still alive,
@@ -410,7 +410,7 @@ auto python_taskqueue::insert(task_request const &Task) -> bool
 	bool newtaskinserted{false};
 	// acquire a lock on the task queue and add the new task
 	{
-		std::lock_guard<std::mutex> lock(m_tasks.mutex);
+		std::scoped_lock lock(m_tasks.mutex);
 		// check the task list for a pending request with the same target
 		for (auto &task : m_tasks.data)
 		{
@@ -555,7 +555,7 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo
 			task = nullptr;
 			// acquire a lock on the task queue and potentially grab a task from it
 			{
-				std::lock_guard<std::mutex> lock(Tasks.mutex);
+				std::scoped_lock lock(Tasks.mutex);
 				if (false == Tasks.data.empty())
 				{
 					// fifo
@@ -574,7 +574,7 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo
 						task->upload();
 					else
 					{
-						std::lock_guard<std::mutex> lock(Upload_Tasks.mutex);
+						std::scoped_lock lock(Upload_Tasks.mutex);
 						Upload_Tasks.data.push_back(task);
 					}
 					if (PyErr_Occurred() != nullptr)
@@ -609,7 +609,7 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo
 
 void python_taskqueue::update()
 {
-	std::lock_guard<std::mutex> lock(m_uploadtasks.mutex);
+	std::scoped_lock lock(m_uploadtasks.mutex);
 
 	for (auto &task : m_uploadtasks.data)
 		task->upload();
diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp
index fcf0ffc2..3d63b9b4 100644
--- a/scripting/pythonscreenviewer.cpp
+++ b/scripting/pythonscreenviewer.cpp
@@ -125,7 +125,7 @@ void python_screen_viewer::threadfunc()
 			int height;
 
 			if (!Global.python_sharectx) {
-				std::lock_guard<std::mutex> guard(m_rt->mutex);
+				std::scoped_lock guard(m_rt->mutex);
 
 				if (window->timestamp == m_rt->timestamp)
 					continue;
diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp
index 5b4d1d9a..28345b30 100644
--- a/utilities/Logs.cpp
+++ b/utilities/Logs.cpp
@@ -174,7 +174,7 @@ void WriteLog(std::string_view str, logtype type, bool isError)
 
 	const auto message = FormatLogMessage(str);
 
-	std::lock_guard<std::mutex> lock(logMutex);
+	std::scoped_lock lock(logMutex);
 	InfoStack.push_back({message, isError});
 }
 
@@ -185,7 +185,7 @@ void ErrorLog(std::string_view str, logtype type)
 
 	const auto message = FormatLogMessage(str);
 
-	std::lock_guard<std::mutex> lock(logMutex);
+	std::scoped_lock lock(logMutex);
 	ErrorStack.push_back(message);
 }
 
diff --git a/utilities/utilities.h b/utilities/utilities.h
index 6b8111e3..79339de4 100644
--- a/utilities/utilities.h
+++ b/utilities/utilities.h
@@ -447,7 +447,7 @@ class condition_variable
 	}
 	void spurious(bool const Spurious)
 	{
-		std::lock_guard<std::mutex> lock(m_mutex);
+		std::scoped_lock lock(m_mutex);
 		m_spurious = Spurious;
 	}
 
diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp
index 80deddbe..6e777249 100644
--- a/widgets/cameraview_extcam.cpp
+++ b/widgets/cameraview_extcam.cpp
@@ -90,7 +90,7 @@ void ui::cameraview_panel::render_contents()
 	texture->bind(0);
 
 	{
-		std::lock_guard<std::mutex> lock(mutex);
+		std::scoped_lock lock(mutex);
 		if (image_ptr) {
 
 			glActiveTexture(GL_TEXTURE0);
@@ -142,7 +142,7 @@ void ui::cameraview_panel::capture_func()
 
 		bufpos = 0;
 
-		std::lock_guard<std::mutex> lock(mutex);
+		std::scoped_lock lock(mutex);
 		image_ptr = read_buffer;
 		read_buffer = active_buffer;
 		active_buffer = image_ptr;
@@ -151,7 +151,7 @@ void ui::cameraview_panel::capture_func()
 		notify_var.notify_one();
 	}
 
-	std::lock_guard<std::mutex> lock(mutex);
+	std::scoped_lock lock(mutex);
 	image_ptr = nullptr;
 	delete[] read_buffer;
 	delete[] active_buffer;