From: Casper van Donderen <casper.vandonderen@nokia.com>
Date: Thu, 21 Jun 2012 07:58:03 +0000 (+0200)
Subject: QDoc: Use 'Type' instead of 'element' in instantiates.
X-Git-Tag: 071012110112~308
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb74f7b22c2f4148287c40ab7308a6b7414237c5;p=profile%2Fivi%2Fqtbase.git

QDoc: Use 'Type' instead of 'element' in instantiates.

On a C++ documentation page "is instantiated by QML element" was printed
when you have a QML Type that instantiates this class. The text is now
changed to "is instantiated by QML Type".

Change-Id: I6c93531edc6ef9ac112573034fd54fa52390bc37
Reviewed-by: Martin Smith <martin.smith@nokia.com>
---

diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index 794ecf1..da036a3 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -4768,7 +4768,7 @@ void DitaXmlGenerator::generateQmlSince(const Node* node)
 }
 
 /*!
-  Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]"
+  Output the "[QmlGraphicsXxx is instantiated by QML Type Xxx]"
   line for the class, if there should be one.
 
   If there is no QML element, or if the class node status
@@ -4786,7 +4786,7 @@ void DitaXmlGenerator::generateInstantiatedBy(ClassNode* cn, CodeMarker* marker)
         text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
         text << Atom(Atom::String, cn->name());
         text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-        text << " is instantiated by QML element ";
+        text << " is instantiated by QML Type ";
         text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
         text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
         text << Atom(Atom::String, qcn->name());
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 991aae0..870acf4 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -4250,7 +4250,7 @@ void HtmlGenerator::generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marke
 }
 
 /*!
-  Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]"
+  Output the "[QmlGraphicsXxx is instantiated by QML Type Xxx]"
   line for the class, if there should be one.
 
   If there is no QML element, or if the class node status
@@ -4266,7 +4266,7 @@ void HtmlGenerator::generateInstantiatedBy(ClassNode* cn, CodeMarker* marker)
         text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
         text << Atom(Atom::String, cn->name());
         text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-        text << " is instantiated by QML element ";
+        text << " is instantiated by QML Type ";
         text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
         text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
         text << Atom(Atom::String, qcn->name());