Combined the gobject.type-info package info gobject package

diff --git a/glib/cl-gtk2-glib.asd b/glib/cl-gtk2-glib.asd
index 4bdfa3b..2b2fdb3 100644 (file)
--- a/glib/cl-gtk2-glib.asd
+++ b/glib/cl-gtk2-glib.asd
@@ -14,12 +14,13 @@
                (:file "gobject.type-designator")
                (:file "gobject.ffi")
 
+               (:file "gobject.package")               
+               
                (:file "gobject.type-info")
                (:file "gobject.type-info.object")
                (:file "gobject.type-info.enum")
                (:file "gobject.type-info.signals")
                
-               (:file "gobject.package")
                (:file "gobject.gvalue")
                (:file "gobject.foreign")
                (:file "gobject.stable-pointer")

diff --git a/glib/gobject.package.lisp b/glib/gobject.package.lisp
index 59a21fa..6412304 100644 (file)
--- a/glib/gobject.package.lisp
+++ b/glib/gobject.package.lisp
@@ -1,6 +1,51 @@
 (defpackage :gobject
-  (:use :cl :glib :cffi :tg :bordeaux-threads :iter :closer-mop :gobject.ffi :gobject.type-info)
-  (:export #:+g-type-invalid+
+  (:use :cl :glib :cffi :tg :bordeaux-threads :iter :closer-mop :gobject.ffi)
+  (:export #:g-type
+           #:g-type-children
+           #:g-type-parent
+           #:g-type-designator
+           #:g-type-fundamental
+           #:g-type-depth
+           #:g-type-next-base
+           #:g-type-is-a
+           #:g-type-interfaces
+           #:g-type-interface-prerequisites
+           #:g-strv-get-type
+           #:g-closure-get-type
+           #:g-class-property-definition
+           #:g-class-property-definition-name
+           #:g-class-property-definition-type
+           #:g-class-property-definition-readable
+           #:g-class-property-definition-writable
+           #:g-class-property-definition-constructor
+           #:g-class-property-definition-constructor-only
+           #:g-class-property-definition-owner-type
+           #:parse-g-param-spec
+           #:class-properties
+           #:interface-properties
+           #:enum-item
+           #:enum-item-name
+           #:enum-item-value
+           #:enum-item-nick
+           #:get-enum-items
+           #:flags-item
+           #:flags-item-name
+           #:flags-item-value
+           #:flags-item-nick
+           #:get-flags-items
+           #:signal-info
+           #:signal-info-id
+           #:signal-info-name
+           #:signal-info-owner-type
+           #:signal-info-flags
+           #:signal-info-return-type
+           #:signal-info-param-types
+           #:signal-info-detail
+           #:query-signal-info
+           #:type-signals
+           #:parse-signal-name
+           #:class-property-info
+           #:+g-type-invalid+
            #:+g-type-void+
            #:+g-type-interface+
            #:+g-type-char+

diff --git a/glib/gobject.type-info.enum.lisp b/glib/gobject.type-info.enum.lisp
index 7764c18..5060cf3 100644 (file)
--- a/glib/gobject.type-info.enum.lisp
+++ b/glib/gobject.type-info.enum.lisp
@@ -1,4 +1,4 @@
-(in-package :gobject.type-info)
+(in-package :gobject)
 
 (defstruct enum-item
   "A structure describing a single enumeration item.

diff --git a/glib/gobject.type-info.lisp b/glib/gobject.type-info.lisp
index 8a7706f..9d5fa1a 100644 (file)
--- a/glib/gobject.type-info.lisp
+++ b/glib/gobject.type-info.lisp
@@ -1,113 +1,4 @@
-(defpackage :gobject.type-info
-  (:use :cl :iter :cffi :glib :gobject.ffi)
-  (:export #:+g-type-invalid+
-           #:+g-type-void+
-           #:+g-type-interface+
-           #:+g-type-char+
-           #:+g-type-uchar+
-           #:+g-type-boolean+
-           #:+g-type-int+
-           #:+g-type-uint+
-           #:+g-type-long+
-           #:+g-type-ulong+
-           #:+g-type-int64+
-           #:+g-type-uint64+
-           #:+g-type-enum+
-           #:+g-type-flags+
-           #:+g-type-float+
-           #:+g-type-double+
-           #:+g-type-string+
-           #:+g-type-pointer+
-           #:+g-type-boxed+
-           #:+g-type-param+
-           #:+g-type-object+
-           #:g-type-name
-           #:g-type-from-name
-           #:g-type
-           #:g-type-children
-           #:g-type-parent
-           #:g-type-designator
-           #:g-type-fundamental
-           #:g-type-depth
-           #:g-type-next-base
-           #:g-type-is-a
-           #:g-type-interfaces
-           #:g-type-interface-prerequisites
-           #:g-strv-get-type
-           #:g-closure-get-type
-           #:g-class-property-definition
-           #:g-class-property-definition-name
-           #:g-class-property-definition-type
-           #:g-class-property-definition-readable
-           #:g-class-property-definition-writable
-           #:g-class-property-definition-constructor
-           #:g-class-property-definition-constructor-only
-           #:g-class-property-definition-owner-type
-           #:parse-g-param-spec
-           #:class-properties
-           #:interface-properties
-           #:enum-item
-           #:enum-item-name
-           #:enum-item-value
-           #:enum-item-nick
-           #:get-enum-items
-           #:flags-item
-           #:flags-item-name
-           #:flags-item-value
-           #:flags-item-nick
-           #:get-flags-items
-           #:signal-info
-           #:signal-info-id
-           #:signal-info-name
-           #:signal-info-owner-type
-           #:signal-info-flags
-           #:signal-info-return-type
-           #:signal-info-param-types
-           #:signal-info-detail
-           #:query-signal-info
-           #:type-signals
-           #:parse-signal-name
-           #:class-property-info)
-  (:documentation
-"This package contains functions for querying the basic type information from GObject type system. For an overview of GObject type system, see @a[http://library.gnome.org/devel/gobject/stable/index.html]{GObject documentation}
-
-Types are identified by GType designators that are specified in @class{g-type-designator}. Functions of this package provide means to query basic information about type.
-
-@begin{itemize}
-@item{@fun{g-type-name} and @fun{g-type-from-name} convert between numeric and string representation of GType.}
-@item{@fun{g-type-parent}, @fun{g-type-children} and @fun{g-type-interfaces} traverse across the type hierarchy.}
-@item{@fun{g-type-depth}, @fun{g-type-fundamental}, @fun{g-type-is-a}, @fun{g-type-next-base} are convenience functions that provide useful information from type hierarchy}
-@end{itemize}
-
-This is a list of variables and functions that correspond to basic types:
-@begin{itemize}
-@item{@fun{g-closure-get-type}}
-@item{@fun{g-strv-get-type}}
-@item{@variable{+g-type-invalid+}}
-@item{@variable{+g-type-void+}}
-@item{@variable{+g-type-interface+}}
-@item{@variable{+g-type-char+}}
-@item{@variable{+g-type-uchar+}}
-@item{@variable{+g-type-boolean+}}
-@item{@variable{+g-type-int+}}
-@item{@variable{+g-type-uint+}}
-@item{@variable{+g-type-long+}}
-@item{@variable{+g-type-ulong+}}
-@item{@variable{+g-type-int64+}}
-@item{@variable{+g-type-uint64+}}
-@item{@variable{+g-type-enum+}}
-@item{@variable{+g-type-flags+}}
-@item{@variable{+g-type-float+}}
-@item{@variable{+g-type-double+}}
-@item{@variable{+g-type-string+}}
-@item{@variable{+g-type-pointer+}}
-@item{@variable{+g-type-boxed+}}
-@item{@variable{+g-type-param+}}
-@item{@variable{+g-type-object+}}
-@end{itemize}
-"))
-
-(in-package :gobject.type-info)
+(in-package :gobject)
 
 (defctype g-type gsize)
 

diff --git a/glib/gobject.type-info.object.lisp b/glib/gobject.type-info.object.lisp
index 0a3cfbc..27b7db0 100644 (file)
--- a/glib/gobject.type-info.object.lisp
+++ b/glib/gobject.type-info.object.lisp
@@ -1,4 +1,4 @@
-(in-package :gobject.type-info)
+(in-package :gobject)
 
 (defstruct g-class-property-definition
   "Structure describing property of a GObject class.

diff --git a/glib/gobject.type-info.signals.lisp b/glib/gobject.type-info.signals.lisp
index b75be0d..2a11587 100644 (file)
--- a/glib/gobject.type-info.signals.lisp
+++ b/glib/gobject.type-info.signals.lisp
@@ -1,4 +1,4 @@
-(in-package :gobject.type-info)
+(in-package :gobject)
 
 (defstruct signal-info
   id