changed translation api

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

18 files changed, 7 insertions, 78 deletions

diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp
index 784139055..d5529101b 100644
--- a/src/plugins/Output/alsa/outputalsafactory.cpp
+++ b/src/plugins/Output/alsa/outputalsafactory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
@@ -31,6 +30,7 @@ const OutputProperties OutputALSAFactory::properties() const
     OutputProperties properties;
     properties.name = tr("ALSA Plugin");
     properties.shortName = "alsa";
+    properties.translation = QLatin1String(":/alsa_plugin_");
     properties.hasAbout = true;
     properties.hasSettings = true;
     return properties;
@@ -58,11 +58,3 @@ void OutputALSAFactory::showAbout(QWidget *parent)
                         tr("Qmmp ALSA Output Plugin")+"\n"+
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *OutputALSAFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/alsa_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h
index 86fecd91a..873474687 100644
--- a/src/plugins/Output/alsa/outputalsafactory.h
+++ b/src/plugins/Output/alsa/outputalsafactory.h
@@ -42,8 +42,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
-
 };
 
 #endif
diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h
index fca83fd0a..94a07d9b7 100644
--- a/src/plugins/Output/directsound/outputdirectsound.h
+++ b/src/plugins/Output/directsound/outputdirectsound.h
@@ -21,7 +21,6 @@
 #ifndef OUTPUTDIRECTSOUND_H

 #define OUTPUTDIRECTSOUND_H

 

-#include <QTranslator>

 #include <stdio.h>

 #include <windows.h>

 #include <ksmedia.h>

diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 2f9e1c68f..1ef4f48fd 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "outputjack.h"
@@ -32,6 +31,7 @@ const OutputProperties OutputJACKFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.shortName = "jack";
+    properties.translation = QLatin1String(":/jack_plugin_");
     return properties;
 }
 
@@ -55,11 +55,3 @@ void OutputJACKFactory::showAbout(QWidget *parent)
                         tr("Qmmp Jack Output Plugin")+"\n"+
                         tr("Written by: Yuriy Zhuravlev <slalkerg@gmail.com>"));
 }
-
-QTranslator *OutputJACKFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/jack_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h
index 3edc54ba2..8deb7dbf5 100644
--- a/src/plugins/Output/jack/outputjackfactory.h
+++ b/src/plugins/Output/jack/outputjackfactory.h
@@ -42,8 +42,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
-
 };
 
 #endif
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index 2a7249165..590a9dfc9 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "outputnull.h"
@@ -32,6 +31,7 @@ const OutputProperties OutputNullFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.shortName = "null";
+    properties.translation = QLatin1String(":/null_plugin_");
     return properties;
 }
 
@@ -56,11 +56,3 @@ void OutputNullFactory::showAbout(QWidget *parent)
                         tr("Qmmp Null Output Plugin")+"\n"+
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *OutputNullFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/null_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h
index 645d37815..931c0f6a3 100644
--- a/src/plugins/Output/null/outputnullfactory.h
+++ b/src/plugins/Output/null/outputnullfactory.h
@@ -42,8 +42,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
-
 };
 
 #endif
diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp
index f4ed82d9f..6686d86c6 100644
--- a/src/plugins/Output/oss/outputossfactory.cpp
+++ b/src/plugins/Output/oss/outputossfactory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
@@ -36,6 +35,7 @@ const OutputProperties OutputOSSFactory::properties() const
     OutputProperties properties;
     properties.name = tr("OSS Plugin");
     properties.shortName = "oss";
+    properties.translation = QLatin1String(":/oss_plugin_");
     properties.hasAbout = true;
     properties.hasSettings = true;
     return properties;
@@ -59,11 +59,3 @@ QMessageBox::about (parent, tr("About OSS Output Plugin"),
                         tr("Written by: Yuriy Zhuravlev <slalkerg@gmail.com>")+"\n"+
                         tr("Based on code by: Brad Hughes <bhughes@trolltech.com>"));
 }
