From 2acc96c8b80271d1ae4b8cb91db0dfafe8950829 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 24 Feb 2010 16:34:22 +0100
Subject: [PATCH] tr()-Fixes.
---
.../projectexplorer/buildsettingspropertiespage.cpp | 6 +++---
src/plugins/projectexplorer/dependenciespanel.cpp | 4 ++--
.../projectexplorer/editorsettingspropertiespage.cpp | 4 ++--
.../projectexplorer/runsettingspropertiespage.cpp | 6 +++---
.../components/integration/xuifiledialog.cpp | 11 ++++++-----
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 4727f074857..dc9d95596c8 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -40,7 +40,7 @@
#include <QtCore/QMargins>
#include <QtCore/QTimer>
-#include <QtGui/QApplication>
+#include <QtCore/QCoreApplication>
#include <QtGui/QComboBox>
#include <QtGui/QInputDialog>
#include <QtGui/QLabel>
@@ -62,7 +62,7 @@ QString BuildSettingsPanelFactory::id() const
QString BuildSettingsPanelFactory::displayName() const
{
- return QApplication::tr("Build Settings");
+ return QCoreApplication::translate("BuildSettingsPanelFactory", "Build Settings");
}
bool BuildSettingsPanelFactory::supports(Project *project)
@@ -105,7 +105,7 @@ BuildSettingsPanel::~BuildSettingsPanel()
QString BuildSettingsPanel::displayName() const
{
- return QApplication::tr("Build Settings");
+ return QCoreApplication::translate("BuildSettingsPanel", "Build Settings");
}
QWidget *BuildSettingsPanel::widget() const
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index f33b1cf030c..b930fd5eb53 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -270,7 +270,7 @@ DependenciesPanel::~DependenciesPanel()
QString DependenciesPanel::displayName() const
{
- return QApplication::tr("Dependencies");
+ return QCoreApplication::translate("DependenciesPanel", "Dependencies");
}
QWidget *DependenciesPanel::widget() const
@@ -299,7 +299,7 @@ QString DependenciesPanelFactory::id() const
QString DependenciesPanelFactory::displayName() const
{
- return QApplication::tr("Dependencies");
+ return QCoreApplication::translate("DependenciesPanelFactory", "Dependencies");
}
bool DependenciesPanelFactory::supports(Project *project)
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index 5c58468552f..a2566a2a14d 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -45,7 +45,7 @@ QString EditorSettingsPanelFactory::id() const
QString EditorSettingsPanelFactory::displayName() const
{
- return QApplication::tr("Editor Settings");
+ return QCoreApplication::translate("EditorSettingsPanelFactory", "Editor Settings");
}
bool EditorSettingsPanelFactory::supports(Project *project)
@@ -84,7 +84,7 @@ EditorSettingsPanel::~EditorSettingsPanel()
QString EditorSettingsPanel::displayName() const
{
- return QApplication::tr("Editor Settings");
+ return QCoreApplication::translate("EditorSettingsPanel", "Editor Settings");
}
QWidget *EditorSettingsPanel::widget() const
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 907583a32ba..51cb60ed70d 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -100,7 +100,7 @@ QString RunSettingsPanelFactory::id() const
QString RunSettingsPanelFactory::displayName() const
{
- return QApplication::tr("Run Settings");
+ return QCoreApplication::tr("RunSettingsPanelFactory", "Run Settings");
}
bool RunSettingsPanelFactory::supports(Project *project)
@@ -142,7 +142,7 @@ RunSettingsPanel::~RunSettingsPanel()
QString RunSettingsPanel::displayName() const
{
- return QApplication::tr("Run Settings");
+ return QCoreApplication::translate("RunSettingsPanel", "Run Settings");
}
QWidget *RunSettingsPanel::widget() const
@@ -192,7 +192,7 @@ QVariant RunConfigurationsModel::data(const QModelIndex &index, int role) const
if (row < m_runConfigurations.size()) {
RunConfiguration *rc = m_runConfigurations.at(row);
if (rc == m_activeRunConfiguration)
- return tr("%1 (Active)").arg(rc->displayName());
+ return QCoreApplication::translate("RunConfigurationsModel", "%1 (Active)").arg(rc->displayName());
return rc->displayName();
}
}
diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
index 720ef5403f8..8308ba100e8 100644
--- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
+++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
@@ -27,9 +27,10 @@
**
**************************************************************************/
-#include <QDebug>
+#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QObject>
+#include <QtCore/QCoreApplication>
#include "xuifiledialog.h"
@@ -41,7 +42,7 @@ void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObj
if (dir.isNull())
dir = XUIFileDialog::defaultFolder();
- QString caption = QObject::tr("Open file", "XUIFileDialog::runOpenFileDialog");
+ QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open file");
QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;"), 0, QFileDialog::ReadOnly);
QmlDesigner::Internal::SignalEmitter emitter;
@@ -63,7 +64,7 @@ void XUIFileDialog::runSaveFileDialog(const QString& path, QWidget* parent, QObj
dialog->setDirectory(dir);
dialog->open(receiver, member);
#else // !Q_WS_MAC
- QString caption = QObject::tr("Save file", "XUIFileDialog::runSaveFileDialog");
+ QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save file");
QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;"));
QmlDesigner::Internal::SignalEmitter emitter;
@@ -77,8 +78,8 @@ QStringList XUIFileDialog::fileNameFilters()
QStringList filters;
filters
- << QObject::tr("Declarative UI files (*.qml)", "XUIFileDialog::fileNameFilters")
- << QObject::tr("All files (*)", "XUIFileDialog::fileNameFilters");
+ << QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Declarative UI files (*.qml)")
+ << QCoreApplication::translate("QmlDesigner::XUIFileDialog", "All files (*)");
return filters;
}
--
GitLab