Prefix vtable methods with virtual

Turns out that the overloading of vtable methods and regular
ones is problematic in some cases. So let's rather make it explicit
which methods are part of the vtable, and which aren't.

Change-Id: Ifee32a26104d30f3c82bca8b5a9cdea2d4f4f526
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 0 insertions, 19 deletions

diff --git a/src/qml/jsruntime/qv4arraydata_p.h b/src/qml/jsruntime/qv4arraydata_p.h
index 35a9488f1f..ac5b430356 100644
--- a/src/qml/jsruntime/qv4arraydata_p.h
+++ b/src/qml/jsruntime/qv4arraydata_p.h
@@ -215,17 +215,6 @@ struct Q_QML_EXPORT ArrayData : public Managed
     static void sort(ExecutionEngine *engine, Object *thisObject, const Value &comparefn, uint dataLen);
     static uint append(Object *obj, ArrayObject *otherObj, uint n);
     static void insert(Object *o, uint index, const Value *v, bool isAccessor = false);
-
-protected:
-    // Vtable methods required to get things to compile
-    static ReturnedValue get(const Managed *, PropertyKey, const Value *, bool *) {
-        Q_UNREACHABLE();
-        return Encode::undefined();
-    }
-    static bool put(Managed *, PropertyKey, const Value &, Value *) {
-        Q_UNREACHABLE();
-        return false;
-    }
 };
 
 struct Q_QML_EXPORT SimpleArrayData : public ArrayData
@@ -250,10 +239,6 @@ struct Q_QML_EXPORT SimpleArrayData : public ArrayData
     static ReturnedValue pop_front(Object *o);
     static uint truncate(Object *o, uint newLen);
     static uint length(const Heap::ArrayData *d);
-
-protected:
-    using ArrayData::get;
-    using ArrayData::put;
 };
 
 struct Q_QML_EXPORT SparseArrayData : public ArrayData
@@ -280,10 +265,6 @@ struct Q_QML_EXPORT SparseArrayData : public ArrayData
     static ReturnedValue pop_front(Object *o);
     static uint truncate(Object *o, uint newLen);
     static uint length(const Heap::ArrayData *d);
-
-protected:
-    using ArrayData::get;
-    using ArrayData::put;
 };
 
 namespace Heap {