fixed win32 build

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

8 files changed, 23 insertions, 43 deletions

diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
index f6efb4e57..0f5886d37 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
+++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
@@ -25,6 +25,14 @@
 #include <qmmp/metadatamanager.h>
 #include "uninstalloption.h"
 
+CommandLineProperties UninstallOption::properties() const
+{
+    CommandLineProperties properties;
+    properties.shortName = "UninstallOption";
+    properties.helpString <<QString("--uninstall") + "||" + tr("Restore the old file associations and clean up the registry");
+    return properties;
+}
+
 bool UninstallOption::identify(const QString &str) const
 {
     QStringList opts;
@@ -32,12 +40,6 @@ bool UninstallOption::identify(const QString &str) const
     return opts.contains(str);
 }
 
-const QStringList UninstallOption::helpString() const
-{
-    return QStringList()
-            << QString("--uninstall") + "||" + tr("Restore the old file associations and clean up the registry");
-}
-
 QString UninstallOption::executeCommand(const QString &opt_str, const QStringList &args)
 {
     Q_UNUSED(args);
@@ -58,15 +60,7 @@ QString UninstallOption::executeCommand(const QString &opt_str, const QStringLis
     return QString();
 }
 
-const QString UninstallOption::name() const
-{
-    return "UninstallOption";
-}
-
-QTranslator *UninstallOption::createTranslator(QObject *parent)
+QString UninstallOption::translation() const
 {
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/uninstall_plugin_") + locale);
-    return translator;
+    return QLatin1String(":/uninstall_plugin_");
 }
diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
index 21eb302a2..b186d3885 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
+++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h
@@ -36,13 +36,10 @@ Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0")
 Q_INTERFACES(CommandLineOption)
 public:
+    virtual CommandLineProperties properties() 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);
-
-
+    virtual QString translation() const;
 };
 
 #endif
diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp
index 81acc8426..e6a0b0884 100644
--- a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp
+++ b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp
@@ -51,15 +51,10 @@ void OutputDirectSoundFactory::showAbout(QWidget *parent)
 {

    QMessageBox::about (parent, tr("About DirectSound Output Plugin"),

                         tr("Qmmp DirectSound Output Plugin")+"\n"+

-                        tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));

+                       tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));

 }

 

-QTranslator *OutputDirectSoundFactory::createTranslator(QObject *parent)

+QString OutputDirectSoundFactory::translation() const

 {

-    QTranslator *translator = new QTranslator(parent);

-    QString locale = Qmmp::systemLanguageID();

-    translator->load(QString(":/directsound_plugin_") + locale);

-    return translator;

+    return QLatin1String(":/directsound_plugin_");

 }

-

-

diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.h b/src/plugins/Output/directsound/outputdirectsoundfactory.h
index 72090c4e5..1c355d526 100644
--- a/src/plugins/Output/directsound/outputdirectsoundfactory.h
+++ b/src/plugins/Output/directsound/outputdirectsoundfactory.h
@@ -39,7 +39,7 @@ public:
     Volume *createVolume();

     void showSettings(QWidget* parent);

     void showAbout(QWidget *parent);

-    QTranslator *createTranslator(QObject *parent);

+    QString translation() const;

 };

 

 #endif

diff --git a/src/plugins/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp
index b4297e669..24a21e79b 100644
--- a/src/plugins/Output/wasapi/outputwasapifactory.cpp
+++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp
@@ -53,13 +53,10 @@ void OutputWASAPIFactory::showAbout(QWidget *parent)
 {

    QMessageBox::about (parent, tr("About WASAPI Output Plugin"),

                         tr("Qmmp WASAPI Output Plugin")+"\n"+

-                        tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));

+                       tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));

 }

 

-QTranslator *OutputWASAPIFactory::createTranslator(QObject *parent)

+QString OutputWASAPIFactory::translation() const

 {

-    QTranslator *translator = new QTranslator(parent);

-    QString locale = Qmmp::systemLanguageID();

-    translator->load(QString(":/wasapi_plugin_") + locale);

-    return translator;

+    return QLatin1String(":/wasapi_plugin_");

 }

diff --git a/src/plugins/Output/wasapi/outputwasapifactory.h b/src/plugins/Output/wasapi/outputwasapifactory.h
index 5ff92b910..7c3a818f9 100644
--- a/src/plugins/Output/wasapi/outputwasapifactory.h
+++ b/src/plugins/Output/wasapi/outputwasapifactory.h
@@ -39,7 +39,7 @@ public:
     Volume *createVolume();

     void showSettings(QWidget* parent);

     void showAbout(QWidget *parent);

-    QTranslator *createTranslator(QObject *parent);

+    QString translation() const;

 };

 

 #endif

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index 14140c428..85e4744f4 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -63,12 +63,9 @@ void OutputWaveOutFactory::showAbout(QWidget *parent)
                         tr("Based on aacDECdrop player"));

 }

 

-QTranslator *OutputWaveOutFactory::createTranslator(QObject *parent)

+QString OutputWaveOutFactory::translation() const

 {

-    QTranslator *translator = new QTranslator(parent);

-    QString locale = Qmmp::systemLanguageID();

-    translator->load(QString(":/waveout_plugin_") + locale);

-    return translator;

+    return QLatin1String(":/waveout_plugin_");

 }

 

 

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h
index 8867cf151..7d4d55f6b 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.h
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.h
@@ -40,7 +40,7 @@ public:
     Volume *createVolume();

     void showSettings(QWidget* parent);

     void showAbout(QWidget *parent);

-    QTranslator *createTranslator(QObject *parent);

+    QString translation() const;

 };

 

 #endif