Sun Aug 2 13:29:02 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>

* qt:event upcasting cleanup

--- old-qt.gui/src/object.lisp 2014-10-30 07:44:25.000000000 +0100

+++ new-qt.gui/src/object.lisp 2014-10-30 07:44:25.000000000 +0100

@@ -195,28 +195,23 @@

((data :pointer))

(declare (optimize (speed 3)))

(let ((receiver (smoke::get-object (cffi:mem-aref data :pointer 0)))

- (event (make-instance 'qt:event

- :pointer (cffi:mem-aref data :pointer 1))))

+ (event (cast-event

+ (make-instance 'qt:event

+ :pointer (cffi:mem-aref data :pointer 1)))))

(enum-case (cxx:type event)

(qt:event.+child-added+

- (let ((child-event (make-instance 'qt:child-event

- :pointer

- (smoke::upcast event (find-class 'qt:child-event)))))

- (tg:cancel-finalization (cxx:child child-event))

- (when (smoke::has-pointer-p (smoke::pointer (cxx:child child-event)))

- (unless receiver

- (setf receiver (ensure-smoke-parent (cxx:child child-event))))

- (smoke::transfer-ownership-to (cxx:child child-event) receiver))))

+ (tg:cancel-finalization (cxx:child event))

+ (when (smoke::has-pointer-p (smoke::pointer (cxx:child event)))

+ (unless receiver

+ (setf receiver (ensure-smoke-parent (cxx:child event))))

+ (smoke::transfer-ownership-to (cxx:child event) receiver)))

(qt:event.+child-removed+

- (let* ((child-event (make-instance 'qt:child-event

- :pointer (smoke::upcast event

- (find-class 'qt:child-event)))))

- ;; We receive child removed events for any QObject, whether

- ;; it was constructed by Smoke or not. Only take ownership of

- ;; objects that have been constructed by Smoke.

- (when (smoke::has-pointer-p (smoke::pointer (cxx:child child-event)))

- (assert receiver)

- (smoke::take-ownership (cxx:child child-event) receiver))))))

+ ;; We receive child removed events for any QObject, whether

+ ;; it was constructed by Smoke or not. Only take ownership of

+ ;; objects that have been constructed by Smoke.

+ (when (smoke::has-pointer-p (smoke::pointer (cxx:child event)))

+ (assert receiver)

+ (smoke::take-ownership (cxx:child event) receiver)))))

nil)

(eval-when (:compile-toplevel :load-toplevel :execute)