From 54483f26bab4df429b0d31758a81729e3e6ca049 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Tue, 25 Feb 2025 11:41:10 +0000
Subject: [PATCH] refactor: Use member instead of passing param in daemon main
 loop

---
 src/lib/deskflow/DaemonApp.cpp | 6 +++---
 src/lib/deskflow/DaemonApp.h   | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp
index a14635581..210e94e3a 100644
--- a/src/lib/deskflow/DaemonApp.cpp
+++ b/src/lib/deskflow/DaemonApp.cpp
@@ -64,7 +64,7 @@ void DaemonApp::run()
 {
   if (m_foreground) {
     LOG_DEBUG("running daemon in foreground");
-    mainLoop(m_foreground);
+    mainLoop();
   } else {
     LOG_DEBUG("running daemon in background (daemonizing)");
     ARCH->daemonize(kAppName, daemonLoop);
@@ -202,7 +202,7 @@ DaemonApp::InitResult DaemonApp::init(IEventQueue *events, int argc, char **argv
   return StartDaemon;
 }
 
-void DaemonApp::mainLoop(bool foreground)
+void DaemonApp::mainLoop()
 {
   if (m_events == nullptr) {
     throw XDeskflow("event queue not set");
@@ -212,7 +212,7 @@ void DaemonApp::mainLoop(bool foreground)
     DAEMON_RUNNING(true);
 
 #if SYSAPI_WIN32
-    m_watchdog = std::make_unique<MSWindowsWatchdog>(false, foreground);
+    m_watchdog = std::make_unique<MSWindowsWatchdog>(false, m_foreground);
     m_watchdog->setFileLogOutputter(m_fileLogOutputter);
 
     // install the platform event queue to handle service stop events.
diff --git a/src/lib/deskflow/DaemonApp.h b/src/lib/deskflow/DaemonApp.h
index 919a968d6..07f31e036 100644
--- a/src/lib/deskflow/DaemonApp.h
+++ b/src/lib/deskflow/DaemonApp.h
@@ -46,10 +46,8 @@ public:
 
   InitResult init(IEventQueue *events, int argc, char **argv);
   void run();
-  void restartCoreProcess();
+  void mainLoop();
   void saveLogLevel(const QString &logLevel) const;
-  void mainLoop(bool foreground = false);
-  void setLogLevel(const QString &logLevel);
   void setElevate(bool elevate);
   void setCommand(const QString &command);
   void applyWatchdogCommand() const;