diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-10-01 16:11:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 16:07:33 +0200 |
| commit | c1d66eec1dbaf9034e03e3efa0403a774c764373 (patch) | |
| tree | fa185761604cc636e77ff5f4eda2462783bc18e6 /src/qml/jsruntime/qv4value_def_p.h | |
| parent | d49cc03df130353665edd89112fd4e1f3cdab9b6 (diff) | |
Cleanup API of Safe<T>
Don't have an implicit cast operator to Returned<T>
anymore, and return a T* from the operator->()
Change-Id: If4165071b986bfc84a157560d94d39c2dcfbc9e1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value_def_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4value_def_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index f552798a4b..c0b59f6711 100644 --- a/src/qml/jsruntime/qv4value_def_p.h +++ b/src/qml/jsruntime/qv4value_def_p.h @@ -400,10 +400,10 @@ struct Safe : public SafeValue bool operator!() const { return !managed(); } - // ### GC: remove me - operator T*() { return static_cast<T *>(managed()); } - Value *operator->() { return this; } - operator Returned<T> *(); + T *operator->() { return static_cast<T *>(managed()); } + const T *operator->() const { return static_cast<T *>(managed()); } + T *getPointer() const { return static_cast<T *>(managed()); } + Returned<T> *ret() const; }; typedef Safe<String> SafeString; typedef Safe<Object> SafeObject; |