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

From: jhs svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r1780 - in libgdamm/trunk: . libgda/src
Date: Tue, 11 Nov 2008 09:58:04 +0000 (UTC)
Author: jhs
Date: Tue Nov 11 09:58:03 2008
New Revision: 1780
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1780&view=rev

Log:
2008-11-11  Johannes Schmid  <jschmid openismus com>

	* libgda/src/batch.ccg:
	* libgda/src/batch.hg:
	* libgda/src/column.hg:
	* libgda/src/connection.hg:
	* libgda/src/dataselect.hg:
	* libgda/src/metastore.hg:
	* libgda/src/metastruct.hg:
	* libgda/src/quarklist.hg:
	* libgda/src/serveroperation.hg:
	* libgda/src/set.hg:
	* libgda/src/sqlparser.hg:
	* libgda/src/statement.hg:
	* libgda/src/xatransaction.hg:
	Fixed most obvious doxygen warnings

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/batch.ccg
   libgdamm/trunk/libgda/src/batch.hg
   libgdamm/trunk/libgda/src/column.hg
   libgdamm/trunk/libgda/src/connection.hg
   libgdamm/trunk/libgda/src/dataselect.hg
   libgdamm/trunk/libgda/src/metastore.hg
   libgdamm/trunk/libgda/src/metastruct.hg
   libgdamm/trunk/libgda/src/quarklist.hg
   libgdamm/trunk/libgda/src/serveroperation.hg
   libgdamm/trunk/libgda/src/set.hg
   libgdamm/trunk/libgda/src/sqlparser.hg
   libgdamm/trunk/libgda/src/statement.hg
   libgdamm/trunk/libgda/src/xatransaction.hg

Modified: libgdamm/trunk/libgda/src/batch.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/batch.ccg	(original)
+++ libgdamm/trunk/libgda/src/batch.ccg	Tue Nov 11 09:58:03 2008
@@ -29,9 +29,9 @@
 {
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-bool Batch::get_parameters(Glib::RefPtr<Set>& params)
+bool Batch::get_parameters(Glib::RefPtr<Set>& out_params)
 #else
-bool Batch::get_parameters(Glib::RefPtr<Set>& params, std::auto_ptr<Glib::Error>& error)
+bool Batch::get_parameters(Glib::RefPtr<Set>& out_params, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
@@ -46,7 +46,7 @@
 #endif //GLIBMM_EXCEPTIONS_ENABLED
   if (set)
   {
-    params = Glib::wrap(set);
+    out_params = Glib::wrap(set);
   }
   return retval;
 }

Modified: libgdamm/trunk/libgda/src/batch.hg
==============================================================================
--- libgdamm/trunk/libgda/src/batch.hg	(original)
+++ libgdamm/trunk/libgda/src/batch.hg	Tue Nov 11 09:58:03 2008
@@ -59,9 +59,9 @@
 
   _WRAP_METHOD_DOCS_ONLY(gda_statement_get_parameters)
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  bool get_parameters(Glib::RefPtr<Set>& params);
+  bool get_parameters(Glib::RefPtr<Set>& out_params);
   #else
-  bool get_parameters(Glib::RefPtr<Set>& params, std::auto_ptr<Glib::Error>& error);
+  bool get_parameters(Glib::RefPtr<Set>& out_params, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
     
   // FIXME: Use better marshaller in libgda

Modified: libgdamm/trunk/libgda/src/column.hg
==============================================================================
--- libgdamm/trunk/libgda/src/column.hg	(original)
+++ libgdamm/trunk/libgda/src/column.hg	Tue Nov 11 09:58:03 2008
@@ -50,7 +50,7 @@
   bool equal(const Glib::RefPtr<const Column>& src) const;
 
   _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(void set_description(const Glib::ustring& title), gda_column_set_description)
 
   _WRAP_METHOD(void set_attribute (const Glib::ustring& attribute, const Glib::ValueBase& value), gda_column_set_attribute);
   _WRAP_METHOD_DOCS_ONLY(gda_column_get_attribute);

Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg	(original)
+++ libgdamm/trunk/libgda/src/connection.hg	Tue Nov 11 09:58:03 2008
@@ -117,22 +117,22 @@
 
   _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute)
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, Glib::RefPtr<Set>& last_inserted_row);
+  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, Glib::RefPtr<Set>& last_insert_row);
 #else
-  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, Glib::RefPtr<Set>& last_inserted_row, std::auto_ptr<Glib::Error>& error);
+  Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, Glib::RefPtr<Set>& last_insert_row, std::auto_ptr<Glib::Error>& error);
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 
-  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params), gda_connection_statement_execute_select, errthrow)
+  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params), gda_connection_statement_execute_select, errthrow)
   
   #m4 _CONVERSION(`const Glib::ArrayHandle<GType>&', `GType*', `const_cast<GType*>(($3).data())')
