From 59d860874ef80f8f7c2a0fcefa8ba40bafd4817b Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Thu, 25 Sep 2025 22:52:29 -0400
Subject: [PATCH] refactor: App::ParseArgs remove all unneeed arguments

---
 src/apps/deskflow-core/deskflow-core.cpp |  7 +-----
 src/lib/deskflow/App.cpp                 |  4 ++--
 src/lib/deskflow/App.h                   |  3 +--
 src/lib/deskflow/ClientApp.cpp           | 27 +-----------------------
 src/lib/deskflow/ClientApp.h             |  3 +--
 src/lib/deskflow/ServerApp.cpp           |  7 +-----
 src/lib/deskflow/ServerApp.h             |  3 +--
 7 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/src/apps/deskflow-core/deskflow-core.cpp b/src/apps/deskflow-core/deskflow-core.cpp
index 52e941498..5f78a4e05 100644
--- a/src/apps/deskflow-core/deskflow-core.cpp
+++ b/src/apps/deskflow-core/deskflow-core.cpp
@@ -26,12 +26,7 @@
 
 void showHelp(const CoreArgParser &parser)
 {
-  QTextStream(stdout) << parser.helpText() << "\n";
-  ServerApp sApp(nullptr);
-  sApp.help();
-
-  ClientApp cApp(nullptr);
-  cApp.help();
+  QTextStream(stdout) << parser.helpText();
 }
 
 int main(int argc, char **argv)
diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 601de3273..f5f1ffd99 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -160,10 +160,10 @@ void App::initApp(int argc, const char **argv)
   if (!configFilename.empty()) {
     Config config(configFilename, configSection());
     if (config.load(argv[0])) {
-      parseArgs(config.argc(), config.argv());
+      parseArgs();
     }
   } else {
-    parseArgs(argc, argv);
+    parseArgs();
   }
 
   // set log filter
diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h
index 2cd655d61..b3a461bb6 100644
--- a/src/lib/deskflow/App.h
+++ b/src/lib/deskflow/App.h
@@ -51,8 +51,7 @@ public:
   App &operator=(App const &) = delete;
   App &operator=(App &&) = delete;
 
-  virtual void help() = 0;
-  virtual void parseArgs(int argc, const char *const *argv) = 0;
+  virtual void parseArgs() = 0;
   virtual void loadConfig() = 0;
   virtual bool loadConfig(const std::string &pathname) = 0;
   virtual const char *daemonInfo() const = 0;
diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index e69b17ba4..8fdc459fc 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -65,7 +65,7 @@ ClientApp::ClientApp(IEventQueue *events, const QString &processName) : App(even
   // do nothing
 }
 
-void ClientApp::parseArgs(int, const char *const *)
+void ClientApp::parseArgs()
 {
   // save server address
   if (!Settings::value(Settings::Client::RemoteHost).isNull()) {
@@ -87,31 +87,6 @@ void ClientApp::parseArgs(int, const char *const *)
   }
 }
 
-void ClientApp::help()
-{
-  std::stringstream help;
-  help << "\n\nClient Mode:\n\n"
-       << "Usage: " << kAppId << "-core client"
-       << " [--sync-language]"
-       << " [--invert-scroll]"
-       << " <server-address>"
-       << "\n\n"
-       << "Connect to a " << kAppName << " mouse/keyboard sharing server.\n"
-       << "      --sync-language      enable language synchronization.\n"
-       << "      --invert-scroll      invert scroll direction on this\n"
-       << "                             computer.\n"
-       << s_helpVersionArgs << "\n"
-
-       << s_helpNoWayland
-
-       << "\n"
-       << "The server address is of the form: [<hostname>][:<port>].\n"
-       << "The hostname must be the address or hostname of the server.\n"
-       << "The port overrides the default port, " << kDefaultPort << ".\n";
-
-  LOG_PRINT("%s", help.str().c_str());
-}
-
 const char *ClientApp::daemonName() const
 {
 #if SYSAPI_WIN32
diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h
index e910782d0..5e2945e98 100644
--- a/src/lib/deskflow/ClientApp.h
+++ b/src/lib/deskflow/ClientApp.h
@@ -31,8 +31,7 @@ public:
   // IApp overrides
   //
 
-  void parseArgs(int, const char *const *) override;
-  void help() override;
+  void parseArgs() override;
   const char *daemonName() const override;
   const char *daemonInfo() const override;
   void loadConfig() override
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index 7424a1d86..fca3d06bd 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -73,7 +73,7 @@ ServerApp::ServerApp(IEventQueue *events, const QString &processName) : App(even
   // do nothing
 }
 
-void ServerApp::parseArgs(int, const char *const *)
+void ServerApp::parseArgs()
 {
   if (const auto address = Settings::value(Settings::Core::Interface).toString(); !address.isEmpty()) {
     try {
@@ -86,11 +86,6 @@ void ServerApp::parseArgs(int, const char *const *)
   }
 }
 
-void ServerApp::help()
-{
-  // do-nothing
-}
-
 void ServerApp::reloadSignalHandler(Arch::ThreadSignal, void *)
 {
   IEventQueue *events = App::instance().getEvents();
diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h
index c7900c129..06ea332d2 100644
--- a/src/lib/deskflow/ServerApp.h
+++ b/src/lib/deskflow/ServerApp.h
@@ -55,8 +55,7 @@ public:
   // IApp overrides
   //
 
-  void parseArgs(int, const char *const *) override;
-  void help() override;
+  void parseArgs() override;
   const char *daemonName() const override;
   const char *daemonInfo() const override;
   void loadConfig() override;