GNOME.org
 

[libgda/gtk3] Removed GdaValueList as it's not useable

commit a0a794b09f02992ae366241830c146cbafb07ce9
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Sep 14 19:44:39 2010 +0200

    Removed GdaValueList as it's not useable

 doc/C/libgda-sections.txt                          |    1 -
 doc/C/libgda.types.in                              |    3 +-
 doc/C/tmpl/gda-value.sgml                          |   24 ---
 libgda-ui/data-entries/gdaui-entry-combo.c         |    3 -
 libgda-ui/gdaui-init.c                             |    3 +-
 libgda/gda-data-proxy.c                            |    2 +-
 libgda/gda-init.c                                  |    2 -
 libgda/gda-value.c                                 |  170 --------------------
 libgda/gda-value.h                                 |    7 -
 libgda/libgda.symbols                              |    1 -
 libgda/sqlite/gda-sqlite-provider.c                |    1 -
 providers/firebird/gda-firebird-provider.c         |    1 -
 providers/jdbc/gda-jdbc-provider.c                 |    1 -
 providers/mysql/gda-mysql-provider.c               |    2 -
 providers/oracle/gda-oracle-provider.c             |    1 -
 providers/postgres/gda-postgres-provider.c         |    2 -
 .../skel-implementation/capi/gda-capi-provider.c   |    1 -
 providers/web/gda-web-provider.c                   |    2 -
 testing/gdaui-test-data-entries.c                  |    2 +-
 19 files changed, 4 insertions(+), 225 deletions(-)
---
diff --git a/doc/C/libgda-sections.txt b/doc/C/libgda-sections.txt
index cd313bc..b8e65e2 100644
--- a/doc/C/libgda-sections.txt
+++ b/doc/C/libgda-sections.txt
@@ -790,7 +790,6 @@ gda_value_set_ushort
 <SUBSECTION Standard>
 gda_binary_get_type
 gda_geometricpoint_get_type
-gda_value_list_get_type
 gda_numeric_get_type
 gda_time_get_type
 gda_timestamp_get_type
diff --git a/doc/C/libgda.types.in b/doc/C/libgda.types.in
index 448e17c..421edb3 100644
--- a/doc/C/libgda.types.in
+++ b/doc/C/libgda.types.in
@@ -34,7 +34,6 @@ gda_server_provider_get_type
 gda_transaction_status_get_type
 gda_binary_get_type
 gda_geometricpoint_get_type
-gda_value_list_get_type
 gda_numeric_get_type
 gda_time_get_type
 gda_timestamp_get_type
@@ -65,4 +64,4 @@ gda_tree_mgr_select_get_type
 gda_tree_mgr_tables_get_type
 gda_tree_node_get_type
 gda_sql_builder_get_type
-gda_thread_wrapper_get_type
\ No newline at end of file
+gda_thread_wrapper_get_type
diff --git a/doc/C/tmpl/gda-value.sgml b/doc/C/tmpl/gda-value.sgml
index 938ed4e..03dffc9 100644
--- a/doc/C/tmpl/gda-value.sgml
+++ b/doc/C/tmpl/gda-value.sgml
@@ -417,30 +417,6 @@ Assorted functions for dealing with #GValue values.
 @val: 
 
 
-<!-- ##### TYPEDEF GdaValueList ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gda_value_get_list ##### -->
-<para>
-
-</para>
-
- value: 
- Returns: 
-
-
-<!-- ##### FUNCTION gda_value_set_list ##### -->
-<para>
-
-</para>
-
- value: 
- val: 
-
-
 <!-- ##### STRUCT GdaNumeric ##### -->
 <para>
 
