From d75c5fa2201151c05a32fc10e0fac2c7387e4362 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 27 Feb 2009 20:06:08 +0100
Subject: [PATCH] sanitize some tr() calls
---
src/libs/extensionsystem/pluginmanager.cpp | 12 ++++++------
src/plugins/coreplugin/actionmanager/command.cpp | 2 +-
src/plugins/coreplugin/filemanager.cpp | 4 ++--
.../coreplugin/scriptmanager/scriptmanager.cpp | 4 ++--
src/plugins/debugger/debuggerrunner.cpp | 2 +-
.../projectexplorer/applicationrunconfiguration.cpp | 2 +-
src/shared/help/bookmarkmanager.cpp | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 72df8d8cfd5..ff33502ba2b 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -615,13 +615,13 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec, QList<PluginSpec *> &queu
// check for circular dependencies
if (circularityCheckQueue.contains(spec)) {
spec->d->hasError = true;
- spec->d->errorString = q->tr("Circular dependency detected:\n");
+ spec->d->errorString = PluginManager::tr("Circular dependency detected:\n");
int index = circularityCheckQueue.indexOf(spec);
for (int i = index; i < circularityCheckQueue.size(); ++i) {
- spec->d->errorString.append(q->tr("%1(%2) depends on\n")
+ spec->d->errorString.append(PluginManager::tr("%1(%2) depends on\n")
.arg(circularityCheckQueue.at(i)->name()).arg(circularityCheckQueue.at(i)->version()));
}
- spec->d->errorString.append(q->tr("%1(%2)").arg(spec->name()).arg(spec->version()));
+ spec->d->errorString.append(PluginManager::tr("%1(%2)").arg(spec->name()).arg(spec->version()));
return false;
}
circularityCheckQueue.append(spec);
@@ -629,7 +629,7 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec, QList<PluginSpec *> &queu
if (spec->state() == PluginSpec::Invalid || spec->state() == PluginSpec::Read) {
spec->d->hasError = true;
spec->d->errorString += "\n";
- spec->d->errorString += q->tr("Cannot load plugin because dependencies are not resolved");
+ spec->d->errorString += PluginManager::tr("Cannot load plugin because dependencies are not resolved");
return false;
}
// add dependencies
@@ -637,7 +637,7 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec, QList<PluginSpec *> &queu
if (!loadQueue(depSpec, queue, circularityCheckQueue)) {
spec->d->hasError = true;
spec->d->errorString =
- q->tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
+ PluginManager::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
.arg(depSpec->name()).arg(depSpec->version()).arg(depSpec->errorString());
return false;
}
@@ -666,7 +666,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
if (depSpec->state() != destState) {
spec->d->hasError = true;
spec->d->errorString =
- q->tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
+ PluginManager::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
.arg(depSpec->name()).arg(depSpec->version()).arg(depSpec->errorString());
return;
}
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index b8a55037d24..d8292551f6d 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -128,7 +128,7 @@ void CommandPrivate::setCategory(const QString &name)
QString CommandPrivate::category() const
{
if (m_category.isEmpty())
- return QObject::tr("Other");
+ return tr("Other");
return m_category;
}
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 30e1857e8d5..5fd9fe3fdd5 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -301,8 +301,8 @@ QList<IFile *> FileManager::saveModifiedFiles(const QList<IFile *> &files,
static QMessageBox::StandardButton skipFailedPrompt(QWidget *parent, const QString &fileName)
{
return QMessageBox::question(parent,
- QObject::tr("Can't save file"),
- QObject::tr("Can't save changes to '%1'. Do you want to continue and loose your changes?").arg(fileName),
+ FileManager::tr("Can't save file"),
+ FileManager::tr("Can't save changes to '%1'. Do you want to continue and loose your changes?").arg(fileName),
QMessageBox::YesToAll| QMessageBox::Yes|QMessageBox::No,
QMessageBox::No);
}
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 6fdb921b0cc..9f21cd454d6 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -234,7 +234,7 @@ bool ScriptManagerPrivate::runScript(const QString &script, QString *errorMessag
const QStringList backTrace = m_engine.uncaughtExceptionBacktrace();
parseBackTrace(backTrace, *stack);
const QString backtrace = backTrace.join(QString(QLatin1Char('\n')));
- *errorMessage = QObject::tr("Exception at line %1: %2\n%3").arg(errorLineNumber).arg(engineError(m_engine)).arg(backtrace);
+ *errorMessage = ScriptManager::tr("Exception at line %1: %2\n%3").arg(errorLineNumber).arg(engineError(m_engine)).arg(backtrace);
}
m_engine.popContext();
return !failed;
@@ -301,7 +301,7 @@ QString ScriptManagerPrivate::engineError(QScriptEngine &scriptEngine)
QScriptValue error = scriptEngine.evaluate(QLatin1String("Error"));
if (error.isValid())
return error.toString();
- return QObject::tr("Unknown error");
+ return ScriptManager::tr("Unknown error");
}
} // namespace Internal
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 15116aaf38a..de5d4ba227d 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -69,7 +69,7 @@ bool DebuggerRunner::canRun(RunConfigurationPtr runConfiguration, const QString
QString DebuggerRunner::displayName() const
{
- return QObject::tr("Debug");
+ return tr("Debug");
}
RunControl* DebuggerRunner::run(RunConfigurationPtr runConfiguration, const QString &mode)
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.cpp b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
index 1bdf0c91164..f901d2965ab 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.cpp
@@ -85,7 +85,7 @@ bool ApplicationRunConfigurationRunner::canRun(QSharedPointer<RunConfiguration>
QString ApplicationRunConfigurationRunner::displayName() const
{
- return QObject::tr("Run");
+ return tr("Run");
}
RunControl* ApplicationRunConfigurationRunner::run(QSharedPointer<RunConfiguration> runConfiguration, const QString &mode)
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 29b5842a1a1..e3cfbfc493b 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -616,8 +616,8 @@ BookmarkManager::BookmarkManager(QHelpEngineCore* _helpEngine)
, helpEngine(_helpEngine)
{
folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
- treeModel->setHeaderData(0, Qt::Horizontal, QObject::tr("Bookmark"));
- listModel->setHeaderData(0, Qt::Horizontal, QObject::tr("Bookmark"));
+ treeModel->setHeaderData(0, Qt::Horizontal, tr("Bookmark"));
+ listModel->setHeaderData(0, Qt::Horizontal, tr("Bookmark"));
connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
SLOT(itemChanged(QStandardItem*)));
--
GitLab