-  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select_full(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, const Glib::ArrayHandle<GType>& col_types), gda_connection_statement_execute_select_full, errthrow)
+  _WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select_full(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, const Glib::ArrayHandle<GType>& col_types), gda_connection_statement_execute_select_full, errthrow)
   _IGNORE (gda_connection_statement_execute_select_fullv)
   
   _WRAP_METHOD_DOCS_ONLY (gda_connection_statement_execute_non_select);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  int statement_execute_non_select(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, Glib::RefPtr<Set>& last_inserted_row);
+  int statement_execute_non_select(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, Glib::RefPtr<Set>& last_insert_row);
 #else
-  int statement_execute_non_select(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, Glib::RefPtr<Set>& last_inserted_row, std::auto_ptr<Glib::Error>& error);
+  int statement_execute_non_select(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, Glib::RefPtr<Set>& last_insert_row, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED  
 
   //Note that we do not add a non-const version of this because the documentation says that it should not be modified:
@@ -171,7 +171,7 @@
 
   _IGNORE(gda_connection_get_meta_store_data)
   #m4 _CONVERSION(`const Glib::ListHandle< Glib::RefPtr<Holder> >&',`GList*',`$3.data()')
-	_WRAP_METHOD(Glib::RefPtr<DataModel> get_meta_store_data(ConnectionMetaType type, const Glib::ListHandle< Glib::RefPtr<Holder> >& filters), gda_connection_get_meta_store_data_v, errthrow)
+	_WRAP_METHOD(Glib::RefPtr<DataModel> get_meta_store_data(ConnectionMetaType meta_type, const Glib::ListHandle< Glib::RefPtr<Holder> >& filters), gda_connection_get_meta_store_data_v, errthrow)
   _WRAP_METHOD(Glib::RefPtr<MetaStore> get_meta_store(), gda_connection_get_meta_store);
 
   #m4 _CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<Glib::Object> >',`$2((GSList*)$3, Glib::OWNERSHIP_SHALLOW)')
@@ -183,9 +183,9 @@
    
   _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_to_sql)
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used);
+  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used);
   #else
-  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used, std::auto_ptr<Glib::Error>& error);
+  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& stmt, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
     
 _CONVERSION(`GdaConnectionEvent*',`const Glib::RefPtr<ConnectionEvent>&',Glib::wrap($3, true))

Modified: libgdamm/trunk/libgda/src/dataselect.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dataselect.hg	(original)
+++ libgdamm/trunk/libgda/src/dataselect.hg	Tue Nov 11 09:58:03 2008
@@ -67,7 +67,7 @@
   // This is internal only
   _IGNORE (gda_data_select_set_row_selection_condition)
   _WRAP_METHOD (void compute_row_selection_condition (), gda_data_select_compute_row_selection_condition, errthrow)
-  _WRAP_METHOD (void set_modification_statement (const Glib::RefPtr<Statement>& stmt), gda_data_select_set_modification_statement, errthrow)
+  _WRAP_METHOD (void set_modification_statement (const Glib::RefPtr<Statement>& mod_stmt), gda_data_select_set_modification_statement, errthrow)
   _WRAP_METHOD (void set_modification_statement_sql (const Glib::ustring& sql), gda_data_select_set_modification_statement_sql, errthrow)
   _WRAP_METHOD (void compute_modification_statements (), gda_data_select_compute_modification_statements, errthrow)
   _WRAP_METHOD (void compute_columns_attributes (), gda_data_select_compute_columns_attributes, errthrow)

Modified: libgdamm/trunk/libgda/src/metastore.hg
==============================================================================
--- libgdamm/trunk/libgda/src/metastore.hg	(original)
+++ libgdamm/trunk/libgda/src/metastore.hg	Tue Nov 11 09:58:03 2008
@@ -78,7 +78,7 @@
 #endif
 
   _WRAP_METHOD(bool set_attribute_value(const Glib::ustring& att_name, const Glib::ustring& att_value), gda_meta_store_set_attribute_value, errthrow)
-  _WRAP_METHOD(bool schema_add_custom_object(const Glib::ustring& xml), gda_meta_store_schema_add_custom_object, errthrow)
+  _WRAP_METHOD(bool schema_add_custom_object(const Glib::ustring& xml_description), gda_meta_store_schema_add_custom_object, errthrow)
   _WRAP_METHOD(bool schema_remove_custom_object(const Glib::ustring& obj_name), gda_meta_store_schema_remove_custom_object, errthrow)
   _WRAP_METHOD(Glib::RefPtr<Connection> get_internal_connection(), gda_meta_store_get_internal_connection)
 

Modified: libgdamm/trunk/libgda/src/metastruct.hg
==============================================================================
--- libgdamm/trunk/libgda/src/metastruct.hg	(original)
+++ libgdamm/trunk/libgda/src/metastruct.hg	Tue Nov 11 09:58:03 2008
@@ -74,7 +74,7 @@
   _WRAP_METHOD(bool complement_default (), gda_meta_struct_complement_default, errthrow)
   _IGNORE(gda_meta_struct_complement_depend) // private API   
 
-  _WRAP_METHOD(bool sort_db_object (MetaSortType type), gda_meta_struct_sort_db_objects, errthrow)
+  _WRAP_METHOD(bool sort_db_object (MetaSortType sort_type), gda_meta_struct_sort_db_objects, errthrow)
   _WRAP_METHOD(MetaDbObject* get_db_object(const Glib::ValueBase& catalog, const Glib::ValueBase& schema, const Glib::ValueBase& name), gda_meta_struct_get_db_object)
   _WRAP_METHOD(MetaTableColumn* get_table_column(MetaTable* table, const Glib::ValueBase& col_name), gda_meta_struct_get_table_column)
   _WRAP_METHOD(Glib::ustring dump_as_graph(MetaGraphInfo info), gda_meta_struct_dump_as_graph, errthrow)

Modified: libgdamm/trunk/libgda/src/quarklist.hg
==============================================================================
--- libgdamm/trunk/libgda/src/quarklist.hg	(original)
+++ libgdamm/trunk/libgda/src/quarklist.hg	Tue Nov 11 09:58:03 2008
@@ -53,7 +53,7 @@
    */      
   typedef sigc::slot<void, Glib::ustring, Glib::ustring> ForeachSlot;
   _WRAP_METHOD_DOCS_ONLY(gda_quark_list_foreach)
-  void foreach(const ForeachSlot& slot);
+  void foreach(const ForeachSlot& func);
       
 };
 

