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

* Support ownership transfer to non smoke wrapped QObjects & cleanup C++ to Lisp translation.

--- old-qt.gui/src/string-list.lisp 2014-10-30 07:44:49.000000000 +0100

+++ new-qt.gui/src/string-list.lisp 2014-10-30 07:44:49.000000000 +0100

@@ -17,45 +17,28 @@

(string :pointer)

(length :int))

-(define-foreign-type string-list ()

- ()

- (:actual-type :pointer))

-

-(eval-when (:load-toplevel)

- (smoke::add-type "QStringList" 'string-list)

- (smoke::add-type "const QStringList&" 'string-list))

-

-

-(define-parse-method string-list ()

- (make-instance 'string-list))

-

-(defmethod translate-to-foreign (sequence (type string-list))

- (let ((string-list (qt-smoke-make-string-list)))

- (map nil #'(lambda (string)

- (with-foreign-string ((data length) string :null-terminated-p nil)

- (qt-smoke-string-list-append string-list data length)))

- sequence)

- string-list))

-

-

-(defmethod translate-from-foreign (string-list (type string-list))

- (let ((vector (make-array (qt-smoke-string-list-size string-list))))

+(defun from-string-list (string-list)

+ (let ((vector (make-array (qt-smoke-string-list-size string-list)

+ :initial-element ""

+ :element-type 'string)))

(dotimes (index (length vector) vector)

(setf (aref vector index)

(cxx:data (make-instance 'qt:byte-array

:pointer (qt-smoke-string-list-at

string-list index)))))))

+

+(define-to-lisp-translation ("QStringList" "const QStringList&")

+ from-string-list qt-smoke-free-string-list)

-(defmethod free-translated-object (string-list (type string-list) param)

- (declare (ignore param))

- (qt-smoke-free-string-list string-list))

-

-(defun coerce-string-list (list)

- (make-cleanup-pointer

- (translate-to-foreign list (make-instance 'string-list))

- #'(lambda (pointer)

- (free-translated-object pointer (make-instance 'string-list)

- nil))))

+(defun coerce-string-list (sequence)

+ (let ((string-list (qt-smoke-make-string-list)))

+ (map nil

+ #'(lambda (string)

+ (with-foreign-string ((data length) string :null-terminated-p nil)

+ (qt-smoke-string-list-append string-list data length)))

+ sequence)

+ (make-cleanup-pointer

+ string-list #'qt-smoke-free-string-list)))

(define-from-lisp-translation "const QStringList&"

(vector string) coerce-string-list)