From 8bb0134c50aaeda3484e93a6162d566fd83715d3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 28 Jan 2013 17:29:33 +0100
Subject: [PATCH] tr()-Fixes: Fix translation contexts.

Change-Id: Ic043a097947a80e2fb5cb381c585375c4e5f5eef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
 src/libs/qmljs/qmljsstaticanalysismessage.cpp         |  2 +-
 .../cmakeprojectmanager/cmakeopenprojectwizard.cpp    | 11 ++++++-----
 src/plugins/cpptools/builtinindexingsupport.cpp       |  2 +-
 src/plugins/qmljstools/qmlconsolemanager.cpp          |  4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
index b6af6185cbb..0d3de2f4c2c 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
@@ -40,7 +40,7 @@ namespace {
 
 class StaticAnalysisMessages
 {
-    Q_DECLARE_TR_FUNCTIONS(StaticAnalysisMessages)
+    Q_DECLARE_TR_FUNCTIONS(QmlJS::StaticAnalysisMessages)
 
 public:
     class PrototypeMessageData {
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index b4798ed35b0..8421c913cf7 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -70,6 +70,7 @@ namespace CMakeProjectManager {
 namespace Internal {
     class GeneratorInfo
     {
+        Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::GeneratorInfo)
     public:
         enum Ninja { NoNinja, OfferNinja, ForceNinja };
         static QList<GeneratorInfo> generatorInfosFor(ProjectExplorer::Kit *k, Ninja n, bool hasCodeBlocks);
@@ -148,7 +149,7 @@ QString GeneratorInfo::displayName() const
     if (!m_kit)
         return QString();
     if (m_isNinja)
-        return QApplication::tr("Ninja (%1)").arg(m_kit->displayName());
+        return tr("Ninja (%1)").arg(m_kit->displayName());
     ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit);
     ProjectExplorer::Abi targetAbi = tc->targetAbi();
     if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
@@ -156,16 +157,16 @@ QString GeneratorInfo::displayName() const
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
                 || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) {
-            return QApplication::tr("NMake Generator (%1)").arg(m_kit->displayName());
+            return tr("NMake Generator (%1)").arg(m_kit->displayName());
         } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
             if (Utils::HostOsInfo::isWindowsHost())
-                return QApplication::tr("MinGW Generator (%1)").arg(m_kit->displayName());
+                return tr("MinGW Generator (%1)").arg(m_kit->displayName());
             else
-                return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName());
+                return tr("Unix Generator (%1)").arg(m_kit->displayName());
         }
     } else {
         // Non windows
-        return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName());
+        return tr("Unix Generator (%1)").arg(m_kit->displayName());
     }
     return QString();
 }
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index e94ffb9ee36..e5c4ad83da4 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -200,7 +200,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour
 
     if (sourceFiles.count() > 1) {
         Core::ICore::progressManager()->addTask(result,
-                                                QCoreApplication::translate("IndexingSupport", "Parsing"),
+                                                QCoreApplication::translate("CppTools::Internal::BuiltinIndexingSupport", "Parsing"),
                                                 QLatin1String(CppTools::Constants::TASK_INDEX));
     }
 
diff --git a/src/plugins/qmljstools/qmlconsolemanager.cpp b/src/plugins/qmljstools/qmlconsolemanager.cpp
index 34358714f79..9bde33c045f 100644
--- a/src/plugins/qmljstools/qmlconsolemanager.cpp
+++ b/src/plugins/qmljstools/qmlconsolemanager.cpp
@@ -36,6 +36,7 @@
 #include <qmljs/iscriptevaluator.h>
 
 #include <QVariant>
+#include <QCoreApplication>
 
 using namespace QmlJS;
 
@@ -174,7 +175,8 @@ void QmlConsoleModel::evaluate(const QString &expression)
         } else {
             ConsoleItem *root = manager->rootItem();
             ConsoleItem *item = constructLogItemTree(
-                        root, QObject::tr("Can only evaluate during a QML debug session."));
+                        root, QCoreApplication::translate("QmlJSTools::Internal::QmlConsoleModel",
+                                                          "Can only evaluate during a QML debug session."));
             if (item) {
                 QmlConsoleModel::qmlConsoleItemModel()->appendEditableRow();
                 manager->printToConsolePane(item);