whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Just reformatting and removing dead code 

Whitespace only.

Change-Id: I6e4b55ad55e22da4150530457202f144fcc7f416
Reviewed-by: Martin Smith <martin.smith@digia.com>
bb10
Martin Smith 2015-05-28 12:07:05 +02:00
parent e36de4bc5d
commit 8b1746b09d
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tools/qdoc/codeparser.cpp
View File

@ -423,33 +423,6 @@ void CodeParser::checkModuleInclusion(Node* n)
.arg(n->name()).arg(Generator::defaultModuleName()));
}
break;
#if 0
case Node::Document:
if (n->access() != Node::Private && !n->doc().isEmpty()) {
if (n->docSubtype() == Node::HeaderFile) {
#if 0
n->doc().location().warning(tr("Header file with title \"%1\" has no \\inmodule command; "
"using project name by default: %2")
.arg(n->title()).arg(Generator::defaultModuleName()));
#endif
}
else if (n->docSubtype() == Node::Page) {
#if 0
n->doc().location().warning(tr("Page with title \"%1\" has no \\inmodule command; "
"using project name by default: %2")
.arg(n->title()).arg(Generator::defaultModuleName()));
#endif
}
else if (n->docSubtype() == Node::Example) {
#if 0
n->doc().location().warning(tr("Example with title \"%1\" has no \\inmodule command; "
"using project name by default: %2")
.arg(n->title()).arg(Generator::defaultModuleName()));
#endif
}
}
break;
#endif
default:
break;
}

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

@ -520,16 +520,6 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
else if (t == "ditamap")
ptype = Node::DitaMapPage;
}
#if 0
const Node* n = qdb_->checkForCollision(args[0]);
if (n) {
QString other = n->doc().location().fileName();
doc.location().warning(tr("Name/title collision detected: '%1' in '\\%2'")
.arg(args[0]).arg(command),
tr("Also used here: %1").arg(other));
}
#endif
DocumentNode* dn = 0;
if (ptype == Node::DitaMapPage)
dn = new DitaMapNode(qdb_->primaryTreeRoot(), args[0]);
@ -892,8 +882,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
((Aggregate *) node)->addInclude(arg);
}
else {
doc.location().warning(tr("Ignored '\\%1'")
.arg(COMMAND_INHEADERFILE));
doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_INHEADERFILE));
}
}
else if (command == COMMAND_OVERLOAD) {
@ -932,9 +921,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
func->setReimplemented(true);
}
else {
doc.location().warning(tr("Ignored '\\%1' in %2")
.arg(COMMAND_REIMP)
.arg(node->name()));
doc.location().warning(tr("Ignored '\\%1' in %2").arg(COMMAND_REIMP).arg(node->name()));
}
}
}
@ -2078,29 +2065,25 @@ bool CppCodeParser::matchDeclList(Aggregate *parent)
case Tok_Q_DECLARE_SEQUENTIAL_ITERATOR:
readToken();
if (match(Tok_LeftParen) && match(Tok_Ident))
sequentialIteratorClasses.insert(previousLexeme(),
location().fileName());
sequentialIteratorClasses.insert(previousLexeme(), location().fileName());
match(Tok_RightParen);
break;
case Tok_Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR:
readToken();
if (match(Tok_LeftParen) && match(Tok_Ident))
mutableSequentialIteratorClasses.insert(previousLexeme(),
location().fileName());
mutableSequentialIteratorClasses.insert(previousLexeme(), location().fileName());
match(Tok_RightParen);
break;
case Tok_Q_DECLARE_ASSOCIATIVE_ITERATOR:
readToken();
if (match(Tok_LeftParen) && match(Tok_Ident))
associativeIteratorClasses.insert(previousLexeme(),
location().fileName());
associativeIteratorClasses.insert(previousLexeme(), location().fileName());
match(Tok_RightParen);
break;
case Tok_Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR:
readToken();
if (match(Tok_LeftParen) && match(Tok_Ident))
mutableAssociativeIteratorClasses.insert(previousLexeme(),
location().fileName());
mutableAssociativeIteratorClasses.insert(previousLexeme(), location().fileName());
match(Tok_RightParen);
break;
case Tok_Q_DECLARE_FLAGS: