Thu Jul 2 21:12:45 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>
* move emit slot code to new function ACTIVATE & image startup fix for STATIC-META-OBJECT
hunk ./src/object.lisp 3
-(let ((object (make-instance 'qt:object)))
- (defmethod cxx:static-meta-object ((class (eql (find-class 'qt:object))))
- "No OBJECT.STATIC-META-OBJECT (r558420)."
- (cxx:meta-object object))
- (defmethod cxx:static-meta-object ((class cxx:class))
- (cxx:static-meta-object (smoke::find-smoke-class class))))
+(smoke:eval-startup (:load-toplevel :compile-toplevel :execute)
+ (let ((object (make-instance 'qt:object)))
+ (defmethod cxx:static-meta-object ((class (eql (find-class 'qt:object))))
+ "No OBJECT.STATIC-META-OBJECT (r558420)."
+ (cxx:meta-object object))))
+
+(defmethod cxx:static-meta-object ((class cxx:class))
+ (cxx:static-meta-object (smoke::find-smoke-class class)))
hunk ./src/signal-slot/signal.lisp 89
+ (activate qsignal (id qsignal) (argument-types qsignal) arguments))
+
+(defun activate (object id types arguments)
hunk ./src/signal-slot/signal.lisp 95
- (let ((types (argument-types qsignal)))
- (smoke::with-stack (stack (convert-arguments arguments types)
- types)
- (cffi:with-foreign-object (args :pointer (1+ (length arguments)))
- (loop for i from 1 to (smoke::size stack)
- for type in (argument-types qsignal)
- do
+ (smoke::with-stack (stack (convert-arguments arguments types)
+ types)
+ (cffi:with-foreign-object (args :pointer (1+ (length arguments)))
+ (loop for i from 1 to (smoke::size stack)
+ for type in types
+ do
hunk ./src/signal-slot/signal.lisp 115
- (setf (mem-aref args :pointer 0)
- (null-pointer))
- (qt:meta-object.activate qsignal (cxx:meta-object qsignal)
- (id qsignal)
- args)))))
+ (setf (mem-aref args :pointer 0)
+ (null-pointer))
+ (qt:meta-object.activate object id args))))