changed translation api again

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

8 files changed, 32 insertions, 12 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index 8f594eddf..d901458ca 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -24,11 +24,10 @@
 #include <qmmp/soundcore.h>
 #include "incdecvolumeoption.h"
 
-const CommandLineProperties IncDecVolumeCommandLineOption::properties() const
+CommandLineProperties IncDecVolumeCommandLineOption::properties() const
 {
     CommandLineProperties properties;
     properties.shortName = "IncDecVolumeCommandLineOption";
-    properties.translation = QLatin1String(":/incdecvolume_plugin_");
     properties.helpString << QString("--volume-inc") + "||" + tr("Increase volume by 5 steps")
                           << QString("--volume-dec") + "||" + tr("Decrease volume by 5 steps");
     return properties;
@@ -53,3 +52,8 @@ QString IncDecVolumeCommandLineOption::executeCommand(const QString& opt_str, co
 
     return QString();
 }
+
+QString IncDecVolumeCommandLineOption::translation() const
+{
+    return QLatin1String(":/incdecvolume_plugin_");
+}
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
index 98c869fe7..95196944c 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
@@ -34,9 +34,10 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual const CommandLineProperties properties() const;
+    virtual CommandLineProperties properties() const;
     virtual bool identify(const QString& opt_str) const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
+    virtual QString translation() const;
 };
 
 #endif
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 17156c4c8..cc0ff7cf0 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -28,11 +28,10 @@
 #include <qmmpui/commandlinemanager.h>
 #include "playlistoption.h"
 
-const CommandLineProperties PlayListOption::properties() const
+CommandLineProperties PlayListOption::properties() const
 {
     CommandLineProperties properties;
     properties.shortName = "PlayListOption";
-    properties.translation = QLatin1String(":/playlist_plugin_");
     properties.helpString << QString("--pl-help") + "||" + tr("Show playlist manipulation commands");
     return properties;
 }
@@ -146,6 +145,11 @@ QString PlayListOption::executeCommand(const QString& opt_str, const QStringList
     return out;
 }
 
+QString PlayListOption::translation() const
+{
+    return QLatin1String(":/playlist_plugin_");
+}
+
 QString PlayListOption::boolToText(bool enabled)
 {
     return QString(enabled ? "[+]" : "[-]");
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
index bb0e13570..22d67d048 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
@@ -36,9 +36,10 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual const CommandLineProperties properties() const;
+    virtual CommandLineProperties properties() const;
     virtual bool identify(const QString& opt_str) const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
+    virtual QString translation() const;
 
 private:
     QString boolToText(bool enabled);
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index ed367fd9f..7072e6e60 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -24,11 +24,10 @@
 #include <qmmp/soundcore.h>
 #include "seekoption.h"
 
-const CommandLineProperties SeekOption::properties() const
+CommandLineProperties SeekOption::properties() const
 {
     CommandLineProperties properties;
     properties.shortName = "SeekOption";
-    properties.translation = QLatin1String(":/seek_plugin_");
     properties.helpString << QString("--seek <time>") + "||" + tr("Seek to position in the current track")
                           << QString("--seek-fwd <time>") + "||" + tr("Seek forward")
                           << QString("--seek-bwd <time>") + "||" + tr("Seek backwards");
@@ -76,3 +75,8 @@ QString SeekOption::executeCommand(const QString &opt_str, const QStringList &ar
         return QString();
     return QString();
 }
+
+QString SeekOption::translation() const
+{
+    return QLatin1String(":/seek_plugin_");
+}
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
index 24bc608e3..c4bcafaae 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
@@ -34,9 +34,10 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual const CommandLineProperties properties() const;
+    virtual CommandLineProperties properties() const;
     virtual bool identify(const QString &opt_str) const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
+    virtual QString translation() const;
 };
 
 #endif
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index cb19b4efc..a536daa6b 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -25,11 +25,10 @@
 #include <qmmpui/metadataformatter.h>
 #include "statusoption.h"
 
-const CommandLineProperties StatusOption::properties() const
+CommandLineProperties StatusOption::properties() const
 {
     CommandLineProperties properties;
     properties.shortName = "StatusOption";
-    properties.translation = QLatin1String(":/status_plugin_");
     properties.helpString << QString("--status") + "||" + tr("Print playback status")
                           << QString("--nowplaying <fmt>") + "||"
                              + tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")")
@@ -107,6 +106,11 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
     return out;
 }
 
+QString StatusOption::translation() const
+{
+    return QLatin1String(":/status_plugin_");
+}
+
 QString StatusOption::genProgressBar()
 {
     SoundCore *core = SoundCore::instance();
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index d161d29be..0dd83c919 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -36,9 +36,10 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
-    virtual const CommandLineProperties properties() const;
+    virtual CommandLineProperties properties() const;
     virtual bool identify(const QString& opt_str) const;
     virtual QString executeCommand(const QString& opt_str, const QStringList &args);
+    virtual QString translation() const;
 
 private:
     QString genProgressBar();