qdoc: Fix translation contexts.

Put all translations into the namespace QDoc and fix warnings
about invalid tr()-usage by removing the free tr()-function
from tr.h. Provide QCoreApplication::translate() for bootstrap
builds.

Change-Id: I2b6931188346f290e80e14b84adff8892d8a860f
Reviewed-by: Martin Smith <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/tools/qdoc/separator.cpp b/src/tools/qdoc/separator.cpp
index b9320449c6e..2403fb15c8f 100644
--- a/src/tools/qdoc/separator.cpp
+++ b/src/tools/qdoc/separator.cpp
@@ -51,14 +51,14 @@ QT_BEGIN_NAMESPACE
 QString separator(int index, int count)
 {
     if (index == count - 1)
-        return tr(".", "terminator");
+        return QCoreApplication::translate("QDoc", ".", "terminator");
     if (count == 2)
-        return tr(" and ", "separator when N = 2");
+        return QCoreApplication::translate("QDoc", " and ", "separator when N = 2");
     if (index == 0)
-        return tr(", ", "first separator when N > 2");
+        return QCoreApplication::translate("QDoc", ", ", "first separator when N > 2");
     if (index < count - 2)
-        return tr(", ", "general separator when N > 2");
-    return tr(", and ", "last separator when N > 2");
+        return QCoreApplication::translate("QDoc", ", ", "general separator when N > 2");
+    return QCoreApplication::translate("QDoc", ", and ", "last separator when N > 2");
 }
 
 QString comma(int index, int count)
@@ -66,12 +66,12 @@ QString comma(int index, int count)
     if (index == count - 1)
         return QString();
     if (count == 2)
-        return tr(" and ", "separator when N = 2");
+        return QCoreApplication::translate("QDoc", " and ", "separator when N = 2");
     if (index == 0)
-        return tr(", ", "first separator when N > 2");
+        return QCoreApplication::translate("QDoc", ", ", "first separator when N > 2");
     if (index < count - 2)
-        return tr(", ", "general separator when N > 2");
-    return tr(", and ", "last separator when N > 2");
+        return QCoreApplication::translate("QDoc", ", ", "general separator when N > 2");
+    return QCoreApplication::translate("QDoc", ", and ", "last separator when N > 2");
 }
 
 QT_END_NAMESPACE