Modified: libgdamm/trunk/libgda/src/serveroperation.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serveroperation.hg	(original)
+++ libgdamm/trunk/libgda/src/serveroperation.hg	Tue Nov 11 09:58:03 2008
@@ -59,13 +59,13 @@
 public:
   // The C version of these take varargs for some reason.
   _WRAP_METHOD_DOCS_ONLY(gda_server_operation_get_value_at)
-  Glib::ValueBase get_value_at(const Glib::ustring& path) const;
+  Glib::ValueBase get_value_at(const Glib::ustring& path_format) const;
 
   _WRAP_METHOD_DOCS_ONLY(gda_server_operation_set_value_at)
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  void set_value_at(const Glib::ustring& path, const Glib::ustring& value);
+  void set_value_at(const Glib::ustring& path_format, const Glib::ustring& value);
 #else
-  void set_value_at(const Glib::ustring& path, const Glib::ustring& value, std::auto_ptr<Glib::Error>& error);
+  void set_value_at(const Glib::ustring& path_format, const Glib::ustring& value, std::auto_ptr<Glib::Error>& error);
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 
   _WRAP_METHOD(ServerOperationNodeType get_node_type(const Glib::ustring& path, ServerOperationNodeStatus& status) const, gda_server_operation_get_node_type)

Modified: libgdamm/trunk/libgda/src/set.hg
==============================================================================
--- libgdamm/trunk/libgda/src/set.hg	(original)
+++ libgdamm/trunk/libgda/src/set.hg	Tue Nov 11 09:58:03 2008
@@ -62,7 +62,7 @@
 
   _WRAP_METHOD (Value get_holder_value(const Glib::ustring& holder_id), gda_set_get_holder_value);
   _WRAP_METHOD_DOCS_ONLY(gda_set_set_holder_value)
-  template<class T> bool set_holder_value(const Glib::ustring& id, T value);
+  template<class T> bool set_holder_value(const Glib::ustring& holder_id, T value);
   
   _WRAP_METHOD(Glib::RefPtr<Holder> get_holder (const Glib::ustring& holder_id), gda_set_get_holder)
   _WRAP_METHOD(void add_holder (const Glib::RefPtr<Holder>& holder), gda_set_add_holder)
@@ -73,9 +73,9 @@
   _WRAP_METHOD(bool is_valid() const, gda_set_is_valid, errthrow)
 
   _WRAP_METHOD(SetSource* get_source_for_model (const Glib::RefPtr<DataModel>& model), gda_set_get_source_for_model)
