Sun Jun 21 11:29:25 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>
* *SMOKE-MODULE* must be passed instead of *QT-SMOKE*.
hunk ./src/application.lisp 7
-(defvar *exec-p* t
+(defvar qt:*exec-p* t
hunk ./src/application.lisp 108
- (when *exec-p*
+ (when qt:*exec-p*
hunk ./src/list.lisp 48
- (smoke::make-smoke-type *qt-smoke* ,type-name)))))))
+ (smoke::make-smoke-type *smoke-module* ,type-name)))))))
hunk ./src/object.lisp 58
- (not (null-pointer-p (smoke::pointer-call (smoke::make-smoke-method (find-class 'qt:object)
+ (not (null-pointer-p (smoke::pointer-call (smoke::make-smoke-method-from-name (find-class 'qt:object)
hunk ./src/object.lisp 64
-(the destructed callback is called when the object is freed.)"
+ (the destructed callback is called when the object is freed.)"
hunk ./src/object.lisp 67
+ (declare (optimize (speed 3)))
hunk ./src/object.lisp 79
+ (declare (optimize (speed 3)))
hunk ./src/object.lisp 101
- (smoke::make-smoke-method (smoke::make-smoke-class
- *qt-smoke*
- "QObject")
- "parent"))
+ (smoke::make-smoke-method-from-name (find-class 'qt:object) "parent"))
hunk ./src/object.lisp 105
- (smoke::make-smoke-method (smoke::make-smoke-class
- *qt-smoke*
- "QObject")
- "deleteLater")))
-(defun print-object-to-string (object)
- (with-output-to-string (stream)
- (print-object object stream)))
+ (smoke::make-smoke-method-from-name (find-class 'qt:object) "deleteLater")))
hunk ./src/object.lisp 108
- "Delete the qt:object OBJECT,
+ "Delete the qt:object OBJECT,
hunk ./src/object.lisp 110
- (let ((pointer (pointer object))
- (class (class-of object))
- (next (call-next-method)))
- (if (typep (class-of object) 'cxx:class)
- #'(lambda ()
- (handler-case [_$_]
- (if (null-pointer-p (smoke::pointer-call *get-parent* pointer))
- (smoke::pointer-call *delete-later* pointer)
- (error (make-condition 'wrapper-gc
- :class-name (name class)
- :pointer pointer)))
- (error (condition)
- (smoke::report-finalize-error condition "qt:object wrap"
- (name class) pointer))))
- #'(lambda ()
- (handler-case [_$_]
- (if (null-pointer-p (smoke::pointer-call *get-parent* pointer))
+ (let ((pointer (pointer object))
+ (class (class-of object))
+ (next (call-next-method)))
+ (declare (function next))
+ (if (typep (class-of object) 'cxx:class)
+ #'(lambda ()
+ (declare (optimize (speed 3)))
+ (handler-case [_$_]
+ (if (null-pointer-p (smoke::pointer-call *get-parent* pointer))
+ (smoke::pointer-call *delete-later* pointer)
+ (error (make-condition 'wrapper-gc
+ :class-name (name class)
+ :pointer pointer)))
+ (error (condition)
+ (smoke::report-finalize-error condition "qt:object wrap"
+ (name class) pointer))))
+ #'(lambda ()
+ (declare (optimize (speed 3)))
+ (handler-case [_$_]
+ (if (null-pointer-p (smoke::pointer-call *get-parent* pointer))
hunk ./src/object.lisp 132
- (error (condition)
- (smoke::report-finalize-error condition "qt:object"
- (name class) pointer)))))))
+ (error (condition)
+ (smoke::report-finalize-error condition "qt:object"
+ (name class) pointer)))))))
hunk ./src/object.lisp 187
- (error "The event-notify callback table is full."))))
+ (error "The Qt event-notify callback table is full."))))
hunk ./src/qstring.lisp 41
-(let ((method (smoke::make-smoke-method (find-class 'qt:byte-array)
+ (let ((method (smoke::make-smoke-method-from-name (find-class 'qt:byte-array)
hunk ./src/signal-slot/connect.lisp 43
+ :argument-types (argument-types (signal-object sender))
hunk ./src/signal-slot/connect.lisp 48
- (types (arguments sender)))
+ (types (argument-types (signal-object sender))))
hunk ./src/signal-slot/translate.lisp 4
- (smoke::make-smoke-type *qt-smoke* (subseq name start end)))
+ (smoke::make-smoke-type *smoke-module* (subseq name start end)))
hunk ./src/signal-slot/translate.lisp 89
- (let ((type (meta-type.type (smoke::name smoke-type))))
+ (let ((type (qt:meta-type.type (smoke::name smoke-type))))