diff --git a/libgda-ui/data-entries/gdaui-entry-combo.c b/libgda-ui/data-entries/gdaui-entry-combo.c
index 7689ff2..c95d198 100644
--- a/libgda-ui/data-entries/gdaui-entry-combo.c
+++ b/libgda-ui/data-entries/gdaui-entry-combo.c
@@ -719,9 +719,6 @@ gdaui_entry_combo_set_value (GdauiDataEntry *iface, const GValue *value)
         g_return_if_fail (iface && GDAUI_IS_ENTRY_COMBO (iface));
         combo = GDAUI_ENTRY_COMBO (iface);
         g_return_if_fail (combo->priv);
-        g_return_if_fail (!value ||
-                          (value && (gda_value_isa ((GValue*) value, GDA_TYPE_LIST) ||
-                                     gda_value_isa ((GValue*) value, GDA_TYPE_LIST))));
 
 	TO_IMPLEMENT;
 }
diff --git a/libgda-ui/gdaui-init.c b/libgda-ui/gdaui-init.c
index 49afa82..972b3a5 100644
--- a/libgda-ui/gdaui-init.c
+++ b/libgda-ui/gdaui-init.c
@@ -159,8 +159,7 @@ gdaui_new_data_entry (GType type, const gchar *plugin_name)
 			 (type == GDA_TYPE_BINARY))
 			entry = (GdauiDataEntry *) gdaui_entry_bin_new (dh, type);
 		else if	((type == GDA_TYPE_GEOMETRIC_POINT) ||
-			 (type == G_TYPE_OBJECT) ||
-			 (type == GDA_TYPE_LIST))
+			 (type == G_TYPE_OBJECT))
 			entry = (GdauiDataEntry *) gdaui_entry_none_new (type);
 		else if	(type == GDA_TYPE_TIME)
 			entry = (GdauiDataEntry *) gdaui_entry_time_new (dh);
diff --git a/libgda/gda-data-proxy.c b/libgda/gda-data-proxy.c
index ad95571..bc30b47 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -144,7 +144,7 @@ typedef struct
 {
 	RowModif      *row_modif;    /* RowModif in which this structure instance appears */
 	gint           model_column; /* column index in the GdaDataModel */
-        GValue        *value;        /* can also be GDA_TYPE_LIST for multiple values; values are owned here */
+        GValue        *value;        /* values are owned here */
         GValue        *attributes;   /* holds flags of GdaValueAttribute */
 } RowValue;
 #define ROW_VALUE(x) ((RowValue *)(x))
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index c3262c8..1fb9eea 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -103,8 +103,6 @@ gda_init (void)
 	g_assert (type);
 	type = GDA_TYPE_GEOMETRIC_POINT;
 	g_assert (type);
-	type = GDA_TYPE_LIST;
-	g_assert (type);
 	type = GDA_TYPE_NUMERIC;
 	g_assert (type);
 	type = GDA_TYPE_SHORT;
diff --git a/libgda/gda-value.c b/libgda/gda-value.c
index afa5045..dbfbed3 100644
--- a/libgda/gda-value.c
+++ b/libgda/gda-value.c
@@ -562,97 +562,6 @@ gda_geometricpoint_free (gpointer boxed)
 }
 
 
