gnomemm r1730 - in libgdamm/trunk: . libgda/src

[jhs svn gnome org]

Author: jhs
Date: Tue Oct  7 10:55:13 2008
New Revision: 1730
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1730&view=rev

Log:
2008-10-07  Johannes Schmid  <jschmid openismus com>

        * libgda/src/column.ccg:
        * libgda/src/column.hg:
        * libgda/src/holder.ccg:
        * libgda/src/holder.hg:
        * libgda/src/libgda_methods.defs:
        * libgda/src/libgda_signals.defs:
        * libgda/src/set.hg:
        Fixed build due to several API changes in libgda



Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/column.ccg
   libgdamm/trunk/libgda/src/column.hg
   libgdamm/trunk/libgda/src/holder.ccg
   libgdamm/trunk/libgda/src/holder.hg
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/libgda_signals.defs
   libgdamm/trunk/libgda/src/set.hg

Modified: libgdamm/trunk/libgda/src/column.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/column.ccg	(original)
+++ libgdamm/trunk/libgda/src/column.ccg	Tue Oct  7 10:55:13 2008
@@ -42,7 +42,7 @@
   if(!src)
     return false;
 
-  const bool result = get_title() == src->get_title() &&
+  const bool result = get_description() == src->get_description() &&
                 get_name() == src->get_name() &&
                 get_dbms_type() == src->get_dbms_type() &&
                 get_g_type() == src->get_g_type() &&

Modified: libgdamm/trunk/libgda/src/column.hg
==============================================================================
--- libgdamm/trunk/libgda/src/column.hg	(original)
+++ libgdamm/trunk/libgda/src/column.hg	Tue Oct  7 10:55:13 2008
@@ -49,8 +49,8 @@
   _WRAP_METHOD(Glib::RefPtr<Column> copy() const, gda_column_copy)
   bool equal(const Glib::RefPtr<const Column>& src) const;
 
-  _WRAP_METHOD(Glib::ustring get_title() const, gda_column_get_title)
-  _WRAP_METHOD(void set_title(const Glib::ustring& title), gda_column_set_title)
+  _WRAP_METHOD(Glib::ustring get_description() const, gda_column_get_description)
+  _WRAP_METHOD(void set_description(const Glib::ustring& description), gda_column_set_description)
 
   _WRAP_METHOD(Glib::ustring get_name() const, gda_column_get_name)
   _WRAP_METHOD(void set_name(const Glib::ustring& name), gda_column_set_name)

Modified: libgdamm/trunk/libgda/src/holder.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/holder.ccg	(original)
+++ libgdamm/trunk/libgda/src/holder.ccg	Tue Oct  7 10:55:13 2008
@@ -30,16 +30,16 @@
 {
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::ValueBase Holder::take_statis_value (const Glib::ValueBase& value)
+Glib::ValueBase Holder::take_static_value (const Glib::ValueBase& value, bool& value_changed)
 #else
-Glib::ValueBase Holder::take_statis_value (const Glib::ValueBase& value, std::auto_ptr<Glib::Error>& error)
+Glib::ValueBase Holder::take_static_value (const Glib::ValueBase& value, bool& value_changed, std::auto_ptr<Glib::Error>& error)
 #endif
 {
   GError* gerror = 0;
   Glib::ValueBase retval;
   const GValue* cvalue;
   //Note that the function does not return a new value, so we should not free it:
-  cvalue = gda_holder_take_static_value(gobj(), value.gobj(), &gerror);
+  cvalue = gda_holder_take_static_value(gobj(), value.gobj(), (gboolean*)&value_changed, &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);

Modified: libgdamm/trunk/libgda/src/holder.hg
==============================================================================
--- libgdamm/trunk/libgda/src/holder.hg	(original)
+++ libgdamm/trunk/libgda/src/holder.hg	Tue Oct  7 10:55:13 2008
@@ -55,9 +55,9 @@
   _WRAP_METHOD(bool take_value (Glib::ValueBase& value), gda_holder_take_value, errthrow)
   _WRAP_METHOD_DOCS_ONLY(gda_holder_take_static_value)
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  Glib::ValueBase take_statis_value (const Glib::ValueBase& value);
+  Glib::ValueBase take_static_value (const Glib::ValueBase& value, bool& value_changed);
 #else
-  Glib::ValueBase take_statis_value (const Glib::ValueBase& value, std::auto_ptr<Glib::Error>& error);
+  Glib::ValueBase take_static_value (const Glib::ValueBase& value, bool& value_changed, std::auto_ptr<Glib::Error>& error);
 #endif
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_default_value)
   Glib::ValueBase get_default_value();

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Tue Oct  7 10:55:13 2008
@@ -499,28 +499,6 @@
   )
 )
 