-
-QTranslator *OutputOSSFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/oss_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h
index 23f0b1b49..1a9ff7e36 100644
--- a/src/plugins/Output/oss/outputossfactory.h
+++ b/src/plugins/Output/oss/outputossfactory.h
@@ -42,7 +42,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
 };
 
 #endif
diff --git a/src/plugins/Output/oss4/outputoss4factory.cpp b/src/plugins/Output/oss4/outputoss4factory.cpp
index 76787e1aa..b3d0c7d33 100644
--- a/src/plugins/Output/oss4/outputoss4factory.cpp
+++ b/src/plugins/Output/oss4/outputoss4factory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 20e7af32c..da8d8f2d1 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "outputpulseaudio.h"
@@ -32,6 +31,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = false;
     properties.shortName = "pulse";
+    properties.translation = QLatin1String(":/pulseaudio_plugin_");
     return properties;
 }
 
@@ -56,11 +56,3 @@ void OutputPulseAudioFactory::showAbout(QWidget *parent)
                         tr("Qmmp PulseAudio Output Plugin")+"\n"+
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/pulseaudio_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
index 64eda4ae7..bfd4b07e9 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
@@ -43,8 +43,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
-
 };
 
 #endif
diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp
index 402617f96..070bd5f23 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp
@@ -22,7 +22,6 @@
 #include "settingsdialog.h"
 
 #include <QMessageBox>
-#include <QTranslator>
 #include <qmmp/qmmp.h>
 #include "outputqtmultimedia.h"
 
@@ -34,6 +33,7 @@ const OutputProperties OutputQtMultimediaFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.shortName = "qtmultimedia";
+    properties.translation = QLatin1String(":/qtmultimedia_plugin_");
     return properties;
 }
 
@@ -59,11 +59,3 @@ void OutputQtMultimediaFactory::showAbout(QWidget *parent)
                         tr("Qmmp Qt Multimedia Output Plugin")+"\n"+
                         tr("Written by: Ivan Ponomarev <ivantrue@gmail.com>"));
 }
-
-QTranslator *OutputQtMultimediaFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/qtmultimedia_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h
index 6a0a86ea4..ae109db28 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h
@@ -42,7 +42,6 @@ public:
     virtual Volume *createVolume();
     virtual void showSettings(QWidget* parent);
     virtual void showAbout(QWidget *parent);
-    virtual QTranslator *createTranslator(QObject *parent);
 };
 
 #endif
diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp
index c186e99cf..80e875ec6 100644
--- a/src/plugins/Output/shout/outputshoutfactory.cpp
+++ b/src/plugins/Output/shout/outputshoutfactory.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QMessageBox>
-#include <QTranslator>
 #include <QtPlugin>
 #include <QApplication>
 #include <qmmp/qmmp.h>
@@ -41,6 +40,7 @@ const OutputProperties OutputShoutFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.shortName = "shout";
+    properties.translation = QLatin1String(":/shout_plugin_");
     return properties;
 }
 
@@ -67,11 +67,3 @@ void OutputShoutFactory::showAbout(QWidget *parent)
                        tr("Compiled against libshout-%1").arg(shout_version(0,0,0))+"\n"+
                        tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *OutputShoutFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/shout_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h
index bd3683d02..f1288cd4a 100644
--- a/src/plugins/Output/shout/outputshoutfactory.h
+++ b/src/plugins/Output/shout/outputshoutfactory.h
@@ -42,7 +42,6 @@ public:
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
 
 private:
     ShoutClient *m_connection;
diff --git a/src/plugins/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp
index 196a8c2be..e3516ce72 100644
--- a/src/plugins/Output/wasapi/outputwasapifactory.cpp
+++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/

 

 #include <QMessageBox>

-#include <QTranslator>

 #include "settingsdialog.h"

 #include "outputwasapi.h"

 #include "outputwasapifactory.h"

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h
index 16675a27a..c8b992408 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.h
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.h
@@ -24,7 +24,6 @@
 #include <QString>

 #include <QIODevice>

 #include <QWidget>

-#include <QTranslator>

 #include <qmmp/output.h>

 #include <qmmp/outputfactory.h>