From de6375151610402d695c8404a14d75b02d05d415 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 10 Nov 2025 13:43:41 -0500 Subject: [PATCH] refactor: CoreArgParser use kCoreBinName in place of class created static --- src/apps/deskflow-core/CoreArgParser.cpp | 7 +++---- src/apps/deskflow-core/CoreArgParser.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/apps/deskflow-core/CoreArgParser.cpp b/src/apps/deskflow-core/CoreArgParser.cpp index af3e74a6b..60b035b8e 100644 --- a/src/apps/deskflow-core/CoreArgParser.cpp +++ b/src/apps/deskflow-core/CoreArgParser.cpp @@ -13,8 +13,7 @@ #include "common/Settings.h" #include "deskflow/ProtocolTypes.h" -const QString CoreArgParser::s_appName = QStringLiteral("%1-core").arg(kAppId); -const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(s_appName, kDisplayVersion); +const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(kCoreBinName, kDisplayVersion); CoreArgParser::CoreArgParser(const QStringList &args) { @@ -26,7 +25,7 @@ CoreArgParser::CoreArgParser(const QStringList &args) m_parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions); m_parser.parse(args); - m_helpText = m_parser.helpText().replace("", s_appName); + m_helpText = m_parser.helpText().replace("", kCoreBinName); m_helpText.replace("[options] coremode", "coremode [options]"); } @@ -67,7 +66,7 @@ QString CoreArgParser::versionText() const { const static auto vString = QStringLiteral("%1 v%2, protocol v%3.%4\n%5\n"); return vString.arg( - s_appName, kDisplayVersion, QString::number(kProtocolMajorVersion), QString::number(kProtocolMinorVersion), + kCoreBinName, kDisplayVersion, QString::number(kProtocolMajorVersion), QString::number(kProtocolMinorVersion), kCopyright ); } diff --git a/src/apps/deskflow-core/CoreArgParser.h b/src/apps/deskflow-core/CoreArgParser.h index 025c5e50a..45b7bc32c 100644 --- a/src/apps/deskflow-core/CoreArgParser.h +++ b/src/apps/deskflow-core/CoreArgParser.h @@ -40,6 +40,5 @@ private: QString m_helpText; bool m_clientMode = false; bool m_serverMode = false; - static const QString s_appName; static const QString s_headerText; };