Refactor: Removed Uri::Segment's parent pointer as unnecessary

Now that the segments are not stored in a manually managed linked list, there is no need for the parent pointer any more.
skyjake · Nov 18, 2012 · e6231d5 · e6231d5
1 parent a00bc49
commit e6231d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/doomsday/engine/include/uri.hh b/doomsday/engine/include/uri.hh
@@ -102,23 +102,20 @@ public:
     struct Segment
     {
         /**
-         * Returns a somewhat-random number in the range [0..Uri::hash_range)
-         * generated from the segment.
-         *
-         * @return  The generated hash key.
+         * Returns the segment as a string.
          */
-        hash_type hash() const;
+        String toString() const;
 
         /// @return  Length of the segment in characters.
         int length() const;
 
-        /// @return Parent (previous) segment or @c NULL.
-        Segment* parent() const;
-
         /**
-         * Returns the segment as a string.
+         * Returns a somewhat-random number in the range [0..Uri::hash_range)
+         * generated from the segment.
+         *
+         * @return  The generated hash key.
          */
-        String toString() const;
+        hash_type hash() const;
 
         friend class Uri;
         friend struct Uri::Instance;
@@ -127,7 +124,6 @@ public:
         mutable bool haveHashKey;
         mutable hash_type hashKey;
         char const* from, *to;
-        struct Segment* parent_;
     };
 
 public:

diff --git a/doomsday/engine/src/uri.cpp b/doomsday/engine/src/uri.cpp
@@ -41,11 +41,6 @@
 
 namespace de {
 
-Uri::Segment* Uri::Segment::parent() const
-{
-    return parent_;
-}
-
 ushort Uri::Segment::hash() const
 {
     // Is it time to compute the hash?