-(define-enum GraphType
-  (in-module "Gda")
-  (c-name "GdaGraphType")
-  (gtype-id "GDA_TYPE_GRAPH_TYPE")
-  (values
-    '("db-relations" "GDA_GRAPH_DB_RELATIONS")
-    '("query-joins" "GDA_GRAPH_QUERY_JOINS")
-    '("modelling" "GDA_GRAPH_MODELLING")
-  )
-)
-
-(define-flags QueryFieldState
-  (in-module "Gda")
-  (c-name "GdaQueryFieldState")
-  (gtype-id "GDA_TYPE_QUERY_FIELD_STATE")
-  (values
-    '("visible" "GDA_ENTITY_FIELD_VISIBLE")
-    '("invisible" "GDA_ENTITY_FIELD_INVISIBLE")
-    '("any" "GDA_ENTITY_FIELD_ANY")
-  )
-)
-
 (define-enum HolderError
   (in-module "Gda")
   (c-name "GdaHolderError")
@@ -777,6 +755,89 @@
 )
 
 
+;; From gda-attributes-manager.h
+
+(define-function gda_attributes_manager_new
+  (c-name "gda_attributes_manager_new")
+  (is-constructor-of "GdaAttributesManager")
+  (return-type "GdaAttributesManager*")
+  (parameters
+    '("gboolean" "for_objects")
+  )
+)
+
+(define-method free
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_free")
+  (return-type "none")
+)
+
+(define-method set
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_set")
+  (return-type "none")
+  (parameters
+    '("gpointer" "ptr")
+    '("const-gchar*" "att_name")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method set_full
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_set_full")
+  (return-type "none")
+  (parameters
+    '("gpointer" "ptr")
+    '("const-gchar*" "att_name")
+    '("const-GValue*" "value")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-method get
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_get")
+  (return-type "const-GValue*")
+  (parameters
+    '("gpointer" "ptr")
+    '("const-gchar*" "att_name")
+  )
+)
+
+(define-method copy
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_copy")
+  (return-type "none")
+  (parameters
+    '("gpointer*" "from")
+    '("GdaAttributesManager*" "to_mgr")
+    '("gpointer*" "to")
+  )
+)
+
+(define-method clear
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_clear")
+  (return-type "none")
+  (parameters
+    '("gpointer" "ptr")
+  )
+)
+
+(define-method foreach
+  (of-object "GdaAttributesManager")
+  (c-name "gda_attributes_manager_foreach")
+  (return-type "none")
+  (parameters
+    '("gpointer" "ptr")
+    '("GdaAttributesManagerFunc" "func")
+    '("gpointer" "data")
+  )
+)
+
+
+
 ;; From gda-batch.h
 
 (define-function gda_batch_get_type
@@ -911,15 +972,15 @@
   (return-type "GdaColumn*")
 )
 
-(define-method get_title
+(define-method get_description
   (of-object "GdaColumn")
-  (c-name "gda_column_get_title")
+  (c-name "gda_column_get_description")
   (return-type "const-gchar*")
 )
 
-(define-method set_title
+(define-method set_description
   (of-object "GdaColumn")
-  (c-name "gda_column_set_title")
+  (c-name "gda_column_set_description")
   (return-type "none")
   (parameters
     '("const-gchar*" "title")
@@ -1031,6 +1092,25 @@
   )
 )
 
+(define-method get_attribute
+  (of-object "GdaColumn")
+  (c-name "gda_column_get_attribute")
+  (return-type "const-GValue*")
+  (parameters
+    '("const-gchar*" "attribute")
+  )
+)
+
+(define-method set_attribute
+  (of-object "GdaColumn")
+  (c-name "gda_column_set_attribute")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "attribute")
+    '("const-GValue*" "value")
+  )
+)
+
 
 
 ;; From gda-config.h
@@ -1578,6 +1658,17 @@
   (varargs #t)
 )
 
+(define-method get_meta_store_data_v
+  (of-object "GdaConnection")
+  (c-name "gda_connection_get_meta_store_data_v")
+  (return-type "GdaDataModel*")
+  (parameters
+    '("GdaConnectionMetaType" "meta_type")
+    '("GList*" "filters")
+    '("GError**" "error")
+  )
+)
+
 
 
 ;; From gda-connection-private.h
@@ -3216,16 +3307,6 @@
   (return-type "GType")
 )
 
-(define-function gda_graph_type_get_type
-  (c-name "gda_graph_type_get_type")
-  (return-type "GType")
-)
-
-(define-function gda_query_field_state_get_type
-  (c-name "gda_query_field_state_get_type")
-  (return-type "GType")
-)
-
 (define-function gda_holder_error_get_type
   (c-name "gda_holder_error_get_type")
   (return-type "GType")
@@ -3413,6 +3494,7 @@
   (return-type "GValue*")
   (parameters
     '("const-GValue*" "value")
+    '("gboolean*" "value_changed")
     '("GError**" "error")
   )
 )
@@ -3518,6 +3600,25 @@
   (return-type "GdaHolder*")
 )
 
