Thu Jun 11 16:59:48 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>

* :qt and :qt-impl packages to prevent collision with :cl symbols and fix object with non smoke parent.

--- old-qt.gui/src/properties.lisp 2014-10-30 07:47:07.000000000 +0100

+++ new-qt.gui/src/properties.lisp 2014-10-30 07:47:07.000000000 +0100

@@ -1,4 +1,4 @@

-(in-package :qt)

+(in-package :cl-smoke.qt-impl)

(defun reverse-lispify (symbol)

"Converts the name of symbol to C++ style."

@@ -10,24 +10,24 @@

(string name)

(symbol (reverse-lispify name))))

-(defun property (object name)

+(defun qt:property (object name)

"Returns the property NAME of OBJECT."

- (from-variant (cxx:property object (property-name name))))

+ (qt:from-variant (cxx:property object (property-name name))))

-(defun (setf property) (new-value object name)

+(defun (setf qt:property) (new-value object name)

(cxx:set-property object (property-name name)

(make-instance 'qt:variant

:args (list new-value)))

new-value)

-(defun remove-property (object name)

+(defun qt:remove-property (object name)

"Removes the property NAME from OBJECT."

- (setf (property object name) (qt:make-variant)))

+ (setf (qt:property object name) (qt:make-variant)))

-(defun property-p (object name)

+(defun qt:property-p (object name)

"Returns T when NAME is a property of OBJECT and NIL otherwise."

- (variant-boundp (cxx:property object (property-name name))))

+ (qt:variant-boundp (cxx:property object (property-name name))))

(defun meta-object-properties (meta-object &optional (all t))

"Returns a list of the properties of META-OBJECT."

@@ -35,25 +35,25 @@

below (cxx:property-count meta-object)

collect (smoke::lispify (cxx:name (cxx:property meta-object index)))))

-(defgeneric class-properties (class)

+(defgeneric qt:class-properties (class)

(:documentation "Returns a list of the properties of CLASS.")

(:method ((class class))

(meta-object-properties (cxx:static-meta-object class)))

(:method ((symbol symbol))

- (class-properties (find-class symbol))))

+ (qt:class-properties (find-class symbol))))

-(defgeneric class-direct-properties (class)

+(defgeneric qt:class-direct-properties (class)

(:documentation "Returns a list of the properties of CLASS.")

(:method ((class class))

(meta-object-properties (cxx:static-meta-object class) nil))

(:method ((symbol symbol))

- (class-direct-properties (find-class symbol))))

+ (qt:class-direct-properties (find-class symbol))))

(defun dynamic-properties (object)

(map 'list (compose #'smoke::lispify #'cxx:data)

(cxx:dynamic-property-names object)))

-(defun properties (object)

+(defun qt:properties (object)

"Returns a list of the properties of OBJECT."

(nconc (dynamic-properties object)

(meta-object-properties (cxx:meta-object object))))