-
-
-/* 
- * Register the GdaValueList type in the GType system 
- */
-static gpointer gda_value_list_copy (gpointer boxed);
-static void gda_value_list_free (gpointer boxed);
-
-static void 
-list_to_string (const GValue *src, GValue *dest) 
-{
-	gchar *str;
-	const GdaValueList *list;
-	GList *l;
-	GString *gstr = NULL;
-	
-	g_return_if_fail (G_VALUE_HOLDS_STRING (dest) &&
-			  GDA_VALUE_HOLDS_LIST (src));
-	
-	list = gda_value_get_list ((GValue *) src);
-	
-	for (l = (GList *) list; l != NULL; l = l->next) {
-		str = gda_value_stringify ((GValue *) l->data);
-		if (!gstr) {
-			gstr = g_string_new ("{ ");
-			gstr = g_string_append (gstr, str);
-		}
-		else {
-			gstr = g_string_append (gstr, ", ");
-			gstr = g_string_append (gstr, str);
-		}
-		g_free (str);
-	}
-
-	if (gstr) {
-		g_string_append (gstr, " }");
-		str = gstr->str;
-		g_string_free (gstr, FALSE);
-	}
-	else
-		str = g_strdup ("");
-	
-	g_value_take_string (dest, str);
-}
-
-GType
-gda_value_list_get_type(void)
-{
-	static GType type = 0;
-	
-	if (G_UNLIKELY (type == 0)) {
-		type = g_boxed_type_register_static ("GdaValueList",
-						     (GBoxedCopyFunc) gda_value_list_copy,
-						     (GBoxedFreeFunc) gda_value_list_free);
-		
-		g_value_register_transform_func (type, 
-						 G_TYPE_STRING,
-						 list_to_string);
-		/* FIXME: No function to transform from string to a GdaValueList */
-	}
-
-	return type;
-}
-
-static gpointer 
-gda_value_list_copy (gpointer boxed)
-{
-	GList *list = NULL;
-	const GList *values;
-	
-	values = (GList*) boxed;
-	
-	while (values) {
-		list = g_list_append (list, gda_value_copy ((GValue *) (values->data)));
-		values = values->next;
-	}
-
-	return list;
-}
-
-static void
-gda_value_list_free (gpointer boxed)
-{
-	GList *l = (GList*) boxed;
-	g_list_free (l);
-}
-
-
-
-
-
 /* 
  * Register the GdaNumeric type in the GType system 
  */
