fixed regression

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

10 files changed, 10 insertions, 9 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index 86997ee6a..a5967ae4b 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -24,7 +24,7 @@
 #include <qmmp/soundcore.h>
 #include "incdecvolumeoption.h"
 
-IncDecVolumeCommandLineOption::IncDecVolumeCommandLineOption()
+void IncDecVolumeCommandLineOption::registerOprions()
 {
     registerOption(VOLUME_UP, "--volume-inc", tr("Increase volume by 5 steps"));
     registerOption(VOLUME_DOWN, "--volume-dec", tr("Decrease volume by 5 steps"));
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
index 172e9b5c6..c2bd683cf 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
@@ -34,7 +34,7 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0")
 Q_INTERFACES(CommandLineHandler)
 public:
-    IncDecVolumeCommandLineOption();
+    void registerOprions();
     QString shortName() const;
     QString translation() const;
     QString executeCommand(int id, const QStringList &args);
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 8906e7ea2..d764c6841 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -28,7 +28,7 @@
 #include <qmmpui/commandlinemanager.h>
 #include "playlistoption.h"
 
-PlayListOption::PlayListOption()
+void PlayListOption::registerOprions()
 {
     registerOption(PL_HELP, "--pl-help", tr("Show playlist manipulation commands"));
     registerOption(PL_LIST, "--pl-list", tr("List all available playlists"));
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
index de6d35ae4..b4181e7aa 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
@@ -36,7 +36,7 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0")
 Q_INTERFACES(CommandLineHandler)
 public:
-    PlayListOption();
+    void registerOprions();
     QString shortName() const;
     QString translation() const;
     QString executeCommand(int id, const QStringList &args);
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index 89296c2ea..5515798ed 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -24,7 +24,7 @@
 #include <qmmp/soundcore.h>
 #include "seekoption.h"
 
-SeekOption::SeekOption()
+void SeekOption::registerOprions()
 {
     registerOption(SEEK, "--seek", tr("Seek to position in the current track"), QStringList() << "time");
     registerOption(SEEK_FWD, "--seek-fwd", tr("Seek forward"), QStringList() << "time");
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
index 104f1b146..276f2a1ab 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
@@ -34,7 +34,7 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0")
 Q_INTERFACES(CommandLineHandler)
 public:
-    SeekOption();
+    void registerOprions();
     QString shortName() const;
     QString translation() const;
     QString executeCommand(int id, const QStringList &args);
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 8c729c5d3..575168048 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -25,8 +25,7 @@
 #include <qmmpui/metadataformatter.h>
 #include "statusoption.h"
 
-
-StatusOption::StatusOption()
+void StatusOption::registerOprions()
 {
     registerOption(STATUS, "--status", tr("Print playback status"));
     registerOption(NOW_PLAYING, "--nowplaying", tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")"),
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index 85171de3e..ebe933899 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -36,7 +36,7 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineHandlerInterface.1.0")
 Q_INTERFACES(CommandLineHandler)
 public:
-    StatusOption();
+    void registerOprions();
     QString shortName() const;
     QString translation() const;
     QString executeCommand(int id, const QStringList &args);
diff --git a/src/qmmpui/commandlinehandler.h b/src/qmmpui/commandlinehandler.h
index 238f65afe..78e2262ed 100644
--- a/src/qmmpui/commandlinehandler.h
+++ b/src/qmmpui/commandlinehandler.h
@@ -43,6 +43,7 @@ public:
      * Object destructor
      */
     virtual ~CommandLineHandler() {}
+    virtual void registerOprions() = 0;
     /*!
      * Returns command line plugin short name for internal usage.
      * Subclass should reimplement this function.
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index f91510f5e..1c56e7db4 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -67,6 +67,7 @@ void CommandLineManager::checkOptions()
                     translator->load(option->translation() + Qmmp::systemLanguageID());
                     qApp->installTranslator(translator);
                 }
+                option->registerOprions();
             }
         }
     }