From 8ea2671e6520c82df51fe9b248e950e1fca03f69 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Tue, 30 Sep 2025 17:57:10 -0400
Subject: [PATCH] refactor: cleanup daemonApp args

---
 src/lib/arch/ArchDaemonNone.cpp           | 2 +-
 src/lib/arch/IArchDaemon.h                | 2 +-
 src/lib/arch/unix/ArchDaemonUnix.cpp      | 4 ++--
 src/lib/arch/win32/ArchDaemonWindows.cpp  | 2 +-
 src/lib/deskflow/DaemonApp.cpp            | 2 +-
 src/lib/deskflow/win32/AppUtilWindows.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/arch/ArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp
index cf0f0c628..a551f9d01 100644
--- a/src/lib/arch/ArchDaemonNone.cpp
+++ b/src/lib/arch/ArchDaemonNone.cpp
@@ -18,7 +18,7 @@ int ArchDaemonNone::daemonize(const QString &name, DaemonFunc const &func)
   // do any daemonizing.
   auto t = name.toStdString();
   const char *n = t.c_str();
-  return func(1, &n);
+  return func();
 }
 
 QString ArchDaemonNone::commandLine() const
diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h
index 761479cb9..fde312ec2 100644
--- a/src/lib/arch/IArchDaemon.h
+++ b/src/lib/arch/IArchDaemon.h
@@ -20,7 +20,7 @@ implement this interface.
 class IArchDaemon
 {
 public:
-  using DaemonFunc = std::function<int(int, const char **)>;
+  using DaemonFunc = std::function<int()>;
 
   virtual ~IArchDaemon() = default;
   //! @name manipulators
diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp
index 2ff746437..dd1504e5f 100644
--- a/src/lib/arch/unix/ArchDaemonUnix.cpp
+++ b/src/lib/arch/unix/ArchDaemonUnix.cpp
@@ -53,7 +53,7 @@ int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func)
   if (alreadyDaemonized()) {
     auto t = name.toStdString();
     const char *n = t.c_str();
-    return func(1, &n);
+    return func();
   }
 #endif
 
@@ -111,5 +111,5 @@ int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func)
 
   auto t = name.toStdString();
   const char *n = t.c_str();
-  return func(1, &n);
+  return func();
 }
diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp
index 499fa0ee4..119308a77 100644
--- a/src/lib/arch/win32/ArchDaemonWindows.cpp
+++ b/src/lib/arch/win32/ArchDaemonWindows.cpp
@@ -297,7 +297,7 @@ void ArchDaemonWindows::serviceMain(DWORD argc, LPTSTR *argvIn)
 
   try {
     // invoke daemon function
-    m_daemonResult = m_daemonFunc(static_cast<int>(argc), reinterpret_cast<const char **>(argv));
+    m_daemonResult = m_daemonFunc();
   } catch (ArchDaemonRunException &e) {
     setStatusError(e.m_result);
     m_daemonResult = -1;
diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp
index 9062c1d16..42e5bfe27 100644
--- a/src/lib/deskflow/DaemonApp.cpp
+++ b/src/lib/deskflow/DaemonApp.cpp
@@ -138,7 +138,7 @@ void DaemonApp::run(QThread &daemonThread)
       mainLoop();
     } else {
       LOG_DEBUG("running daemon in background (daemonizing)");
-      ARCH->daemonize(kAppName, [this](int, const char **) { return daemonLoop(); });
+      ARCH->daemonize(kAppName, [this] { return daemonLoop(); });
     }
 
     daemonThread.quit();
diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp
index 20049f515..f6c2f47c9 100644
--- a/src/lib/deskflow/win32/AppUtilWindows.cpp
+++ b/src/lib/deskflow/win32/AppUtilWindows.cpp
@@ -97,7 +97,7 @@ static int daemonNTStartupStatic()
   return AppUtilWindows::instance().daemonNTStartup();
 }
 
-static int foregroundStartupStatic(int argc, char **argv)
+static int foregroundStartupStatic()
 {
   return AppUtil::instance().app().start();
 }