From 68d74b67da1c14045e04ff13d7cd1bce8ea8d622 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Sat, 14 Feb 2015 23:22:23 +0100
Subject: Use Heap::Pointer in more places

Change-Id: I2a64aadcd47ed05ad7d08a70a5d765d898a671fd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/memory/qv4heap_p.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/qml/memory/qv4heap_p.h')

diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h
index 5f931529e9..606fd47cbb 100644
--- a/src/qml/memory/qv4heap_p.h
+++ b/src/qml/memory/qv4heap_p.h
@@ -108,16 +108,15 @@ struct Pointer {
     Pointer() {}
     Pointer(T *t) : ptr(t) {}
 
-    T *operator->() const { return static_cast<T *>(ptr); }
-    operator T *() const { return static_cast<T *>(ptr); }
+    T *operator->() const { return ptr; }
+    operator T *() const { return ptr; }
 
     Pointer &operator =(T *t) { ptr = t; return *this; }
 
     template <typename Type>
     Type *cast() { return static_cast<Type *>(ptr); }
 
-    // Use Base, not T here, to ensure T inherits from ptr
-    Base *ptr;
+    T *ptr;
 };
 
 }
-- 
cgit v1.2.3