refactor: CoreArgParser use kCoreBinName in place of class created static
This commit is contained in:
@ -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("<executable_name>", s_appName);
|
||||
m_helpText = m_parser.helpText().replace("<executable_name>", 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
|
||||
);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user