From 1b44a24d75bc69010c62813bc0a8f3bd3f880c70 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 30 Sep 2025 16:36:39 -0400 Subject: [PATCH] refactor: IApp::initApp remove unused args --- src/lib/deskflow/App.cpp | 2 +- src/lib/deskflow/App.h | 7 ++----- src/lib/deskflow/ClientApp.cpp | 2 +- src/lib/deskflow/IApp.h | 2 +- src/lib/deskflow/ServerApp.cpp | 2 +- src/lib/deskflow/win32/AppUtilWindows.cpp | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index ec48d978d..427b35d0b 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -138,7 +138,7 @@ void App::loggingFilterWarning() const } } -void App::initApp(int argc, const char **argv) +void App::initApp() { parseArgs(); diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h index b3a461bb6..ba233ebc1 100644 --- a/src/lib/deskflow/App.h +++ b/src/lib/deskflow/App.h @@ -79,11 +79,8 @@ public: int daemonMainLoop(int, const char **); void setupFileLogging(); void loggingFilterWarning() const; - void initApp(int argc, const char **argv) override; - void initApp(int argc, char **argv) - { - initApp(argc, (const char **)argv); - } + void initApp() override; + void setEvents(EventQueue &events) { m_events = &events; diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index 8fdc459fc..88062dd3a 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -361,7 +361,7 @@ static int daemonMainLoopStatic(int argc, const char **argv) int ClientApp::start(int argc, char **argv) { - initApp(argc, argv); + initApp(); return mainLoop(); } diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h index e2ac5d4ac..d0d9a8a83 100644 --- a/src/lib/deskflow/IApp.h +++ b/src/lib/deskflow/IApp.h @@ -26,7 +26,7 @@ public: virtual void startNode() = 0; virtual void bye(int error) = 0; virtual int mainLoop() = 0; - virtual void initApp(int argc, const char **argv) = 0; + virtual void initApp() = 0; virtual const char *daemonName() const = 0; virtual deskflow::Screen *createScreen() = 0; virtual IEventQueue *getEvents() const = 0; diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index fca3d06bd..3a2d7f43f 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -629,7 +629,7 @@ int daemonMainLoopStatic(int argc, const char **argv) int ServerApp::start(int argc, char **argv) { - initApp(argc, argv); + initApp(); return mainLoop(); } diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index 6cef4d8d4..ca56ac5fa 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -62,7 +62,7 @@ static int mainLoopStatic() int AppUtilWindows::daemonNTMainLoop(int argc, const char **argv) { - app().initApp(argc, argv); + app().initApp(); return ArchMiscWindows::runDaemon(mainLoopStatic); }