[libgdamm] SqlBuilder: import_expression(): Remove the id parameter.

[Murray Cumming <murrayc src gnome org>]

commit ca0eac9c0aae66631d396157a6d9eb8ec1e30067
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri May 7 23:07:53 2010 +0200

    SqlBuilder: import_expression(): Remove the id parameter.
    
    * libgda/src/sqlbuilder.hg: import_expression(): Remove the id parameter.
    We generally don't let the caller specify an ID, though the C API does,
    for no good reason.
    export_expression(): Make this const.

 ChangeLog                 |   11 ++++++++++-
 libgda/src/sqlbuilder.ccg |    7 +++++++
 libgda/src/sqlbuilder.hg  |    6 ++++--
 3 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f649582..0b098c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
+2010-05-07  Murray Cumming  <murrayc murrayc-x61>
+
+	SqlBuilder: import_expression(): Remove the id parameter.
+
+	* libgda/src/sqlbuilder.hg: import_expression(): Remove the id parameter.
+	We generally don't let the caller specify an ID, though the C API does, 
+	for no good reason.
+	export_expression(): Make this const.
+
 2010-05-07  Murray Cumming  <murrayc murrayc com>
 
-    SqlBuilder: Fix typo in import_expression() name.
+	SqlBuilder: Fix typo in import_expression() name.
 
 	* libgda/src/sqlbuilder.hg: Change import_expressio() to import_expression().
 
diff --git a/libgda/src/sqlbuilder.ccg b/libgda/src/sqlbuilder.ccg
index cc87aa9..baee22e 100644
--- a/libgda/src/sqlbuilder.ccg
+++ b/libgda/src/sqlbuilder.ccg
@@ -112,6 +112,13 @@ void SqlBuilder::select_set_limit(guint limit_count, guint offset)
   gda_sql_builder_select_set_limit(gobj(), id_limit, id_offset);
 }
 
+
+guint SqlBuilder::import_expression(const SqlExpr& expr)
+{
+  return gda_sql_builder_import_expression(gobj(), 0, const_cast<GdaSqlExpr*>((expr).gobj()));
+}
+  
+
 } /* namespace Gda */
 
 } /* namespace Gnome */
diff --git a/libgda/src/sqlbuilder.hg b/libgda/src/sqlbuilder.hg
index 00a4089..f364e7a 100644
--- a/libgda/src/sqlbuilder.hg
+++ b/libgda/src/sqlbuilder.hg
@@ -218,8 +218,10 @@ public:
   //TODO: Wrap the enum when we wrap GdaSqlStatementCompound _WRAP_METHOD(void compound_set_type(SqlStatementCompoundType compound_type), gda_sql_builder_compound_set_type)
   //The steal parameter suggests that this is an internal function: _WRAP_METHOD(void compound_add_sub_select(const Glib::RefPtr<SqlStatement>& sqlst, bool steal), gda_sql_builder_compound_add_sub_select)
 
-  _WRAP_METHOD(SqlExpr export_expression(guint id), gda_sql_builder_export_expression)
-  _WRAP_METHOD(guint import_expression(guint id, const SqlExpr& expr), gda_sql_builder_import_expression )
+  _WRAP_METHOD(SqlExpr export_expression(guint id) const, gda_sql_builder_export_expression)
+
+  guint import_expression(const SqlExpr& expr);
+  _IGNORE(gda_sql_builder_import_expression)
 };
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS