changed command line api

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7069 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 7552c1a43..e9500f974 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -33,14 +33,13 @@ bool StatusOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QString StatusOption::helpString() const
+const QStringList StatusOption::helpString() const
 {
-    QString help;
-    help += QString("--status                 ") + tr("Print playback status") + "\n";
-    help += QString("--nowplaying <fmt>       ")
-            + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")") + "\n";
-    help += QString("--nowplaying-syntax      ") + tr("Print --nowplaying syntax") + "\n";
-    return  help;
+    return QStringList()
+            << QString("--status") + "||" + tr("Print playback status")
+            << QString("--nowplaying <fmt>") + "||"
+               + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")")
+            << QString("--nowplaying-syntax") + "||" + tr("Print --nowplaying syntax");
 }
 
 QString StatusOption::executeCommand(const QString &opt_str, const QStringList &args)
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index 7d9662b46..93fd91e51 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,9 +36,9 @@ class StatusOption : public QObject, public CommandLineOption
 Q_OBJECT
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual bool identify(const QString& opt_str)const;
-    virtual const QString name()const;
-    virtual const QString helpString()const;
+    virtual bool identify(const QString& opt_str) const;
+    virtual const QString name() const;
+    virtual const QStringList helpString() const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
     virtual QTranslator *createTranslator(QObject *parent);