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, 2 insertions, 20 deletions

diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
index 298ddfa72..f9f696397 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
@@ -19,7 +19,6 @@
 ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "qmmpfiledialogimpl.h"
@@ -69,6 +68,7 @@ const FileDialogProperties QmmpFileDialogFactory::properties() const
     FileDialogProperties properties;
     properties.name = tr("Qmmp File Dialog");
     properties.shortName = "qmmp_dialog";
+    properties.translation = QLatin1String(":/qmmp_file_dialog_plugin_");
     properties.hasAbout = true;
     properties.modal = false;
     return properties;
@@ -84,11 +84,3 @@ void QmmpFileDialogFactory::showAbout(QWidget *parent)
                         tr("Some code is copied from the Qt library"));
 
 }
-
-QTranslator *QmmpFileDialogFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/qmmp_file_dialog_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
index d0d0e5c26..3ccce93fa 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h
@@ -53,7 +53,6 @@ public:
     virtual FileDialog* create();
     virtual const FileDialogProperties properties() const;
     virtual void showAbout(QWidget*);
-    virtual QTranslator *createTranslator(QObject *parent);
     virtual ~QmmpFileDialogFactory()
     {
         ;
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
index 9d182189b..b5bd416a0 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp
@@ -19,7 +19,6 @@
 ***************************************************************************/
 
 #include <QtPlugin>
-#include <QTranslator>
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "twopanelfiledialogimpl.h"
@@ -68,6 +67,7 @@ const FileDialogProperties TwoPanelFileDialogFactory::properties() const
     properties.name = tr("Two-panel File Dialog");
     properties.shortName = "twopanel_dialog";
     properties.hasAbout = true;
+    properties.translation = QLatin1String(":/two_panel_file_dialog_plugin_");
     properties.modal = false;
     return properties;
 }
@@ -79,11 +79,3 @@ void TwoPanelFileDialogFactory::showAbout(QWidget *parent)
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>") + "\n" +
                         tr("Based on code from the Qt library"));
 }
-
-QTranslator *TwoPanelFileDialogFactory::createTranslator(QObject *parent)
-{
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/two_panel_file_dialog_plugin_") + locale);
-    return translator;
-}
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h
index 5cd2b7455..80e40a354 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h
@@ -60,7 +60,6 @@ public:
     FileDialog* create();
     const FileDialogProperties properties() const;
     void showAbout(QWidget*);
-    QTranslator *createTranslator(QObject *parent);
 };