diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 8 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | src/tools/qlalr/lalr.cpp | 8 |
4 files changed, 9 insertions, 13 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 9f722abe9b..5153b0de5c 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -932,14 +932,16 @@ void Generator::generateFileList(const DocumentNode* dn, if (!file.isEmpty()) { QDir dirInfo; QString userFriendlyFilePath; + const QString prefix("/images/used-in-examples/"); QString srcPath = Config::findFile(dn->location(), QStringList(), exampleDirs, file, exampleImgExts, userFriendlyFilePath); + outFileNames_ << prefix.mid(1) + userFriendlyFilePath; userFriendlyFilePath.truncate(userFriendlyFilePath.lastIndexOf('/')); - QString imgOutDir = outDir_ + "/images/used-in-examples/" + userFriendlyFilePath; + QString imgOutDir = outDir_ + prefix + userFriendlyFilePath; if (!dirInfo.mkpath(imgOutDir)) dn->location().fatal(tr("Cannot create output directory '%1'").arg(imgOutDir)); Config::copyFile(dn->location(), srcPath, file, imgOutDir); diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 996cf03f32..8161913f1f 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -202,13 +202,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const { QStringList details; - if (node->isQmlProperty() || node->isJsProperty()) { - // "name" - details << node->name(); - // "id" - details << node->parent()->parent()->name()+"::"+node->name(); - } - else if (node->parent() && !node->parent()->name().isEmpty()) { + if (node->parent() && !node->parent()->name().isEmpty()) { // "name" if (node->type() == Node::Enum || node->type() == Node::Typedef) details << node->parent()->name()+"::"+node->name(); diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 911b91991f..18d2af5810 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -2663,7 +2663,7 @@ QString HtmlGenerator::generateLowStatusMemberFile(Aggregate *inner, out() << "<p><b>The following members of class " << "<a href=\"" << linkForNode(inner, 0) << "\">" << protectEnc(inner->name()) << "</a>" - << "are part of the " + << " are part of the " "Qt compatibility layer.</b> We advise against " "using them in new code.</p>\n"; } diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp index 4470c8f07f..537051956e 100644 --- a/src/tools/qlalr/lalr.cpp +++ b/src/tools/qlalr/lalr.cpp @@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar () non_terminals.insert (accept_symbol); } -struct _Nullable: public std::unary_function<Name, bool> +struct Nullable: public std::unary_function<Name, bool> { Automaton *_M_automaton; - _Nullable (Automaton *aut): + Nullable (Automaton *aut): _M_automaton (aut) {} bool operator () (Name name) const @@ -300,7 +300,7 @@ void Automaton::buildNullables () for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule) { - NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this))); + NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this))); if (nn == rule->rhs.end ()) changed |= nullables.insert (rule->lhs).second; @@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph () if (! _M_grammar->isNonTerminal (*A)) continue; - NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this))); + NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this))); if (first_not_nullable != rule->rhs.end ()) continue; |