diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-25 23:18:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-03 08:08:35 +0000 |
| commit | 61440411a979c7c317bafccfbf5201d969819a06 (patch) | |
| tree | 6c5825e21e75587121351bc612a76a7af81ef7be /src/qml/jsruntime/qv4string_p.h | |
| parent | 2aabdd187aae8a953cfcebac8f6c1ba7b19a0727 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime/qv4string_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 23319eefb1..8a4dc08693 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -237,8 +237,8 @@ struct Q_QML_PRIVATE_EXPORT String : public StringOrSymbol { bool startsWithUpper() const { return d()->startsWithUpper(); } protected: - static bool isEqualTo(Managed *that, Managed *o); - static qint64 getLength(const Managed *m); + static bool virtualIsEqualTo(Managed *that, Managed *o); + static qint64 virtualGetLength(const Managed *m); #endif public: |