gnomemm r1549 - in libgdamm/branches/libgdamm-4-0: libgda/libgdamm libgda/src tools/m4

[jhs svn gnome org]

Author: jhs
Date: Tue Jun  3 12:51:47 2008
New Revision: 1549
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1549&view=rev

Log:
2008-06-03  Johannes Schmid  <johannes schmid openismus com>

	* libgda/libgdamm/Makefile.am:
	* libgda/libgdamm/config.cc:
	* libgda/libgdamm/config.h:
	* libgda/libgdamm/value.cc:
	* libgda/libgdamm/value.h:
	Removed old files

	* libgda/libgdamm/init.cc:
	* libgda/src/batch.ccg:
	* libgda/src/batch.hg:
	* libgda/src/metastore.hg:
	* libgda/src/metastruct.ccg:
	* libgda/src/metastruct.hg:
	* libgda/src/sqlparser.ccg:
	* libgda/src/statement.ccg:
	* tools/m4/convert_libgdamm.m4:
	Fixed remaining build errors.

Removed:
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/config.cc
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/config.h
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/value.cc
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/value.h
Modified:
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/Makefile.am
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc
   libgdamm/branches/libgdamm-4-0/libgda/src/batch.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/batch.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/statement.ccg
   libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4

Modified: libgdamm/branches/libgdamm-4-0/libgda/libgdamm/Makefile.am
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/libgdamm/Makefile.am	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm/Makefile.am	Tue Jun  3 12:51:47 2008
@@ -11,8 +11,8 @@
 sublib_topdir = libgda
 
 
-files_extra_h	= init.h wrap_init.h config.h value.h
-files_extra_cc = init.cc config.cc value.cc
+files_extra_h	= init.h wrap_init.h
+files_extra_cc = init.cc
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 

Modified: libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm/init.cc	Tue Jun  3 12:51:47 2008
@@ -37,7 +37,7 @@
 {
   Glib::init(); //Sets up the g type system and the Glib::wrap() table.
   wrap_init(); //Tells the Glib::wrap() table about the libgnomecanvasmm classes.
-  gda_init(app_id.c_str(), version.c_str(), nargs, args);
+  gda_init();
 }
 
 

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/batch.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/batch.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/batch.ccg	Tue Jun  3 12:51:47 2008
@@ -20,6 +20,7 @@
  */
 
 #include <libgdamm/batch.h>
