changed translation api

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

4 files changed, 16 insertions, 38 deletions

diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp
index daedaf9f7..b733492b0 100644
--- a/src/plugins/Transports/http/httpinputfactory.cpp
+++ b/src/plugins/Transports/http/httpinputfactory.cpp
@@ -20,7 +20,6 @@
 
 #include <QtPlugin>
 #include <QMessageBox>
-#include <QTranslator>
 #include <curl/curlver.h>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
@@ -29,13 +28,14 @@
 
 const InputSourceProperties HTTPInputFactory::properties() const
 {
-    InputSourceProperties p;
-    p.protocols << "http" << "https";
-    p.name = tr("HTTP Plugin");
-    p.shortName = "http";
-    p.hasAbout = true;
-    p.hasSettings = true;
-    return p;
+    InputSourceProperties properties;
+    properties.protocols << "http" << "https";
+    properties.name = tr("HTTP Plugin");
+    properties.shortName = "http";
+    properties.translation = QLatin1String(":/http_plugin_");
+    properties.hasAbout = true;
+    properties.hasSettings = true;
+    return properties;
 }
 
 InputSource *HTTPInputFactory::create(const QString &url, QObject *parent)
@@ -56,11 +56,3 @@ void HTTPInputFactory::showAbout(QWidget *parent)
                         tr("Compiled against libcurl-%1").arg(LIBCURL_VERSION) + "\n" +
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *HTTPInputFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/http_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h
index 9aea98f09..7bd7f3bce 100644
--- a/src/plugins/Transports/http/httpinputfactory.h
+++ b/src/plugins/Transports/http/httpinputfactory.h
@@ -25,8 +25,6 @@
 #include <QStringList>
 #include <qmmp/inputsourcefactory.h>
 
-class QTranslator;
-
 /*!
  * @author Ilya Kotov <forkotov02@ya.ru>
  */
@@ -40,7 +38,6 @@ public:
     InputSource *create(const QString &url, QObject *parent = 0);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
 };
 
 #endif // HTTPINPUTFACTORY_H
diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp
index 2dc0c84bf..2257392b2 100644
--- a/src/plugins/Transports/mms/mmsinputfactory.cpp
+++ b/src/plugins/Transports/mms/mmsinputfactory.cpp
@@ -20,7 +20,6 @@
 
 #include <QtPlugin>
 #include <QMessageBox>
-#include <QTranslator>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "mmsinputsource.h"
@@ -28,13 +27,14 @@
 
 const InputSourceProperties MMSInputFactory::properties() const
 {
-    InputSourceProperties p;
-    p.protocols << "mms" << "mmsh" << "mmst" << "mmsu";
-    p.name = tr("MMS Plugin");
-    p.shortName = "mms";
-    p.hasAbout = true;
-    p.hasSettings = true;
-    return p;
+    InputSourceProperties properties;
+    properties.protocols << "mms" << "mmsh" << "mmst" << "mmsu";
+    properties.name = tr("MMS Plugin");
+    properties.shortName = "mms";
+    properties.translation = QLatin1String(":/mms_plugin_");
+    properties.hasAbout = true;
+    properties.hasSettings = true;
+    return properties;
 }
 
 InputSource *MMSInputFactory::create(const QString &url, QObject *parent)
@@ -54,11 +54,3 @@ void MMSInputFactory::showAbout(QWidget *parent)
                         tr("Qmmp MMS Transport Plugin")+"\n"+
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
-
-QTranslator *MMSInputFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/mms_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h
index 3b6e8576c..756d3ea19 100644
--- a/src/plugins/Transports/mms/mmsinputfactory.h
+++ b/src/plugins/Transports/mms/mmsinputfactory.h
@@ -25,8 +25,6 @@
 #include <QStringList>
 #include <qmmp/inputsourcefactory.h>
 
-class QTranslator;
-
 /*!
  * @author Ilya Kotov <forkotov02@ya.ru>
  */
@@ -40,7 +38,6 @@ public:
     InputSource *create(const QString &url, QObject *parent = 0);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
-    QTranslator *createTranslator(QObject *parent);
 };
 
 #endif // MMSINPUTFACTORY_H