+(define-method get_attribute
+  (of-object "GdaHolder")
+  (c-name "gda_holder_get_attribute")
+  (return-type "const-GValue*")
+  (parameters
+    '("const-gchar*" "attribute")
+  )
+)
+
+(define-method set_attribute
+  (of-object "GdaHolder")
+  (c-name "gda_holder_set_attribute")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "attribute")
+    '("const-GValue*" "value")
+  )
+)
+
 
 
 ;; From gda-lockable.h
@@ -3738,6 +3839,35 @@
 
 ;; From gda-meta-struct.h
 
+(define-method get_attribute
+  (of-object "GdaMetaTableColumn")
+  (c-name "gda_meta_table_column_get_attribute")
+  (return-type "const-GValue*")
+  (parameters
+    '("const-gchar*" "att_name")
+  )
+)
+
+(define-method set_attribute
+  (of-object "GdaMetaTableColumn")
+  (c-name "gda_meta_table_column_set_attribute")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "att_name")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method foreach_attribute
+  (of-object "GdaMetaTableColumn")
+  (c-name "gda_meta_table_column_foreach_attribute")
+  (return-type "none")
+  (parameters
+    '("GdaAttributesManagerFunc" "func")
+    '("gpointer" "data")
+  )
+)
+
 (define-function gda_meta_struct_get_type
   (c-name "gda_meta_struct_get_type")
   (return-type "GType")
@@ -4555,12 +4685,6 @@
   )
 )
 
-(define-method get_spec
-  (of-object "GdaSet")
-  (c-name "gda_set_get_spec")
-  (return-type "gchar*")
-)
-
 (define-method set_holder_value
   (of-object "GdaSet")
   (c-name "gda_set_set_holder_value")

Modified: libgdamm/trunk/libgda/src/libgda_signals.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_signals.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_signals.defs	Tue Oct  7 10:55:13 2008
@@ -587,6 +587,16 @@
   (when "first")
 )
 
+(define-signal attribute-changed
+  (of-object "GdaHolder")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("const-gchar*" "p0")
+    '("gpointer" "p1")
+  )
+)
+
 (define-signal validate-change
   (of-object "GdaHolder")
   (return-type "gpointer")
@@ -623,15 +633,6 @@
   (construct-only #f)
 )
 
-(define-property plugin
-  (of-object "GdaHolder")
-  (prop-type "GParamString")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property simple-bind
   (of-object "GdaHolder")
   (prop-type "GParamObject")
@@ -670,7 +671,7 @@
 
 (define-property g-type
   (of-object "GdaHolder")
-  (prop-type "GParamULong")
+  (prop-type "GParamGType")
   (docs "")
   (readable #t)
   (writable #t)
@@ -866,21 +867,14 @@
   (when "last")
 )
 
-(define-signal holder-plugin-changed
-  (of-object "GdaSet")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("GdaHolder*" "p0")
-  )
-)
-
 (define-signal holder-attr-changed
   (of-object "GdaSet")
   (return-type "void")
   (when "first")
   (parameters
     '("GdaHolder*" "p0")
+    '("const-gchar*" "p1")
+    '("gpointer" "p2")
   )
 )
 

Modified: libgdamm/trunk/libgda/src/set.hg
==============================================================================
--- libgdamm/trunk/libgda/src/set.hg	(original)
+++ libgdamm/trunk/libgda/src/set.hg	Tue Oct  7 10:55:13 2008
@@ -51,7 +51,6 @@
   
   _WRAP_METHOD(Glib::RefPtr<Set> copy(), gda_set_copy)
 
-  _WRAP_METHOD(Glib::ustring get_spec(), gda_set_get_spec)
   _WRAP_METHOD_DOCS_ONLY(gda_set_get_holder_value)
   Glib::ValueBase get_holder_value(const Glib::ustring& holder_id);
   _WRAP_METHOD_DOCS_ONLY(gda_set_set_holder_value)
@@ -70,9 +69,8 @@
   _WRAP_METHOD(SetGroup* get_group (const Glib::RefPtr<Holder>& param), gda_set_get_group)
   _WRAP_METHOD(SetNode* get_node (const Glib::RefPtr<Holder>& param), gda_set_get_node)
 
-  _WRAP_SIGNAL(void holder_attr_changed (const Glib::RefPtr<Holder>& holder), "holder-attr-changed")
+  // FIXME: _WRAP_SIGNAL(void holder_attr_changed (const Glib::RefPtr<Holder>& holder, const Glib::ustring& attr_name, const Glib::ValueBase& value), "holder-attr-changed")
   _WRAP_SIGNAL(void holder_changed (const Glib::RefPtr<Holder>& holder), "holder-changed")
-  _WRAP_SIGNAL(void holder_plugin_changed (const Glib::RefPtr<Holder>& holder), "holder-plugin-changed")
   _WRAP_SIGNAL(void public_data_changed (), "public-data-changed")
   #m4 _CONVERSION(`gpointer',`Glib::Error*',`Glib::wrap($3)')
   #m4 _CONVERSION(`Glib::Error*',`gpointer',`(gpointer) $3->gobj()')