diff --git a/src/lib/arch/ArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp index a551f9d01..9831a3e4c 100644 --- a/src/lib/arch/ArchDaemonNone.cpp +++ b/src/lib/arch/ArchDaemonNone.cpp @@ -12,12 +12,10 @@ // ArchDaemonNone // -int ArchDaemonNone::daemonize(const QString &name, DaemonFunc const &func) +int ArchDaemonNone::daemonize(DaemonFunc const &func) { // simply forward the call to func. obviously, this doesn't // do any daemonizing. - auto t = name.toStdString(); - const char *n = t.c_str(); return func(); } diff --git a/src/lib/arch/ArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h index db3674b88..3060335b6 100644 --- a/src/lib/arch/ArchDaemonNone.h +++ b/src/lib/arch/ArchDaemonNone.h @@ -24,6 +24,6 @@ public: ~ArchDaemonNone() override = default; // IArchDaemon overrides - int daemonize(const QString &name, DaemonFunc const &func) override; + int daemonize(DaemonFunc const &func) override; QString commandLine() const override; }; diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h index fde312ec2..883c2edf2 100644 --- a/src/lib/arch/IArchDaemon.h +++ b/src/lib/arch/IArchDaemon.h @@ -53,7 +53,7 @@ public: \c ArchMiscWindows::daemonFailed() to indicate startup failure. */ - virtual int daemonize(const QString &name, DaemonFunc const &func) = 0; + virtual int daemonize(DaemonFunc const &func) = 0; //@} diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp index dd1504e5f..673b2468c 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.cpp +++ b/src/lib/arch/unix/ArchDaemonUnix.cpp @@ -47,12 +47,10 @@ bool alreadyDaemonized() #endif -int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func) +int ArchDaemonUnix::daemonize(DaemonFunc const &func) { #ifdef __APPLE__ if (alreadyDaemonized()) { - auto t = name.toStdString(); - const char *n = t.c_str(); return func(); } #endif @@ -108,8 +106,5 @@ int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func) #endif // invoke function - - auto t = name.toStdString(); - const char *n = t.c_str(); return func(); } diff --git a/src/lib/arch/unix/ArchDaemonUnix.h b/src/lib/arch/unix/ArchDaemonUnix.h index 280154397..802dde344 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.h +++ b/src/lib/arch/unix/ArchDaemonUnix.h @@ -20,5 +20,5 @@ public: ~ArchDaemonUnix() override = default; // IArchDaemon overrides - int daemonize(const QString &name, DaemonFunc const &func) override; + int daemonize(DaemonFunc const &func) override; }; diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp index 119308a77..884558bd8 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.cpp +++ b/src/lib/arch/win32/ArchDaemonWindows.cpp @@ -12,6 +12,7 @@ #include "arch/win32/ArchMiscWindows.h" #include "arch/win32/XArchWindows.h" #include "base/Log.h" +#include "common/Constants.h" // // ArchDaemonWindows @@ -52,7 +53,7 @@ void ArchDaemonWindows::daemonFailed(int result) throw ArchDaemonRunException(result); } -int ArchDaemonWindows::daemonize(const QString &name, DaemonFunc const &func) +int ArchDaemonWindows::daemonize(DaemonFunc const &func) { assert(name != nullptr); assert(func != nullptr); @@ -62,7 +63,7 @@ int ArchDaemonWindows::daemonize(const QString &name, DaemonFunc const &func) // construct the service entry SERVICE_TABLE_ENTRY entry[2]; - entry[0].lpServiceName = const_cast(name.toStdWString().c_str()); + entry[0].lpServiceName = const_cast(QString(kAppName).toStdWString().c_str()); entry[0].lpServiceProc = &ArchDaemonWindows::serviceMainEntry; entry[1].lpServiceName = nullptr; entry[1].lpServiceProc = nullptr; diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h index 466d8056e..4f33d0701 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.h +++ b/src/lib/arch/win32/ArchDaemonWindows.h @@ -68,7 +68,7 @@ public: static UINT getDaemonQuitMessage(); // IArchDaemon overrides - int daemonize(const QString &name, DaemonFunc const &func) override; + int daemonize(DaemonFunc const &func) override; QString commandLine() const override { return m_commandLine; diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp index 42e5bfe27..718c71c60 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] { return daemonLoop(); }); + ARCH->daemonize([this] { return daemonLoop(); }); } daemonThread.quit(); diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index f6c2f47c9..70c9316ce 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -89,7 +89,7 @@ int AppUtilWindows::daemonNTStartup() { SystemLogger sysLogger(app().daemonName(), false); m_exitMode = kExitModeDaemon; - return ARCH->daemonize(app().daemonName(), daemonNTMainLoopStatic); + return ARCH->daemonize(daemonNTMainLoopStatic); } static int daemonNTStartupStatic()