AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 50dfd15dcc.
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>
This commit is contained in:
Casper van Donderen 2012-07-26 10:05:52 +02:00 committed by Qt by Nokia
parent 28ae05e2f9
commit 353069f974
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tools/qdoc/cppcodeparser.cpp
View File

@ -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 "
"as QML type: '\\qmlclass " + arg.first + "'";
else if (!ignoreCppClass)
qcn->requireCppClass();
if (!msg.isEmpty())
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 + "'";
doc.startLocation().warning(tr(msg.toLatin1().data()));
}
}
if (ncn)
ncn->addCollision(qcn);