From 9daa6ea1bc481e894c292ebc29a50cc57cd4fccc Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 23 Sep 2010 18:43:39 +0200 Subject: Doc: Fixed coding style breakage in qdoc source code. Reviewed-by: Trust Me --- tools/qdoc3/htmlgenerator.cpp | 129 +++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 77e306a..caa4a29 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -451,7 +451,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, { int skipAhead = 0; static bool in_para = false; - + switch (atom->type()) { case Atom::AbstractLeft: break; @@ -527,18 +527,18 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE]; break; case Atom::Code: - out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n"; - break; + break; #ifdef QDOC_QML case Atom::Qml: - out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n"; - break; + break; #endif case Atom::CodeNew: out() << "

you can rewrite it as

\n" @@ -554,7 +554,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << "
"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
               << "
\n"; - break; + break; case Atom::FootnoteLeft: // ### For now if (in_para) { @@ -927,13 +927,13 @@ int HtmlGenerator::generateAtom(const Atom *atom, threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom); if (threeColumnEnumValueTable) { out() << ""; - // << "" - if (++numTableRows % 2 == 1) - out() << ""; - else - out() << ""; + // << "" + if (++numTableRows % 2 == 1) + out() << ""; + else + out() << ""; - out() << "" + out() << "" << "" << "\n"; } @@ -1811,44 +1811,44 @@ void HtmlGenerator::generateHeader(const QString& title, out() << " \n"; out() << " \n"; - - // Adding syntax highlighter // future release - + + // Adding syntax highlighter // future release + // Setting some additional style sheet related details depending on configuration (e.g. Online/Creator) switch (application) { case Online: // Adding style and js for small windows - out() << " \n"; - out() << " "; - out() << " \n"; - out() << " \n"; + out() << " \n"; + out() << " "; + out() << " \n"; + out() << " \n"; // Browser spec styles - out() << " \n"; - out() << "\n"; - out() << "\n"; - out() << "\n"; - - out() << "\n"; - // CheckEmptyAndLoadList activating search - out() << "\n"; + out() << " \n"; + out() << "\n"; + out() << "\n"; + out() << "\n"; + + out() << "\n"; + // CheckEmptyAndLoadList activating search + out() << "\n"; break; case Creator: - out() << "\n"; - out() << "\n"; // offline narrow + out() << "\n"; + out() << "\n"; // offline narrow break; default: - out() << "\n"; - out() << "\n"; + out() << "\n"; + out() << "\n"; break; } @@ -1866,7 +1866,7 @@ void HtmlGenerator::generateHeader(const QString& title, case Creator: out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); - out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); break; default: // default -- not used except if one forgets to set any of the above settings to true out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); @@ -1945,8 +1945,8 @@ void HtmlGenerator::generateTitle(const QString& title, if (!title.isEmpty()) out() << "

" << protectEnc(title) << "

\n"; if (!subTitle.isEmpty()) { - out() << ""; else out() << " class=\"subtitle\">"; @@ -1979,10 +1979,10 @@ void HtmlGenerator::generateFooter(const Node *node) out() << " })();\n"; out() << " \n"; out() << "\n"; - break; + break; case Creator: out() << "\n"; - break; + break; default: out() << "\n"; } @@ -2238,20 +2238,19 @@ void HtmlGenerator::generateNavigationBar(const NavigationBar& bar, out() << "]\n"; #endif } - if (fake->name() != QString("index.html")) - { - if (bar.current.begin() != 0) { - out() << "[Home]\n"; - } - if (bar.next.begin() != 0) { - out() << "[Next: "; - generateText(Text::sectionHeading(bar.next.begin()), node, marker); - out() << "]\n"; + if (fake->name() != QString("index.html")) { + if (bar.current.begin() != 0) { + out() << "[Home]\n"; + } + if (bar.next.begin() != 0) { + out() << "[Next: "; + generateText(Text::sectionHeading(bar.next.begin()), node, marker); + out() << "]\n"; + } + out() << "

\n"; } - out() << "

\n"; - } } } #endif @@ -3283,7 +3282,7 @@ void HtmlGenerator::generateLink(const Atom* atom, inLink = false; out() << protectEnc(atom->string().mid(k)); } else if (marker->recognizeLanguage("Java")) { - // hack for Java: remove () and use when appropriate + // hack for Java: remove () and use when appropriate bool func = atom->string().endsWith("()"); bool tt = (func || atom->string().contains(camelCase)); if (tt) @@ -4065,7 +4064,7 @@ void HtmlGenerator::generateStatus(const Node *node, CodeMarker *marker) switch (node->status()) { case Node::Obsolete: if (node->isInnerNode()) - Generator::generateStatus(node, marker); + Generator::generateStatus(node, marker); break; case Node::Compat: if (node->isInnerNode()) { @@ -4225,7 +4224,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node, out() << "
"; else out() << ""; - + out() << "
Constant
ConstantValueDescription

"; out() << ""; @@ -4265,10 +4264,10 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node, out() << "

"; out() << ""; //out() << ""; - if (++numTableRows % 2 == 1) - out() << ""; - else - out() << ""; + if (++numTableRows % 2 == 1) + out() << ""; + else + out() << ""; out() << "

"; out() << ""; generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false); -- cgit v0.12