1 files changed, 6 insertions, 51 deletions

diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp
index be19eb435..330f3d474 100644
--- a/src/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/webxmlgenerator.cpp
@@ -222,7 +222,7 @@ void WebXMLGenerator::append(QXmlStreamWriter &writer, Node *node)
     while (atom)
         atom = addAtomElements(writer, atom, node, marker_);
 
-    QList<Text> alsoList = node->doc().alsoList();
+    QVector<Text> alsoList = node->doc().alsoList();
     supplementAlsoList(node, alsoList);
 
     if (!alsoList.isEmpty()) {
@@ -289,6 +289,9 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer,
 {
     bool keepQuoting = false;
 
+    if (!atom)
+        return nullptr;
+
     switch (atom->type()) {
     case Atom::AnnotatedList:
     {
@@ -750,11 +753,8 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer,
     }
 
     hasQuotingInformation = keepQuoting;
+    return atom->next();
 
-    if (atom)
-        return atom->next();
-
-    return nullptr;
 }
 
 void WebXMLGenerator::startLink(QXmlStreamWriter &writer, const Atom *atom,
@@ -811,47 +811,13 @@ void WebXMLGenerator::endLink(QXmlStreamWriter &writer) {
     }
 }
 
-QString WebXMLGenerator::targetType(const Node *node)
-{
-    if (!node)
-        return "external";
-
-    switch (node->nodeType()) {
-    case Node::Namespace:
-        return "namespace";
-    case Node::Class:
-    case Node::Struct:
-    case Node::Union:
-        return "class";
-    case Node::Page:
-    case Node::Example:
-        return "page";
-    case Node::Enum:
-        return "enum";
-    case Node::Typedef:
-        return "typedef";
-    case Node::Property:
-        return "property";
-    case Node::Function:
-        return "function";
-    case Node::Variable:
-        return "variable";
-    case Node::Module:
-        return "module";
-    default:
-        break;
-    }
-    return QString();
-}
-
 void WebXMLGenerator::generateRelations(QXmlStreamWriter &writer, const Node *node)
 {
     if (node && !node->links().empty()) {
         QPair<QString, QString> anchorPair;
         const Node *linkNode;
 
-        for (QMap<Node::LinkType, QPair<QString, QString> >::const_iterator it =
-             node->links().cbegin(), end = node->links().cend(); it != end; ++it) {
+        for (auto it = node->links().cbegin(); it != node->links().cend(); ++it) {
 
             linkNode = qdb_->findNodeForTarget(it.value().first, node);
 
@@ -921,15 +887,4 @@ void WebXMLGenerator::generateAnnotatedList(QXmlStreamWriter &writer,
     writer.writeEndElement(); // table
 }
 
-const QPair<QString,QString> WebXMLGenerator::anchorForNode(const Node *node)
-{
-    QPair<QString,QString> anchorPair;
-
-    anchorPair.first = fullDocumentLocation(node);
-    if (node->isTextPageNode())
-        anchorPair.second = node->title();
-
-    return anchorPair;
-}
-
 QT_END_NAMESPACE