From 813b0c382898d1f55c4ab99e807a6d33c84e3c61 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 7 Aug 2025 17:00:57 -0400 Subject: [PATCH] refactor: mt/XThread Classes => mt/ThreadException Classes --- src/lib/mt/CMakeLists.txt | 2 +- src/lib/mt/Thread.cpp | 6 +++--- src/lib/mt/{XThread.h => ThreadException.h} | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) rename src/lib/mt/{XThread.h => ThreadException.h} (68%) diff --git a/src/lib/mt/CMakeLists.txt b/src/lib/mt/CMakeLists.txt index ca2908178..b771c3c0c 100644 --- a/src/lib/mt/CMakeLists.txt +++ b/src/lib/mt/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(mt STATIC Mutex.h Thread.cpp Thread.h - XThread.h + ThreadException.h ) target_link_libraries(mt PUBLIC base) diff --git a/src/lib/mt/Thread.cpp b/src/lib/mt/Thread.cpp index b213528b5..95e3037c4 100644 --- a/src/lib/mt/Thread.cpp +++ b/src/lib/mt/Thread.cpp @@ -11,7 +11,7 @@ #include "base/IJob.h" #include "base/Log.h" #include "mt/MTException.h" -#include "mt/XThread.h" +#include "mt/ThreadException.h" #include // @@ -57,7 +57,7 @@ Thread &Thread::operator=(const Thread &thread) [[noreturn]] void Thread::exit(void *result) { - throw XThreadExit(result); + throw ThreadExitException(result); } void Thread::cancel() @@ -133,7 +133,7 @@ void *Thread::threadFunc(void *vjob) LOG_DEBUG1("caught cancel on thread 0x%08x", id); delete job; throw; - } catch (XThreadExit &e) { + } catch (ThreadExitException &e) { // client called exit() result = e.m_result; LOG_DEBUG1("caught exit on thread 0x%08x, result %p", id, result); diff --git a/src/lib/mt/XThread.h b/src/lib/mt/ThreadException.h similarity index 68% rename from src/lib/mt/XThread.h rename to src/lib/mt/ThreadException.h index b34863ba0..d64ac55ce 100644 --- a/src/lib/mt/XThread.h +++ b/src/lib/mt/ThreadException.h @@ -1,5 +1,6 @@ /* * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception @@ -13,17 +14,17 @@ /*! Thrown by Thread::exit() to exit a thread. Clients of Thread must not throw this type but must rethrow it if caught (by -XThreadExit, XThread, or ...). +ThreadExitException, XThread, or ...). */ -class XThreadExit : public XThread +class ThreadExitException : public XThread { public: //! \c result is the result of the thread - explicit XThreadExit(void *result) : m_result(result) + explicit ThreadExitException(void *result) : m_result(result) { // do nothing } - ~XThreadExit() override = default; + ~ThreadExitException() override = default; public: void *m_result;