tr()-Fixes in CLANG code model.v3.1.0-beta1

Do not use QObject::tr(), use native file paths,
use complete contexts.

Change-Id: Icc4990b4c2ca5b9ae6f6b639db9e1a45a93e0a65
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

7 files changed, 22 insertions, 17 deletions

diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 179c5f03dd..c5974aea70 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -1173,9 +1173,8 @@ void ClangCompletionAssistProcessor::completeIncludePath(const QString &realPath
                                                          const QStringList &suffixes)
 {
     QDirIterator i(realPath, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
-    const QString hint =
-            QObject::tr("Location: ", "Parent folder for proposed #include completion")
-            + QDir::cleanPath(realPath);
+    //: Parent folder for proposed #include completion
+    const QString hint = tr("Location: %1").arg(QDir::toNativeSeparators(QDir::cleanPath(realPath)));
     while (i.hasNext()) {
         const QString fileName = i.next();
         const QFileInfo fileInfo = i.fileInfo();
diff --git a/src/plugins/clangcodemodel/clangcompletion.h b/src/plugins/clangcodemodel/clangcompletion.h
index 2ef11fe9e9..8bd77d9a6c 100644
--- a/src/plugins/clangcodemodel/clangcompletion.h
+++ b/src/plugins/clangcodemodel/clangcompletion.h
@@ -43,6 +43,7 @@
 
 #include <QStringList>
 #include <QTextCursor>
+#include <QCoreApplication>
 
 namespace ClangCodeModel {
 
@@ -104,6 +105,8 @@ private:
 
 class CLANG_EXPORT ClangCompletionAssistProcessor : public TextEditor::IAssistProcessor
 {
+    Q_DECLARE_TR_FUNCTIONS(ClangCodeModel::Internal::ClangCompletionAssistProcessor)
+
 public:
     ClangCompletionAssistProcessor();
     virtual ~ClangCompletionAssistProcessor();
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 1e53a0f2e5..d565bfc086 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -53,7 +53,8 @@ QString ModelManagerSupport::id() const
 
 QString ModelManagerSupport::displayName() const
 {
-    return QCoreApplication::translate("ModelManagerSupport::displayName",
+    //: Display name
+    return QCoreApplication::translate("ClangCodeModel::Internal::ModelManagerSupport",
                                        "Clang");
 }
 
diff --git a/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp b/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
index 612372f811..40df18a843 100644
--- a/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
@@ -48,8 +48,7 @@ QString ClangProjectSettingsPanelFactory::id() const
 
 QString ClangProjectSettingsPanelFactory::displayName() const
 {
-    return QCoreApplication::translate("ClangProjectSettingsPropertiesPage",
-                                       "Clang Settings");
+    return ClangProjectSettingsWidget::tr("Clang Settings");
 }
 
 int ClangProjectSettingsPanelFactory::priority() const
@@ -67,9 +66,7 @@ bool ClangProjectSettingsPanelFactory::supports(Project *project)
 PropertiesPanel *ClangProjectSettingsPanelFactory::createPanel(Project *project)
 {
     PropertiesPanel *panel = new PropertiesPanel;
-    panel->setDisplayName(QCoreApplication::translate(
-                              "ClangProjectSettingsPropertiesPage",
-                              "Clang Settings"));
+    panel->setDisplayName(ClangProjectSettingsWidget::tr("Clang Settings"));
     panel->setWidget(new ClangProjectSettingsWidget(project));
     return panel;
 }
diff --git a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
index e2f8d3e0ea..ac388f0327 100644
--- a/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
+++ b/src/plugins/clangcodemodel/completionproposalsbuilder.cpp
@@ -96,7 +96,8 @@ void CompletionProposalsBuilder::operator ()(const CXCompletionResult &cxResult)
 
     if (m_resultAvailability == CodeCompletionResult::Deprecated) {
         m_comment += QLatin1String("<b>@note</b> ");
-        m_comment += QCoreApplication::translate("deprecated C++ symbol", "Is deprecated");
+        //: deprecated C++ symbol
+        m_comment += tr("Is deprecated");
     }
 
     m_hint = QLatin1String("<p>");
@@ -675,9 +676,9 @@ void CompletionProposalsBuilder::concatSlotSignalSignature(const CXCompletionStr
 
     const QString parent = Internal::getQString(clang_getCompletionParent(cxString, NULL));
     if (m_resultKind == CodeCompletionResult::SlotCompletionKind)
-        m_hint += QObject::tr("Slot of %1, returns %2").arg(parent).arg(resultType);
+        m_hint += tr("Slot of %1, returns %2").arg(parent, resultType);
     else
-        m_hint += QObject::tr("Signal of %1, returns %2").arg(parent).arg(resultType);
+        m_hint += tr("Signal of %1, returns %2").arg(parent, resultType);
 }
 
 /**
diff --git a/src/plugins/clangcodemodel/completionproposalsbuilder.h b/src/plugins/clangcodemodel/completionproposalsbuilder.h
index 5526446e2c..c55a8a5a3c 100644
--- a/src/plugins/clangcodemodel/completionproposalsbuilder.h
+++ b/src/plugins/clangcodemodel/completionproposalsbuilder.h
@@ -34,10 +34,14 @@
 #include "clang_global.h"
 #include <clang-c/Index.h>
 
+#include <QCoreApplication>
+
 namespace ClangCodeModel {
 
 class CLANG_EXPORT CompletionProposalsBuilder
 {
+    Q_DECLARE_TR_FUNCTIONS(ClangCodeModel::CompletionProposalsBuilder)
+
 public:
     CompletionProposalsBuilder(QList<CodeCompletionResult> &results, quint64 contexts, bool isSignalSlotCompletion);
     void operator ()(const CXCompletionResult &cxResult);
diff --git a/src/plugins/clangcodemodel/diagnostic.cpp b/src/plugins/clangcodemodel/diagnostic.cpp
index 07db56a862..f876c6ae16 100644
--- a/src/plugins/clangcodemodel/diagnostic.cpp
+++ b/src/plugins/clangcodemodel/diagnostic.cpp
@@ -52,11 +52,11 @@ const QString Diagnostic::severityAsString() const
         return QString();
 
     static QStringList strs = QStringList()
-            << QCoreApplication::translate("Diagnostic", "ignored")
-            << QCoreApplication::translate("Diagnostic", "note")
-            << QCoreApplication::translate("Diagnostic", "warning")
-            << QCoreApplication::translate("Diagnostic", "error")
-            << QCoreApplication::translate("Diagnostic", "fatal")
+            << QCoreApplication::translate("ClangCodeModel::Diagnostic", "ignored")
+            << QCoreApplication::translate("ClangCodeModel::Diagnostic", "note")
+            << QCoreApplication::translate("ClangCodeModel::Diagnostic", "warning")
+            << QCoreApplication::translate("ClangCodeModel::Diagnostic", "error")
+            << QCoreApplication::translate("ClangCodeModel::Diagnostic", "fatal")
                ;
 
     return strs.at(m_severity);