Sun Apr 12 21:55:35 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>

* indent variant.lisp & minor cleanup

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

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

@@ -6,7 +6,7 @@

(timer-id :type integer))

(:metaclass cxx:class))

-(defvar *single-shot-timers* nil)

+(defvar *single-shot-timers* nil "Pending timers.")

(defun single-shot (function &optional (timeout 0))

"Run FUNCTION after TIMEOUT seconds, or as soon as all window events

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

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

@@ -1,7 +1,5 @@

(in-package :qt)

-(declaim (optimize (debug 3)))

-

(defgeneric make-variant (value)

(:documentation "Returns a variant for VALUE."))

@@ -35,23 +33,25 @@

"Returns true when VARIANT is valid (has a value) and false otherwise."

(cxx:is-valid variant))

+;;FIXME define setf-able value function

+

(defun from-variant (variant)

"Returns the value of VARIANT."

(ecase (cxx:user-type variant)

(#.(value variant.+invalid+)

- (cerror "Return (VALUES)" "Type of variant ~A is invalid." variant)

- (values))

+ (cerror "Return NIL" "Type of variant ~A is invalid." variant)

+ nil)

(#.(value variant.+string+)

- (cxx:to-string variant))

+ (cxx:to-string variant))

(#.(value variant.+string-list+)

(cxx:to-string-list variant))

(#.(value variant.+uint+)

- (cxx:to-uint variant))

+ (cxx:to-uint variant))

(#.(value variant.+int+)

- (cxx:to-int variant))

+ (cxx:to-int variant))

(#.(value variant.+double+)

- (cxx:to-double variant))

- (#.*cxx-lisp-object-metatype* ;; FIXME test this!

+ (cxx:to-double variant))

+ (#.*cxx-lisp-object-metatype*

(let* ((lisp-object (qt-smoke-lisp-object-value (smoke::pointer variant)))

(value))

(setf value (translate-cxx-lisp-object lisp-object))