Remove the StringType_UInt subtype

It's not really used, and doesn't optimise anything really.
Additionally get rid of some code duplication.

Change-Id: I6502512e6df58db2c0264ea43d91a23c7585427c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index 86b8f2bdd5..8c3030b8e0 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -50,7 +50,6 @@ struct Q_QML_PRIVATE_EXPORT String : Base {
     enum StringType {
         StringType_Unknown,
         StringType_Regular,
-        StringType_UInt,
         StringType_ArrayIndex
     };
 
@@ -90,7 +89,7 @@ struct Q_QML_PRIVATE_EXPORT String : Base {
         Q_ASSERT(!largestSubLength);
         if (identifier && identifier == other->identifier)
             return true;
-        if (subtype >= Heap::String::StringType_UInt && subtype == other->subtype)
+        if (subtype == Heap::String::StringType_ArrayIndex && other->subtype == Heap::String::StringType_ArrayIndex)
             return true;
 
         return toQString() == other->toQString();
@@ -124,7 +123,9 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed {
         IsString = true
     };
 
-    bool equals(String *other) const;
+    bool equals(String *other) const {
+        return d()->isEqualTo(other->d());
+    }
     inline bool isEqualTo(const String *other) const {
         return d()->isEqualTo(other->d());
     }