1 files changed, 15 insertions, 10 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index d36003c665..41382be3f1 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -64,12 +64,17 @@ QT_BEGIN_NAMESPACE
   Constructs a Tree. \a qdb is the pointer to the singleton
   qdoc database that is constructing the tree. This might not
   be necessary, and it might be removed later.
+
+  \a camelCaseModuleName is the project name for this tree,
+  which was obtained from the qdocconf file via the Config
+  singleton.
  */
-Tree::Tree(const QString& physicalModuleName, QDocDatabase* qdb)
+Tree::Tree(const QString& camelCaseModuleName, QDocDatabase* qdb)
     : treeHasBeenAnalyzed_(false),
       docsHaveBeenGenerated_(false),
       linkCount_(0),
-      physicalModuleName_(physicalModuleName),
+      camelCaseModuleName_(camelCaseModuleName),
+      physicalModuleName_(camelCaseModuleName.toLower()),
       qdb_(qdb),
       root_(0, QString()),
       targetListMap_(0)
@@ -296,8 +301,8 @@ static const NodeTypeList& relatesTypes()
 {
     if (t.isEmpty()) {
         t.reserve(3);
-        t.append(NodeTypePair(Node::Class, Node::NoSubType));
-        t.append(NodeTypePair(Node::Namespace, Node::NoSubType));
+        t.append(NodeTypePair(Node::Class, Node::NoSubtype));
+        t.append(NodeTypePair(Node::Namespace, Node::NoSubtype));
         t.append(NodeTypePair(Node::Document, Node::HeaderFile));
     }
     return t;
@@ -416,7 +421,7 @@ void Tree::resolveInheritanceHelper(int pass, ClassNode* cn)
                 FunctionNode* from = findVirtualFunctionInBaseClasses(cn, func);
                 if (from != 0) {
                     if (func->virtualness() == FunctionNode::NonVirtual)
-                        func->setVirtualness(FunctionNode::ImpureVirtual);
+                        func->setVirtualness(FunctionNode::NormalVirtual);
                     func->setReimplementedFrom(from);
                 }
             }
@@ -581,7 +586,7 @@ NodeList Tree::allBaseClasses(const ClassNode* classNode) const
   search at the tree root. \a subtype is not used unless
   \a type is \c{Document}.
  */
-Node* Tree::findNodeByNameAndType(const QStringList& path, Node::Type type) const
+Node* Tree::findNodeByNameAndType(const QStringList& path, Node::NodeType type) const
 {
     return findNodeRecursive(path, 0, root(), type);
 }
@@ -605,7 +610,7 @@ Node* Tree::findNodeByNameAndType(const QStringList& path, Node::Type type) cons
 Node* Tree::findNodeRecursive(const QStringList& path,
                               int pathIndex,
                               const Node* start,
-                              Node::Type type) const
+                              Node::NodeType type) const
 {
     if (!start || path.isEmpty())
         return 0; // no place to start, or nothing to search for.
@@ -974,7 +979,7 @@ QString Tree::getRef(const QString& target, const Node* node) const
  */
 void Tree::insertTarget(const QString& name,
                         const QString& title,
-                        TargetRec::Type type,
+                        TargetRec::TargetType type,
                         Node* node,
                         int priority)
 {
@@ -999,7 +1004,7 @@ void Tree::resolveTargets(InnerNode* root)
                 bool alreadyThere = false;
                 if (!nodes.empty()) {
                     for (int i=0; i< nodes.size(); ++i) {
-                        if (nodes[i]->subType() == Node::ExternalPage) {
+                        if (nodes[i]->docSubtype() == Node::ExternalPage) {
                             if (node->name() == nodes[i]->name()) {
                                 alreadyThere = true;
                                 break;
@@ -1246,7 +1251,7 @@ CollectionNode* Tree::findCollection(const QString& name, Node::Genus genus)
     CNMap::const_iterator i = m->find(name);
     if (i != m->end())
         return i.value();
-    Node::Type t = Node::NoType;
+    Node::NodeType t = Node::NoType;
     switch (genus) {
     case Node::DOC:
         t = Node::Group;