+#include <libgda/gda-batch.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/batch.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/batch.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/batch.hg	Tue Jun  3 12:51:47 2008
@@ -31,6 +31,8 @@
 namespace Gda
 {
 
+typedef Glib::SListHandle<Glib::RefPtr<const Statement> > StatementSList;
+
 /** Container for several values
  *
  * @ingroup Connection
@@ -38,20 +40,20 @@
 class Batch : public Glib::Object
 {
   _CLASS_GOBJECT(Batch, GdaBatch, GDA_BATCH, Glib::Object, GObject)
+protected:
+  _CTOR_DEFAULT()
 public:
   _WRAP_CREATE()
   
-  _WRAP_METHOD(void gda_batch_add_statement(const Glib::RefPtr<Statement>& stmt), gda_batch_add_statement)
-  _WRAP_METHOD(void gda_batch_remove_statement(const Glib::RefPtr<Statement>& stmt), gda_batch_remove_statement)
-  _WRAP_METHOD(Glib::ustring gda_batch_serialize(), gda_batch_serialize)
+  _WRAP_METHOD(void add_statement(const Glib::RefPtr<Statement>& stmt), gda_batch_add_statement)
+  _WRAP_METHOD(void remove_statement(const Glib::RefPtr<Statement>& stmt), gda_batch_remove_statement)
+  _WRAP_METHOD(Glib::ustring serialize(), gda_batch_serialize)
 
-  typedef Glib::SListHandle<const Statement> StatementSList;
-  #m4 _CONVERSION(`const GSList*', `StatementSList', __FL2H_SHALLOW)
+  #m4 _CONVERSION(`const GSList*',`StatementSList',`$2((GSList*)$3, Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(StatementSList get_statements(), gda_batch_get_statements)
 
-  #m4 _CONVERSION(`GObject*',`Glib::RefPtr<Statement>',`Glib::wrap($3)')
-  #m4 _CONVERSION(`Glib::RefPtr<Statement>', `GObject*', G_OBJECT($3.gobj())')
-  _WRAP_SIGNAL(void changed(Glib::RefPtr<Statement> stmt), "changed")
+  // TODO:
+  //_WRAP_SIGNAL(void changed(Glib::RefPtr<Statement> stmt), "changed")
 };
 
 } // namespace Gda

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg	Tue Jun  3 12:51:47 2008
@@ -20,6 +20,7 @@
  */
 
 #include <libgdamm/connection.h>
+#include <libgdamm/metastruct.h>
 
 _DEFS(libgdamm,libgda)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -30,6 +31,8 @@
 namespace Gda
 {
 
+typedef GdaMetaContext MetaContext;
+
 /** Container for several values
  *
  * @ingroup Connection
@@ -37,13 +40,16 @@
 class MetaStore : public Glib::Object
 {
   _CLASS_GOBJECT(MetaStore, GdaMetaStore, GDA_META_STORE, Glib::Object, GObject)
+protected:
+  _CTOR_DEFAULT()
+
 public:
   _WRAP_CREATE()
   
   _WRAP_METHOD(int get_version(), gda_meta_store_get_version)
   //TODO: varargs: extract(), modify()
 
-  _WRAP_METHOD(bool modify_with_context (const Glib::RefPtr<MetaContext>& context, const Glib::RefPtr<DataModel>& new_data), gda_meta_store_modify_with_context, errthrow)
+  _WRAP_METHOD(bool modify_with_context (MetaContext* context, const Glib::RefPtr<DataModel>& new_data), gda_meta_store_modify_with_context, errthrow)
   _WRAP_METHOD(Glib::RefPtr<MetaStruct> schema_get_structure(), gda_meta_store_schema_get_structure, errthrow)
 
   //TODO get_atrribute_value()

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg	Tue Jun  3 12:51:47 2008
@@ -20,6 +20,7 @@
  */
 
 #include <libgdamm/metastruct.h>
+#include <libgda/gda-enum-types.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg	Tue Jun  3 12:51:47 2008
@@ -39,6 +39,9 @@
 class MetaStruct : public Glib::Object
 {
   _CLASS_GOBJECT(MetaStruct, GdaMetaStruct, GDA_META_STRUCT, Glib::Object, GObject)
+protected:
+  _WRAP_CTOR(MetaStruct(MetaStructFeature features), gda_meta_struct_new)
+
 public:
   _WRAP_CREATE(MetaStructFeature features)
   

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.ccg	Tue Jun  3 12:51:47 2008
@@ -21,6 +21,7 @@
 
 #include <libgdamm/sqlparser.h>
 #include <sql-parser/gda-sql-parser.h>
+#include <sql-parser/gda-sql-parser-enum-types.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/statement.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/statement.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/statement.ccg	Tue Jun  3 12:51:47 2008
@@ -22,6 +22,7 @@
 #include <libgdamm/statement.h>
 #include <libgdamm/connection.h>
 #include <libgda/gda-enum-types.h>
+#include <sql-parser/gda-sql-parser-enum-types.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	Tue Jun  3 12:51:47 2008
@@ -1,4 +1,5 @@
 _EQUAL(glong,long)
+_EQUAL(GdaMetaContext*, MetaContext*)
 
 _CONVERSION(`GdaConnectionEvent*',`Glib::RefPtr<ConnectionEvent>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<ConnectionEvent>&', `GdaConnectionEvent*', __CONVERT_REFPTR_TO_P)
@@ -36,7 +37,6 @@
 _CONVERSION(`const Glib::RefPtr<const Set>&', `GdaSet*', __CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Batch>&', `GdaBatch*', __CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<MetaStore>&', `GdaMetaStore*', __CONVERT_CONST_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<MetaContext>&', `GdaMetaContext*', __CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<MetaStruct>&', `GdaMetaStruct*', __CONVERT_CONST_REFPTR_TO_P)
 
 _CONVERSION(`const Glib::RefPtr<const Row>&', `const GdaRow*', `($3)->gobj()')