gnomemm r1547 - libgdamm/branches/libgdamm-4-0/libgda/src

[jhs svn gnome org]

Author: jhs
Date: Mon Jun  2 11:23:42 2008
New Revision: 1547
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1547&view=rev

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

	* libgda/src/batch.hg:
	* libgda/src/column.hg:
	* libgda/src/holder.ccg:
	* libgda/src/holder.hg:
	* libgda/src/sqlparser.ccg:
	* libgda/src/sqlparser.hg:
	* libgda/src/statement.ccg:
	* libgda/src/statement.hg:
	
	Fix more build errors

Modified:
   libgdamm/branches/libgdamm-4-0/libgda/src/batch.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/column.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/holder.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/statement.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/statement.hg

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	Mon Jun  2 11:23:42 2008
@@ -20,6 +20,7 @@
  */
 
 #include <libgdamm/holder.h>
+#include <libgdamm/statement.h>
 
 _DEFS(libgdamm,libgda)
 _PINCLUDE(glibmm/private/object_p.h)

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/column.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/column.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/column.hg	Mon Jun  2 11:23:42 2008
@@ -87,9 +87,10 @@
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void name_changed(const Glib::ustring& old_name), "name-changed")
-#m4 _CONVERSION(`gint', `GType', ($3)($2))
-#m4 _CONVERSION(`GType', `gint', ($3)($2))
-  _WRAP_SIGNAL(void g_type_changed(GType old_type, GType new_type), "g-type-changed")
+// TODO: 
+//#m4 _CONVERSION(`gint', `GType', ($3)($2))
+//#m4 _CONVERSION(`GType', `gint', ($3)($2))
+//  _WRAP_SIGNAL(void g_type_changed(GType old_type, GType new_type), "g-type-changed")
 
   _WRAP_PROPERTY("id", Glib::ustring)
 };

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/holder.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/holder.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/holder.ccg	Mon Jun  2 11:23:42 2008
@@ -20,6 +20,7 @@
  */
 
 #include <libgdamm/holder.h>
+#include <libgdamm/datamodel.h>
 #include <libgda/gda-holder.h>
 
 namespace Gnome
