Get rid of TypedValue

Now that Managed inherits from Value, this class doesn't
make sense anymore.

Change-Id: I04e10f53ef305658d902bd0f1c7d7280068c0dc3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

4 files changed, 0 insertions, 104 deletions

diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 51bcc19c6e..79e4e7be05 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -83,7 +83,6 @@ HEADERS += \
     $$PWD/qv4serialize_p.h \
     $$PWD/qv4script_p.h \
     $$PWD/qv4scopedvalue_p.h \
-    $$PWD/qv4typedvalue_p.h \
     $$PWD/qv4util_p.h \
     $$PWD/qv4executableallocator_p.h \
     $$PWD/qv4sequenceobject_p.h \
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 6cf9cb250b..f8676c49ec 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -37,7 +37,6 @@
 #include "private/qv4isel_p.h"
 #include "qv4managed_p.h"
 #include "qv4context_p.h"
-#include "qv4typedvalue_p.h"
 #include "qv4internalclass_p.h"
 #include <private/qintrusivelist_p.h>
 
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 98ced91b05..29cca1c87d 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -396,33 +396,6 @@ inline Value &Value::operator=(const Scoped<T> &t)
     return *this;
 }
 
-template<typename T>
-inline TypedValue<T> &TypedValue<T>::operator =(T *t)
-{
-    m = t ? t->m : 0;
-#if QT_POINTER_SIZE == 4
-    tag = Managed_Type;
-#endif
-    return *this;
-}
-
-template<typename T>
-inline TypedValue<T> &TypedValue<T>::operator =(const Scoped<T> &v)
-{
-    m = v.ptr->m;
-#if QT_POINTER_SIZE == 4
-    tag = Managed_Type;
-#endif
-    return *this;
-}
-
-template<typename T>
-inline TypedValue<T> &TypedValue<T>::operator=(const TypedValue<T> &t)
-{
-    val = t.val;
-    return *this;
-}
-
 struct ScopedProperty
 {
     ScopedProperty(Scope &scope)
diff --git a/src/qml/jsruntime/qv4typedvalue_p.h b/src/qml/jsruntime/qv4typedvalue_p.h
deleted file mode 100644
index 50b5a4db81..0000000000
--- a/src/qml/jsruntime/qv4typedvalue_p.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QV4TYPEDVALUE_H
-#define QV4TYPEDVALUE_H
-
-#include "qv4value_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace QV4 {
-
-template <typename T>
-struct TypedValue : public Value
-{
-    template<typename X>
-    TypedValue &operator =(X *x) {
-        m = x;
-#if QT_POINTER_SIZE == 4
-        tag = Managed_Type;
-#endif
-        return *this;
-    }
-    TypedValue &operator =(T *t);
-    TypedValue &operator =(const Scoped<T> &v);
-//    TypedValue &operator =(const ManagedRef<T> &v);
-
-    TypedValue &operator =(const TypedValue<T> &t);
-
-    bool operator!() const { return !managed(); }
-
-    operator T *() { return static_cast<T *>(managed()); }
-    T *operator->() { return static_cast<T *>(managed()); }
-    const T *operator->() const { return static_cast<T *>(managed()); }
-    T *getPointer() const { return static_cast<T *>(managed()); }
-
-    void mark(ExecutionEngine *e) { if (managed()) managed()->mark(e); }
-};
-typedef TypedValue<String> StringValue;
-
-
-} // namespace QV4
-
-QT_END_NAMESPACE
-
-#endif