smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: use ArchDaemonWindows::daemonFailed directly

Browse source 
remove now unused ArchMiscWindows::daemonFailed
update copyright year
This commit is contained in:
sithlord48 2026-01-03 09:24:41 -05:00 committed by Chris Rizzitello
parent 3ff06b7d9a
commit 0e04364d17
4 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/arch/IArchDaemon.h
View file

@ -50,7 +50,7 @@ public:
is called when the daemon must exit the main loop and it must cause is called when the daemon must exit the main loop and it must cause
\c runFunc to return. \c func should return what \c runDaemon() \c runFunc to return. \c func should return what \c runDaemon()
returns. \c func or \c runFunc can call returns. \c func or \c runFunc can call
\c ArchMiscWindows::daemonFailed() to indicate startup failure. \c ArchDaemonWindows::daemonFailed() to indicate startup failure.
</ul> </ul>
*/ */
virtual int daemonize(DaemonFunc const &func) = 0; virtual int daemonize(DaemonFunc const &func) = 0;

5
src/lib/arch/win32/ArchMiscWindows.cpp
View file

@ -70,11 +70,6 @@ int ArchMiscWindows::runDaemon(RunFunc runFunc)
return ArchDaemonWindows::runDaemon(runFunc); return ArchDaemonWindows::runDaemon(runFunc);
} }
void ArchMiscWindows::daemonFailed(int result)
{
ArchDaemonWindows::daemonFailed(result);
}
HKEY ArchMiscWindows::openKey(HKEY key, const TCHAR *keyName) HKEY ArchMiscWindows::openKey(HKEY key, const TCHAR *keyName)
{ {
return openKey(key, keyName, false); return openKey(key, keyName, false);

6
src/lib/arch/win32/ArchMiscWindows.h
View file

@ -47,12 +47,6 @@ public:
*/ */
static int runDaemon(RunFunc runFunc); static int runDaemon(RunFunc runFunc);
//! Indicate failure of running daemon
/*!
Delegates to ArchDaemonWindows.
*/
static void daemonFailed(int result);
//! Open and return a registry key, closing the parent key //! Open and return a registry key, closing the parent key
static HKEY openKey(HKEY parent, const TCHAR *child); static HKEY openKey(HKEY parent, const TCHAR *child);

4
src/lib/deskflow/win32/AppUtilWindows.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
* SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd. * SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd.
* SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@ -8,6 +9,7 @@
#include "deskflow/win32/AppUtilWindows.h" #include "deskflow/win32/AppUtilWindows.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "arch/win32/ArchDaemonWindows.h"
#include "arch/win32/ArchMiscWindows.h" #include "arch/win32/ArchMiscWindows.h"
#include "arch/win32/XArchWindows.h" #include "arch/win32/XArchWindows.h"
#include "base/Event.h" #include "base/Event.h"
@ -71,7 +73,7 @@ void AppUtilWindows::exitApp(int code)
switch (m_exitMode) { switch (m_exitMode) {
case kExitModeDaemon: case kExitModeDaemon:
ArchMiscWindows::daemonFailed(code); ArchDaemonWindows::daemonFailed(code);
break; break;
default: default: