refactor: App::ParseArgs remove all unneeed arguments

This commit is contained in:
sithlord48
2025-09-25 22:52:29 -04:00
committed by Chris Rizzitello
parent 5978694d95
commit 59d860874e
7 changed files with 8 additions and 46 deletions

View File

@ -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)

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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();

View File

@ -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;