-  _WRAP_METHOD(SetSource* get_source (const Glib::RefPtr<Holder>& param), gda_set_get_source)
-  _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_METHOD(SetSource* get_source (const Glib::RefPtr<Holder>& holder), gda_set_get_source)
+  _WRAP_METHOD(SetGroup* get_group (const Glib::RefPtr<Holder>& holder), gda_set_get_group)
+  _WRAP_METHOD(SetNode* get_node (const Glib::RefPtr<Holder>& holder), gda_set_get_node)
 		
   _WRAP_SIGNAL(void holder_changed (const Glib::RefPtr<Holder>& holder), "holder-changed")
   _WRAP_SIGNAL(void public_data_changed (), "public-data-changed")

Modified: libgdamm/trunk/libgda/src/sqlparser.hg
==============================================================================
--- libgdamm/trunk/libgda/src/sqlparser.hg	(original)
+++ libgdamm/trunk/libgda/src/sqlparser.hg	Tue Nov 11 09:58:03 2008
@@ -73,8 +73,16 @@
  * providers if the Gda::SqlParser is created using Gda::ServerProvider::create_parser() 
  * but for portability reasons it's better to avoid them):
  *
- * - ##NAME[::TYPE[::NULL]]: for a variable named NAME with the optional type TYPE (which can be a GType name or a custom database type name), and with the optional "::NULL" to instruct that the variable can be NULL.
- * - ## \/* name:NAME [type:TYPE] [nullok:[TRUE|FALSE]] [descr:DESCR] *\/ for a variable named NAME with the optional type TYPE (which can be a GType name or a custom database type name), with the optional "nullok" attribute and an optional description DESCR. Note that the NAME, TYPE and DESCR literals here must be quoted (simple or double quotes) if they include non alphanumeric characters, and that there must always be at least a space between the ## and the \/* ... *\/.
+ * - ##NAME[::TYPE[::NULL]]: for a variable named NAME with the optional type TYPE 
+ * (which can be a GType name or a custom database type name), and with the 
+ * optional "::NULL" to instruct that the variable can be NULL.
+ * - ## \/* name:NAME [type:TYPE] [nullok:[TRUE|FALSE]] [descr:DESCR] *\/ 
+ * for a variable named NAME with the optional type TYPE (which can be a GType 
+ * name or a custom database type name), with the optional "nullok" attribute 
+ * and an optional description DESCR. Note that the NAME, TYPE and DESCR literals here 
+ * must be quoted (simple or double quotes) if they include non alphanumeric 
+ * characters, and that there must always be at least a space between the 
+ * ## and the \/* ... *\/.
  *
  * @ingroup Connection
  */

Modified: libgdamm/trunk/libgda/src/statement.hg
==============================================================================
--- libgdamm/trunk/libgda/src/statement.hg	(original)
+++ libgdamm/trunk/libgda/src/statement.hg	Tue Nov 11 09:58:03 2008
@@ -73,9 +73,9 @@
   
   _WRAP_METHOD_DOCS_ONLY(gda_statement_get_parameters)
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  bool get_parameters(Glib::RefPtr<Set>& params);
+  bool get_parameters(Glib::RefPtr<Set>& out_params);
   #else
-  bool get_parameters(Glib::RefPtr<Set>& params, std::auto_ptr<Glib::Error>& error);
+  bool get_parameters(Glib::RefPtr<Set>& out_params, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
   
 

Modified: libgdamm/trunk/libgda/src/xatransaction.hg
==============================================================================
--- libgdamm/trunk/libgda/src/xatransaction.hg	(original)
+++ libgdamm/trunk/libgda/src/xatransaction.hg	Tue Nov 11 09:58:03 2008
@@ -51,16 +51,16 @@
   typedef std::list<Glib::RefPtr<const Connection> > ConnectionList;
   _WRAP_METHOD_DOCS_ONLY (gda_xa_transaction_commit)  
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  bool commit(ConnectionList& cncs_to_recover);
+  bool commit(ConnectionList& cnc_to_recover);
   #else
-  bool commit(ConnectionList& cncs_to_recover, std::auto_ptr<Glib::Error>& error);
+  bool commit(ConnectionList& cnc_to_recover, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   _WRAP_METHOD_DOCS_ONLY (gda_xa_transaction_commit_recovered)  
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  bool commit_recovered(ConnectionList& cncs_to_recover);
+  bool commit_recovered(ConnectionList& cnc_to_recover);
   #else
-  bool commit_recovered(ConnectionList& cncs_to_recover, std::auto_ptr<Glib::Error>& error);
+  bool commit_recovered(ConnectionList& cnc_to_recover, std::auto_ptr<Glib::Error>& error);
   #endif //GLIBMM_EXCEPTIONS_ENABLED
   
   _WRAP_PROPERTY("transaction-id", Glib::ustring)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]