Refactor|libdeng2: PathTree always maintains local branch hashes

There is actually no need to optionally allow disabling the local branch hashes.
skyjake · Nov 26, 2012 · 01364ef · 01364ef
1 parent a5d6a05
commit 01364ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/doomsday/libdeng2/include/de/data/pathtree.h b/doomsday/libdeng2/include/de/data/pathtree.h
@@ -80,8 +80,7 @@ class DENG2_PUBLIC PathTree
      */
     enum Flag
     {
-        MultiLeaf = 0x1,    ///< There can be more than one leaf with a given name.
-        NoLocalBranchIndex = 0x2 ///< Branch nodes will not have an index of their immediate child nodes.
+        MultiLeaf = 0x1     ///< There can be more than one leaf with a given name.
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 

diff --git a/doomsday/libdeng2/src/data/pathtree.cpp b/doomsday/libdeng2/src/data/pathtree.cpp
@@ -367,8 +367,7 @@ static int iteratePathsInHash(PathTree const &pathTree, Path::hash_type hashKey,
 
     // If the parent is known, we can narrow our search to all the parent's
     // children.
-    if(!pathTree.flags().testFlag(PathTree::NoLocalBranchIndex) &&
-       flags.testFlag(PathTree::MatchParent) && parent)
+    if(flags.testFlag(PathTree::MatchParent) && parent)
     {
         nodes = &parent->childNodes(type);
     }

diff --git a/doomsday/libdeng2/src/data/pathtreenode.cpp b/doomsday/libdeng2/src/data/pathtreenode.cpp
@@ -109,22 +109,16 @@ PathTree::SegmentId PathTree::Node::segmentId() const
 
 void PathTree::Node::addChild(PathTree::Node &node)
 {
-    if(!d->tree.flags().testFlag(PathTree::NoLocalBranchIndex))
-    {
-        DENG2_ASSERT(d->children != 0);
+    DENG2_ASSERT(d->children != 0);
 
-        childNodes(node.type()).insert(node.hash(), &node);
-    }
+    childNodes(node.type()).insert(node.hash(), &node);
 }
 
 void PathTree::Node::removeChild(PathTree::Node &node)
 {
-    if(!d->tree.flags().testFlag(PathTree::NoLocalBranchIndex))
-    {
-        DENG2_ASSERT(d->children != 0);
+    DENG2_ASSERT(d->children != 0);
 
-        childNodes(node.type()).remove(node.hash(), &node);
-    }
+    childNodes(node.type()).remove(node.hash(), &node);
 }
 
 String const &PathTree::Node::name() const