From 12ea23a3bd222d55344d96296dbaf93222bada9f Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 30 Sep 2025 17:02:32 -0400 Subject: [PATCH] refactor: App::run remove unused args --- src/apps/deskflow-core/deskflow-core.cpp | 4 ++-- src/lib/deskflow/App.cpp | 4 ++-- src/lib/deskflow/App.h | 3 +-- src/lib/deskflow/AppUtil.h | 2 +- src/lib/deskflow/unix/AppUtilUnix.cpp | 2 +- src/lib/deskflow/unix/AppUtilUnix.h | 2 +- src/lib/deskflow/win32/AppUtilWindows.cpp | 4 ++-- src/lib/deskflow/win32/AppUtilWindows.h | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/apps/deskflow-core/deskflow-core.cpp b/src/apps/deskflow-core/deskflow-core.cpp index 5aa7c8179..70a08ccf6 100644 --- a/src/apps/deskflow-core/deskflow-core.cpp +++ b/src/apps/deskflow-core/deskflow-core.cpp @@ -89,10 +89,10 @@ int main(int argc, char **argv) if (parser.serverMode()) { ServerApp app(&events, processName); - return app.run(argc, argv); + return app.run(); } else if (parser.clientMode()) { ClientApp app(&events, processName); - return app.run(argc, argv); + return app.run(); } return s_exitSuccess; diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index 427b35d0b..6bafec9f7 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -62,7 +62,7 @@ App::~App() s_instance = nullptr; } -int App::run(int argc, char **argv) +int App::run() { #if MAC_OS_X_VERSION_10_7 // dock hide only supported on lion :( @@ -83,7 +83,7 @@ int App::run(int argc, char **argv) int result = s_exitFailed; try { - result = appUtil().run(argc, argv); + result = appUtil().run(); } catch (ExitAppException &e) { // instead of showing a nasty error, just exit with the error code. // not sure if i like this behaviour, but it's probably better than diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h index 81c3a3d88..97cab2e86 100644 --- a/src/lib/deskflow/App.h +++ b/src/lib/deskflow/App.h @@ -75,9 +75,8 @@ public: return m_appUtil; } - int run(int argc, char **argv); + int run(); int daemonMainLoop(int, const char **); - void setupFileLogging(); void loggingFilterWarning() const; void initApp() override; diff --git a/src/lib/deskflow/AppUtil.h b/src/lib/deskflow/AppUtil.h index ea340d306..38124e35f 100644 --- a/src/lib/deskflow/AppUtil.h +++ b/src/lib/deskflow/AppUtil.h @@ -34,7 +34,7 @@ public: } // Virtual Methods subclasses can impliment - virtual int run(int argc, char **argv) = 0; + virtual int run() = 0; virtual void startNode() = 0; virtual std::vector getKeyboardLayoutList() = 0; virtual std::string getCurrentLanguageCode() = 0; diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 15459472e..332cb47b5 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -31,7 +31,7 @@ int startStatic() return AppUtil::instance().app().start(); } -int AppUtilUnix::run(int argc, char **argv) +int AppUtilUnix::run() { return app().runInner(&startStatic); } diff --git a/src/lib/deskflow/unix/AppUtilUnix.h b/src/lib/deskflow/unix/AppUtilUnix.h index c230892df..06457c599 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.h +++ b/src/lib/deskflow/unix/AppUtilUnix.h @@ -19,7 +19,7 @@ public: explicit AppUtilUnix(const IEventQueue *); ~AppUtilUnix() override = default; - int run(int argc, char **argv) override; + int run() override; void startNode() override; std::vector getKeyboardLayoutList() override; std::string getCurrentLanguageCode() override; diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index a90f44a0d..20049f515 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -102,7 +102,7 @@ static int foregroundStartupStatic(int argc, char **argv) return AppUtil::instance().app().start(); } -int AppUtilWindows::run(int argc, char **argv) +int AppUtilWindows::run() { if (!IsWindowsXPSP3OrGreater()) { throw std::runtime_error("unsupported os version, xp sp3 or greater required"); @@ -121,7 +121,7 @@ int AppUtilWindows::run(int argc, char **argv) startup = &foregroundStartupStatic; } - return app().runInner(argc, argv, startup); + return app().runInner(startup); } AppUtilWindows &AppUtilWindows::instance() diff --git a/src/lib/deskflow/win32/AppUtilWindows.h b/src/lib/deskflow/win32/AppUtilWindows.h index 90b755fe0..fcc3e98fd 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.h +++ b/src/lib/deskflow/win32/AppUtilWindows.h @@ -36,7 +36,7 @@ public: int daemonNTStartup(); int daemonNTMainLoop(); - int run(int argc, char **argv) override; + int run() override; void exitApp(int code) override; void startNode() override; std::vector getKeyboardLayoutList() override;