From f3a13ee3e2e3968e69ce719b7f798f7d39d761b7 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 29 Dec 2018 21:14:50 +0000 Subject: added -v and -h command line options git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8536 90c681e8-e032-0410-971d-27865f9a5e38 --- src/app/builtincommandlineoption.cpp | 4 +--- src/app/builtincommandlineoption.h | 3 +-- src/app/qmmpstarter.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/app') diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp index ed02c2b1f..919ab6df4 100644 --- a/src/app/builtincommandlineoption.cpp +++ b/src/app/builtincommandlineoption.cpp @@ -87,9 +87,7 @@ const QStringList BuiltinCommandLineOption::helpString() const << QString("--add-dir") + "||" + tr("Display Add Directory dialog"); } -QString BuiltinCommandLineOption::executeCommand(const QString &option_string, - const QStringList &args, - const QString &cwd) +QString BuiltinCommandLineOption::executeCommand(const QString &option_string, const QStringList &args, const QString &cwd) { SoundCore *core = SoundCore::instance(); MediaPlayer *player = MediaPlayer::instance(); diff --git a/src/app/builtincommandlineoption.h b/src/app/builtincommandlineoption.h index 43bc4abdd..9121ebf76 100644 --- a/src/app/builtincommandlineoption.h +++ b/src/app/builtincommandlineoption.h @@ -44,8 +44,7 @@ public: bool identify(const QString& str) const; const QStringList helpString() const; - QString executeCommand(const QString& option, const QStringList &args, - const QString &cwd); + QString executeCommand(const QString &option, const QStringList &args, const QString &cwd); QHash splitArgs(const QStringList &args) const; private slots: diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 2c7af2b89..323edc049 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -74,13 +74,13 @@ QMMPStarter::QMMPStarter() : QObject() argString = tmp.join("|||"); QHash commands = m_option_manager->splitArgs(tmp); - if(commands.keys().contains("--help")) + if(commands.keys().contains("--help") || commands.keys().contains("-h")) { printUsage(); m_finished = true; return; } - if(commands.keys().contains("--version")) + if(commands.keys().contains("--version") || commands.keys().contains("-v")) { printVersion(); m_finished = true; @@ -403,8 +403,8 @@ void QMMPStarter::printUsage() extraHelp << QString("--ui ") + "||" + tr("Start qmmp with the specified user interface"); extraHelp << QString("--ui-list") + "||" + tr("List all available user interfaces"); extraHelp << QString("--no-start") + "||" + tr("Don't start the application"); - extraHelp << QString("--help") + "||" + tr("Display this text and exit"); - extraHelp << QString("--version") + "||" + tr("Print version number and exit"); + extraHelp << QString("-h, --help") + "||" + tr("Display this text and exit"); + extraHelp << QString("-v, --version") + "||" + tr("Print version number and exit"); extraHelp << ""; extraHelp << tr("Home page: %1").arg("http://qmmp.ylsoftware.com"); extraHelp << tr("Development page: %1").arg("https://sourceforge.net/p/qmmp-dev"); -- cgit v1.2.3-13-gbd6f