@@ -28,7 +29,7 @@
 namespace Gda
 {
 
-Glib::ValueBase Holder::get_value() const
+Glib::ValueBase Holder::get_value()
 {
   Glib::ValueBase retval;
   const GValue* value = gda_holder_get_value(gobj());
@@ -36,7 +37,7 @@
   return retval;
 }
 
-Glib::ValueBase Holder::get_default_value() const
+Glib::ValueBase Holder::get_default_value()
 {
   Glib::ValueBase retval;
   const GValue* value = gda_holder_get_default_value(gobj());

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg	Mon Jun  2 11:23:42 2008
@@ -39,20 +39,22 @@
 class Holder : public Glib::Object
 {
   _CLASS_GOBJECT(Holder, GdaHolder, GDA_HOLDER, Glib::Object, GObject)
+protected:
+  _WRAP_CTOR(Holder (GType type), gda_holder_new)
 public:
   _WRAP_CREATE(GType g_type)
   
   _WRAP_METHOD(GType get_g_type() const, gda_holder_get_g_type)
   _WRAP_METHOD(Glib::ustring get_id() const, gda_holder_get_id)
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_value)
-  Glib::ValueBase get_value() const;
-  _WRAP_METHOD(Glib::ustring get_value_str(const Glib::RefPtr<DataHandler>& dh) const, gda_holder_get_value_str)
+  Glib::ValueBase get_value();
+  _WRAP_METHOD(Glib::ustring get_value_str(const Glib::RefPtr<DataHandler>& dh), gda_holder_get_value_str)
   _WRAP_METHOD(bool set_value(const Glib::ValueBase& value), gda_holder_set_value)
   _WRAP_METHOD(bool set_value_str (const Glib::RefPtr<DataHandler>& dh, const Glib::ustring& value), gda_holder_set_value_str)
   _WRAP_METHOD(bool take_value (Glib::ValueBase& value), gda_holder_take_value)
 
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_default_value)
-  Glib::ValueBase get_default_value() const;
+  Glib::ValueBase get_default_value();
   _WRAP_METHOD(void set_default_value(const Glib::ValueBase& value), gda_holder_set_default_value)
   _WRAP_METHOD(bool set_value_to_default(), gda_holder_set_value_to_default)
   _WRAP_METHOD(bool value_is_default(), gda_holder_value_is_default)

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	Mon Jun  2 11:23:42 2008
@@ -20,19 +20,22 @@
  */
 
 #include <libgdamm/sqlparser.h>
-#include <libgda/sql-parser/gda-sql-parser.h>
+#include <sql-parser/gda-sql-parser.h>
 
 namespace Gnome
 {
 
+namespace Gda
+{
+
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Statement> parse_string(const Glib::ustring& sql, Glib::ustring& remain)
+Glib::RefPtr<Statement> SqlParser::parse_string(const Glib::ustring& sql, Glib::ustring& remain)
 #else
-Glib::RefPtr<Statement> parse_string(const Glib::ustring& sql, Glib::ustring& remain, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Statement> SqlParser::parse_string(const Glib::ustring& sql, Glib::ustring& remain, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gchar* c_remain = 0;
+  const gchar* c_remain = 0;
   Glib::RefPtr<Statement> retvalue = Glib::wrap(gda_sql_parser_parse_string(gobj(), sql.c_str(), &c_remain, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
@@ -45,21 +48,20 @@
   if (c_remain)
   {
     remain = c_remain;
-    g_free(c_remain);
   }
 
   return retvalue;
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Batch> parse_string_as_batch(const Glib::ustring& sql, Glib::ustring& remain)
+Glib::RefPtr<Batch> SqlParser::parse_string_as_batch(const Glib::ustring& sql, Glib::ustring& remain)
 #else
-Glib::RefPtr<Batch> parse_string_as_batch(const Glib::ustring& sql, Glib::ustring& remain, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Batch> SqlParser::parse_string_as_batch(const Glib::ustring& sql, Glib::ustring& remain, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gchar* c_remain = 0;
-  Glib::RefPtr<Statement> retvalue = Glib::wrap(gda_sql_parser_parse_string(gobj(), sql.c_str(), &c_remain, &(gerror)));
+  const gchar* c_remain = 0;
+  Glib::RefPtr<Batch> retvalue = Glib::wrap(gda_sql_parser_parse_string_as_batch(gobj(), sql.c_str(), &c_remain, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -71,11 +73,12 @@
   if (c_remain)
   {
     remain = c_remain;
-    g_free(c_remain);
   }
 
   return retvalue;
 }
 
+} /* namespace Gda */
+
 } /* namespace Gnome */
 

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/sqlparser.hg	Mon Jun  2 11:23:42 2008
@@ -40,6 +40,8 @@
 class SqlParser : public Glib::Object
 {
   _CLASS_GOBJECT(SqlParser, GdaSqlParser, GDA_SQL_PARSER, Glib::Object, GObject)
+protected:
+  _CTOR_DEFAULT()
 public:
   _WRAP_CREATE()
   

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	Mon Jun  2 11:23:42 2008
@@ -20,6 +20,8 @@
  */
 
 #include <libgdamm/statement.h>
+#include <libgdamm/connection.h>
+#include <libgda/gda-enum-types.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/statement.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/statement.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/statement.hg	Mon Jun  2 11:23:42 2008
@@ -21,6 +21,7 @@
 
 _DEFS(libgdamm,libgda)
 _PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(libgda/gda-connection.h)
 
 namespace Gnome
 {
@@ -40,6 +41,9 @@
 class Statement : public Glib::Object
 {
   _CLASS_GOBJECT(Statement, GdaStatement, GDA_STATEMENT, Glib::Object, GObject)
+protected:
+  _CTOR_DEFAULT()
+
 public:
   _WRAP_CREATE()