changed translation api

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

9 files changed, 8 insertions, 18 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index 3153fd6f6..fb40781a3 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QLocale>
 #include <QPair>
 #include <qmmp/soundcore.h>
@@ -63,10 +62,10 @@ const QString IncDecVolumeCommandLineOption::name() const
     return "IncDecVolumeCommandLineOption";
 }
 
-QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent)
+/*QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/incdecvolume_plugin_") + locale);
     return translator;
-}
+}*/
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
index ad734880d..49ff9939b 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h
@@ -38,7 +38,6 @@ public:
     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);
 };
 
 #endif
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 9f01bbca2..ccf774942 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QLocale>
 #include <qmmp/soundcore.h>
 #include <qmmpui/playlistmanager.h>
@@ -149,13 +148,13 @@ const QString PlayListOption::name() const
     return "PlayListOption";
 }
 
-QTranslator *PlayListOption::createTranslator(QObject *parent)
+/*QTranslator *PlayListOption::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/playlist_plugin_") + locale);
     return translator;
-}
+}*/
 
 QString PlayListOption::boolToText(bool enabled)
 {
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
index a255e095a..308a1ff77 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h
@@ -40,7 +40,6 @@ public:
     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);
 
 private:
     QString boolToText(bool enabled);
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index 0b0a0b0b2..29c70728f 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QLocale>
 #include <QRegExp>
 #include <qmmp/soundcore.h>
@@ -80,10 +79,10 @@ const QString SeekOption::name() const
     return "SeekOption";
 }
 
-QTranslator *SeekOption::createTranslator(QObject *parent)
+/*QTranslator *SeekOption::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/seek_plugin_") + locale);
     return translator;
-}
+}*/
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
index 4310b1e53..80113cd38 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
@@ -38,7 +38,6 @@ public:
     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);
 };
 
 #endif
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 96a26b9aa..02500be13 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QLocale>
 #include <QMap>
 #include <qmmp/soundcore.h>
@@ -110,13 +109,13 @@ const QString StatusOption::name() const
     return "StatusOption";
 }
 
-QTranslator *StatusOption::createTranslator(QObject *parent)
+/*QTranslator *StatusOption::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/status_plugin_") + locale);
     return translator;
-}
+}*/
 
 QString StatusOption::genProgressBar()
 {
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
index 1764aa136..1cf69db67 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h
@@ -27,7 +27,6 @@
 #include <qmmpui/commandlineoption.h>
 #include <qmmpui/commandlinemanager.h>
 
-
 /**
     @author Ilya Kotov <forkotov02@ya.ru>
 */
@@ -41,7 +40,6 @@ public:
     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);
 
 private:
     QString genProgressBar();
diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
index a4a096f1b..f6efb4e57 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
+++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QLocale>
 #include <QApplication>
 #include <qmmpui/winfileassoc.h>