diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-05-19 15:50:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-19 18:54:54 +0000 |
| commit | 8bc243f569e3feb1005fbca426bf24f59c38af2e (patch) | |
| tree | 3e69253b161432e4a02c3daa2de4ffbd2d9293f4 /src/qml/jsruntime/qv4string_p.h | |
| parent | 5bc38a50308665bdc185eb96dbcc9ba7948ab4e0 (diff) | |
Move the engine() accessor from Object to Managed
We can easily do this now that Managed has a pointer to an
internal class (which always has a back pointer to the
ExecutionEngine).
Remove the extra engine pointer from ExecutionContext, and clean
up tow methods in String.
Change-Id: I98d750b1afbdeadf42e66ae0c92c48db1a7adc31
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/qml/jsruntime/qv4string_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index ad30165ce5..458a9edae6 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -176,13 +176,13 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed { } uint toUInt(bool *ok) const; - void makeIdentifier(ExecutionEngine *e) const { + void makeIdentifier() const { if (d()->identifier) return; - makeIdentifierImpl(e); + makeIdentifierImpl(); } - void makeIdentifierImpl(ExecutionEngine *e) const; + void makeIdentifierImpl() const; static uint createHashValue(const QChar *ch, int length, uint *subtype) { |