From: Casper van Donderen <casper.vandonderen@nokia.com>
Date: Thu, 26 Jul 2012 08:05:52 +0000 (+0200)
Subject: Revert "QDoc: Allow '0' to be used as 2nd arg for \qmlclass."
X-Git-Tag: v5.0.0-beta1~593
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=353069f974c62ef758b1496881a03fcb6ca51476;p=profile%2Fivi%2Fqtbase.git

Revert "QDoc: Allow '0' to be used as 2nd arg for \qmlclass."

This reverts commit 50dfd15dcc49d12c5335a37999aef041d7fdfaae.
The change is not necessary anymore, since a new solution using
\instantiates in in the works, having two ways to do exactly the same
thing is not necessary.

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

diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 7fc2c14..02b81ee 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -728,17 +728,8 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
     else if (command == COMMAND_QMLCLASS) {
         ClassNode* classNode = 0;
         QStringList names = arg.first.split(QLatin1Char(' '));
-        bool ignoreCppClass = false;
-        if (names.size() > 1) {
-            /*
-              If the second argument of the \\qmlclass command is 0 we should ignore the C++ class.
-              The second argument should only be 0 when you are documenting QML in a .qdoc file.
-             */
-            if (names[1] != "0")
-                classNode = tree_->findClassNode(names[1].split("::"));
-            else
-                ignoreCppClass = true;
-        }
+        if (names.size() > 1)
+            classNode = tree_->findClassNode(names[1].split("::"));
 
         /*
           Search for a node with the same name. If there is one,
@@ -755,18 +746,17 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
         QmlClassNode* qcn = new QmlClassNode(tree_->root(), names[0], classNode);
         qcn->setLocation(doc.startLocation());
         if (isParsingCpp() || isParsingQdoc()) {
-            QString msg;
-            if (names.size() < 2)
-                msg = "C++ class name not specified for class documented as "
-                    "QML type: '\\qmlclass " + arg.first + " <class name>'."
-                    " '0' should be used as second argument if there is no C++ class.";
-            else if (!classNode && !ignoreCppClass)
-                msg = "C++ class not found in any .h file for class documented "
+            qcn->requireCppClass();
+            if (names.size() < 2) {
+                QString msg = "C++ class name not specified for class documented as "
+                    "QML type: '\\qmlclass " + arg.first + " <class name>'";
+                doc.startLocation().warning(tr(msg.toLatin1().data()));
+            }
+            else if (!classNode) {
+                QString msg = "C++ class not found in any .h file for class documented "
                     "as QML type: '\\qmlclass " + arg.first + "'";
-            else if (!ignoreCppClass)
-                qcn->requireCppClass();
-            if (!msg.isEmpty())
                 doc.startLocation().warning(tr(msg.toLatin1().data()));
+            }
         }
         if (ncn)
             ncn->addCollision(qcn);