@@ -1580,40 +1489,6 @@ gda_value_set_geometric_point (GValue *value, const GdaGeometricPoint *val)
 }
 
 /**
- * gda_value_get_list
- * @value: a #GValue whose value we want to get.
- *
- * Returns: the value stored in @value.
- */
-G_CONST_RETURN GdaValueList *
-gda_value_get_list (const GValue *value)
-{
-	g_return_val_if_fail (value && G_IS_VALUE (value), NULL);
-	g_return_val_if_fail (gda_value_isa (value, GDA_TYPE_LIST), NULL);
-	return (const GdaValueList *) g_value_get_boxed(value);
-}
-
-/**
- * gda_value_set_list
- * @value: a #GValue that will store @val.
- * @val: value to be stored in @value.
- *
- * Stores @val into @value.
- */
-void
-gda_value_set_list (GValue *value, const GdaValueList *val)
-{
-	g_return_if_fail (value);
-	g_return_if_fail (val);
-
-	l_g_value_unset (value);
-	g_value_init (value, GDA_TYPE_LIST);
-	
-	/* See the implementation of GdaValueList as a GBoxed for the Copy function used by GValue*/
-	g_value_set_boxed (value, val);
-}
-
-/**
  * gda_value_set_null
  * @value: a #GValue that will store a value of type #GDA_TYPE_NULL.
  *
@@ -1903,26 +1778,6 @@ gda_value_stringify (const GValue *value)
 				else
 					return g_strdup ("0000-00-00");
 			}
-			else if (type == GDA_TYPE_LIST) {
-				const GdaValueList *list;
-				const GList *ptr;
-				GString *string;
-				gchar *tmp;
-
-				string = g_string_new ("[");
-				list = gda_value_get_list (value);
-				for (ptr = list; ptr; ptr = ptr->next) {
-					tmp = gda_value_stringify ((GValue *) ptr->data);
-					if (ptr != list)
-						g_string_append_c (string, ',');
-					g_string_append (string, tmp);
-					g_free (tmp);
-				}
-				g_string_append_c (string, ']');
-				tmp = string->str;
-				g_string_free (string, FALSE);
-				return tmp;
-			}
 			else
 				return g_strdup ("");
 		}
@@ -2021,16 +1876,6 @@ gda_value_differ (const GValue *value1, const GValue *value2)
 			return -1;
 	}
 
-	else if (type == GDA_TYPE_LIST) {
-		GList *l1, *l2;
-		for (l1 = (GList*) gda_value_get_list (value1), l2 = (GList*) gda_value_get_list (value2); 
-		     l1 != NULL && l2 != NULL; l1 = l1->next, l2 = l2->next){
-			if (gda_value_differ ((GValue *) l1->data, (GValue *) l2->data))
-				return 1;
-		}
-		return 0;
-	}
-
 	else if (type == GDA_TYPE_NUMERIC) {
 		const GdaNumeric *num1, *num2;
 		num1= gda_value_get_numeric (value1);
@@ -2236,21 +2081,6 @@ gda_value_compare (const GValue *value1, const GValue *value2)
 	else if (type == G_TYPE_INT)
 		return g_value_get_int (value1) - g_value_get_int (value2);
 
-	else if (type == GDA_TYPE_LIST) {
-		retval = 0;
-		for (l1 = (GList*) gda_value_get_list (value1), l2 = (GList*) gda_value_get_list (value2); 
-		     l1 != NULL && l2 != NULL; l1 = l1->next, l2 = l2->next){
-			retval = gda_value_compare ((GValue *) l1->data,
-						    (GValue *) l2->data);
-			if (retval != 0) 
-				return retval;
-		}
-		if (retval == 0 && (l1 == NULL || l2 == NULL) && l1 != l2)
-			retval = (l1 == NULL) ? -1 : 1;
-		
-		return retval;
-	}
-
 	else if (type == GDA_TYPE_NUMERIC) {
 		const GdaNumeric *num1, *num2;
 		num1= gda_value_get_numeric (value1);
diff --git a/libgda/gda-value.h b/libgda/gda-value.h
index ac1d5d5..37f93d5 100644
--- a/libgda/gda-value.h
+++ b/libgda/gda-value.h
@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 #define	GDA_TYPE_BINARY (gda_binary_get_type())
 #define GDA_TYPE_BLOB (gda_blob_get_type())
 #define	GDA_TYPE_GEOMETRIC_POINT (gda_geometricpoint_get_type())
-#define	GDA_TYPE_LIST (gda_value_list_get_type())
 #define	GDA_TYPE_NUMERIC (gda_numeric_get_type())
 #define	GDA_TYPE_SHORT (gda_short_get_type()) 
 #define	GDA_TYPE_USHORT (gda_ushort_get_type())
@@ -53,7 +52,6 @@ G_BEGIN_DECLS
 #define GDA_VALUE_HOLDS_BINARY(value)          G_VALUE_HOLDS(value, GDA_TYPE_BINARY)
 #define GDA_VALUE_HOLDS_BLOB(value)            G_VALUE_HOLDS(value, GDA_TYPE_BLOB)
 #define GDA_VALUE_HOLDS_GEOMETRIC_POINT(value) G_VALUE_HOLDS(value, GDA_TYPE_GEOMETRIC_POINT)
-#define GDA_VALUE_HOLDS_LIST(value)            G_VALUE_HOLDS(value, GDA_TYPE_LIST)
 #define GDA_VALUE_HOLDS_NUMERIC(value)         G_VALUE_HOLDS(value, GDA_TYPE_NUMERIC)
 #define GDA_VALUE_HOLDS_SHORT(value)           G_VALUE_HOLDS(value, GDA_TYPE_SHORT)
 #define GDA_VALUE_HOLDS_USHORT(value)          G_VALUE_HOLDS(value, GDA_TYPE_USHORT)
@@ -110,8 +108,6 @@ typedef struct {
 	GdaBlobOp *op;
 } GdaBlob;
 
-typedef GList GdaValueList;
-
 #define gda_value_isa(value, type) (G_VALUE_HOLDS(value, type))
 
 GValue                           *gda_value_new (GType type);
@@ -142,8 +138,6 @@ void                              gda_value_take_blob (GValue *value, GdaBlob *b
 
 G_CONST_RETURN GdaGeometricPoint *gda_value_get_geometric_point (const GValue *value);
 void                              gda_value_set_geometric_point (GValue *value, const GdaGeometricPoint *val);
-G_CONST_RETURN GdaValueList      *gda_value_get_list (const GValue *value);
-void                              gda_value_set_list (GValue *value, const GdaValueList *val);
 void                              gda_value_set_null (GValue *value);
 G_CONST_RETURN GdaNumeric        *gda_value_get_numeric (const GValue *value);
 void                              gda_value_set_numeric (GValue *value, const GdaNumeric *val);
@@ -206,7 +200,6 @@ gpointer                          gda_blob_copy (gpointer boxed);
 void                              gda_blob_free (gpointer boxed);
 void                              gda_blob_set_op (GdaBlob *blob, GdaBlobOp *op);
 
-GType                             gda_value_list_get_type (void) G_GNUC_CONST;
 GType                             gda_short_get_type (void) G_GNUC_CONST;
 GType                             gda_ushort_get_type (void) G_GNUC_CONST;
 
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index 4ed91b2..3409237 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -875,7 +875,6 @@
 	gda_value_get_ushort
 	gda_value_is_null
 	gda_value_is_number
-	gda_value_list_get_type
 	gda_value_new
 	gda_value_new_binary
 	gda_value_new_blob
diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c
index 0ac4642..d394bd6 100644
--- a/libgda/sqlite/gda-sqlite-provider.c
+++ b/libgda/sqlite/gda-sqlite-provider.c
@@ -1319,7 +1319,6 @@ gda_sqlite_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConne
 	
 	if ((type == GDA_TYPE_GEOMETRIC_POINT) ||
 	    (type == G_TYPE_OBJECT) ||
-	    (type == GDA_TYPE_LIST) ||
 	    (type == G_TYPE_STRING) ||
 	    (type == G_TYPE_INVALID) ||
 	    (type == G_TYPE_GTYPE))
diff --git a/providers/firebird/gda-firebird-provider.c b/providers/firebird/gda-firebird-provider.c
index aff7785..219ffcf 100644
--- a/providers/firebird/gda-firebird-provider.c
+++ b/providers/firebird/gda-firebird-provider.c
@@ -921,7 +921,6 @@ gda_firebird_provider_get_default_dbms_type (GdaServerProvider *provider, GdaCon
 	if ((type == G_TYPE_DATE) || 
 	    (type == GDA_TYPE_GEOMETRIC_POINT) ||
 	    (type == G_TYPE_OBJECT) ||
-	    (type == GDA_TYPE_LIST) ||
 	    (type == G_TYPE_STRING) ||
 	    (type == GDA_TYPE_TIME) ||
 	    (type == GDA_TYPE_TIMESTAMP) ||
diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c
index 88a4800..84f19da 100644
--- a/providers/jdbc/gda-jdbc-provider.c
+++ b/providers/jdbc/gda-jdbc-provider.c
@@ -984,7 +984,6 @@ gda_jdbc_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConnect
 	if ((type == G_TYPE_DATE) || 
 	    (type == GDA_TYPE_GEOMETRIC_POINT) ||
 	    (type == G_TYPE_OBJECT) ||
-	    (type == GDA_TYPE_LIST) ||
 	    (type == G_TYPE_STRING) ||
 	    (type == GDA_TYPE_TIME) ||
 	    (type == GDA_TYPE_TIMESTAMP) ||
diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c
index 04d580f..5317461 100644
--- a/providers/mysql/gda-mysql-provider.c
+++ b/providers/mysql/gda-mysql-provider.c
@@ -1346,8 +1346,6 @@ gda_mysql_provider_get_default_dbms_type (GdaServerProvider  *provider,
 		return "text";
 	if (type == G_TYPE_INT)
 		return "int";
-	if (type == GDA_TYPE_LIST)
-		return "text";
 	if (type == GDA_TYPE_NUMERIC)
 		return "numeric";
 	if (type == G_TYPE_FLOAT)
diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c
index 653ac12..aef61a5 100644
--- a/providers/oracle/gda-oracle-provider.c
+++ b/providers/oracle/gda-oracle-provider.c
@@ -1198,7 +1198,6 @@ gda_oracle_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConne
 	if ((type == G_TYPE_DATE) || 
 	    (type == GDA_TYPE_GEOMETRIC_POINT) ||
 	    (type == G_TYPE_OBJECT) ||
-	    (type == GDA_TYPE_LIST) ||
 	    (type == G_TYPE_STRING) ||
 	    (type == GDA_TYPE_TIME) ||
 	    (type == GDA_TYPE_TIMESTAMP) ||
diff --git a/providers/postgres/gda-postgres-provider.c b/providers/postgres/gda-postgres-provider.c
index 019342a..1f1c104 100644
--- a/providers/postgres/gda-postgres-provider.c
+++ b/providers/postgres/gda-postgres-provider.c
@@ -1385,8 +1385,6 @@ gda_postgres_provider_get_default_dbms_type (GdaServerProvider *provider, GdaCon
                 return "text";
         if (type == G_TYPE_INT)
                 return "int4";
-        if (type == GDA_TYPE_LIST)
-                return "text";
         if (type == GDA_TYPE_NUMERIC)
                 return "numeric";
         if (type == G_TYPE_FLOAT)
diff --git a/providers/skel-implementation/capi/gda-capi-provider.c b/providers/skel-implementation/capi/gda-capi-provider.c
index c5d407d..b030cd7 100644
--- a/providers/skel-implementation/capi/gda-capi-provider.c
+++ b/providers/skel-implementation/capi/gda-capi-provider.c
@@ -850,7 +850,6 @@ gda_capi_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConnect
 	if ((type == G_TYPE_DATE) || 
 	    (type == GDA_TYPE_GEOMETRIC_POINT) ||
 	    (type == G_TYPE_OBJECT) ||
-	    (type == GDA_TYPE_LIST) ||
 	    (type == G_TYPE_STRING) ||
 	    (type == GDA_TYPE_TIME) ||
 	    (type == GDA_TYPE_TIMESTAMP) ||
diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c
index 734f5cb..aa9b1f5 100644
--- a/providers/web/gda-web-provider.c
+++ b/providers/web/gda-web-provider.c
@@ -1171,8 +1171,6 @@ gtype_to_webtype (GType type)
                 return "text";
         if (type == G_TYPE_INT)
                 return "integer";
-        if (type == GDA_TYPE_LIST)
-                return "text";
         if (type == GDA_TYPE_NUMERIC)
                 return "decimal";
         if (type == G_TYPE_FLOAT)
diff --git a/testing/gdaui-test-data-entries.c b/testing/gdaui-test-data-entries.c
index c6226da..e6f582e 100644
--- a/testing/gdaui-test-data-entries.c
+++ b/testing/gdaui-test-data-entries.c
@@ -129,7 +129,7 @@ main (int argc, char **argv)
 	/* init main conf */
 	GType tested_gtypes [] = {G_TYPE_INT64, G_TYPE_UINT64, GDA_TYPE_BINARY, G_TYPE_BOOLEAN, GDA_TYPE_BLOB,
 				  G_TYPE_DATE, G_TYPE_DOUBLE,
-				  GDA_TYPE_GEOMETRIC_POINT, G_TYPE_OBJECT, G_TYPE_INT, GDA_TYPE_LIST, 
+				  GDA_TYPE_GEOMETRIC_POINT, G_TYPE_OBJECT, G_TYPE_INT, 
 				  GDA_TYPE_NUMERIC, G_TYPE_FLOAT, GDA_TYPE_SHORT, GDA_TYPE_USHORT, G_TYPE_STRING, 
 				  GDA_TYPE_TIME, GDA_TYPE_TIMESTAMP, G_TYPE_CHAR, G_TYPE_UCHAR, G_TYPE_UINT};
 	mainconf.test_type = TESTED_BASIC;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]