GNOME.org
 

[gnumeric] Namespace: renaming.

commit 70bbcd032e574fbb5fce36bf63d8c797162502b7
Author: Morten Welinder <terra gnome org>
Date:   Wed Jul 18 22:05:02 2012 -0400

    Namespace: renaming.

 plugins/sample_datasource/sample_datasource.c |    2 +-
 src/cell.h                                    |   10 ++++----
 src/dependent.c                               |   30 ++++++++++++------------
 src/dependent.h                               |    6 ++--
 src/func-builtin.c                            |    2 +-
 src/func.h                                    |    2 +-
 src/sheet.c                                   |    2 +-
 7 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/plugins/sample_datasource/sample_datasource.c b/plugins/sample_datasource/sample_datasource.c
index 6f0c326..f770c0d 100644
--- a/plugins/sample_datasource/sample_datasource.c
+++ b/plugins/sample_datasource/sample_datasource.c
@@ -249,7 +249,7 @@ atl_last (GnmFuncEvalInfo *ei, GnmValue const * const argv[])
 	return value_new_float (val->value);
 }
 
-static DependentFlags
+static GnmDependentFlags
 atl_last_link (GnmFuncEvalInfo *ei)
 {
 	if (debug)
diff --git a/src/cell.h b/src/cell.h
index 02d6e3b..124cf27 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -8,13 +8,13 @@
 G_BEGIN_DECLS
 
 typedef enum {
-	/* MUST BE > 0xFFF,FFFF to avoid conflict with GnmDependent */
+	/* MUST BE > 0xFFF,FFFF to avoid conflict with GnmDependentFlags */
 	/* GnmCell is linked into the sheet */
 	GNM_CELL_IN_SHEET_LIST  = 0x10000000,
 	/* Is the top left corner of a merged region */
-	GNM_CELL_IS_MERGED	    = 0x20000000,
+	GNM_CELL_IS_MERGED	= 0x20000000,
 	/* Cells expression was changed, recalc before rendering */
-	GNM_CELL_HAS_NEW_EXPR    = 0x40000000
+	GNM_CELL_HAS_NEW_EXPR   = 0x40000000
 } GnmCellFlags;
 
 /* Definition of a GnmCell */
@@ -24,9 +24,9 @@ struct _GnmCell {
 	GnmDependent base;
 
 	/* Mandatory state information */
-	GnmCellPos     pos;
+	GnmCellPos   pos;
 
-	GnmValue      *value;	/* computed or entered (Must be non NULL) */
+	GnmValue    *value;	/* computed or entered (Must be non NULL) */
 };
 
 GType	    gnm_cell_get_type (void);
diff --git a/src/dependent.c b/src/dependent.c
index dfdcf3c..485e66d 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -841,13 +841,13 @@ depsingle_equal (DependencySingle const *a, DependencySingle const *b)
 	return (a->pos.row == b->pos.row && a->pos.col == b->pos.col);
 }
 
-static DependentFlags
+static GnmDependentFlags
 link_single_dep (GnmDependent *dep, GnmCellPos const *pos, GnmCellRef const *ref)
 {
 	DependencySingle lookup;
 	DependencySingle *single;
 	GnmDepContainer *deps;
-	DependentFlags flag = DEPENDENT_NO_FLAG;
+	GnmDependentFlags flag = DEPENDENT_NO_FLAG;
 	Sheet const *sheet = eval_sheet (ref->sheet, dep->sheet);
 
 	if (sheet != dep->sheet)
@@ -960,12 +960,12 @@ unlink_range_dep (GnmDepContainer *deps, GnmDependent *dep,
 	}
 }
 
-static DependentFlags
+static GnmDependentFlags
 link_cellrange_dep (GnmDependent *dep, GnmCellPos const *pos,
 		    GnmCellRef const *a, GnmCellRef const *b)
 {
 	DependencyRange range;
-	DependentFlags flag = DEPENDENT_NO_FLAG;
+	GnmDependentFlags flag = DEPENDENT_NO_FLAG;
 
 	gnm_cellpos_init_cellref (&range.range.start, a, pos, dep->sheet);
 	gnm_cellpos_init_cellref (&range.range.end, b, pos, dep->sheet);
@@ -1028,7 +1028,7 @@ unlink_cellrange_dep (GnmDependent *dep, GnmCellPos const *pos,
 		unlink_range_dep (dep->sheet->deps, dep, &range);
 }
 
-static DependentFlags
+static GnmDependentFlags
 link_expr_dep (GnmEvalPos *ep, GnmExpr const *tree)
 {
 	g_return_val_if_fail (tree != NULL, DEPENDENT_NO_FLAG);
@@ -1057,7 +1057,7 @@ link_expr_dep (GnmEvalPos *ep, GnmExpr const *tree)
 	/* TODO : Can we use argument types to be smarter here ? */
 	case GNM_EXPR_OP_FUNCALL: {
 		int i;
-		DependentFlags flag = DEPENDENT_NO_FLAG;
+		GnmDependentFlags flag = DEPENDENT_NO_FLAG;
 		if (tree->func.func->fn_type == GNM_FUNC_TYPE_STUB)
 			gnm_func_load_stub (tree->func.func);
 		if (tree->func.func->linker) {
@@ -1104,7 +1104,7 @@ link_expr_dep (GnmEvalPos *ep, GnmExpr const *tree)
 
 	case GNM_EXPR_OP_SET: {
 		int i;
-		DependentFlags res = DEPENDENT_NO_FLAG;
+		GnmDependentFlags res = DEPENDENT_NO_FLAG;
 
 		for (i = 0; i < tree->set.argc; i++)
 			res |= link_expr_dep (ep, tree->set.argv[i]);
@@ -1322,7 +1322,7 @@ dynamic_dep_debug_name (GnmDependent const *dep, GString *target)
 void
 dependent_add_dynamic_dep (GnmDependent *dep, GnmRangeRef const *rr)
 {
-	DependentFlags    flags;
+	GnmDependentFlags    flags;
 	DynamicDep	 *dyn;
 	GnmCellPos const *pos;
 	DependencyRange   range;
@@ -1658,8 +1658,8 @@ cell_queue_recalc (GnmCell *cell)
 }
 
 typedef struct {
-	int      col, row;
-	DepFunc	 func;
+	int col, row;
+	GnmDepFunc func;
 	gpointer user;
 } search_rangedeps_closure_t;
 
@@ -1679,14 +1679,14 @@ cb_search_rangedeps (gpointer key, G_GNUC_UNUSED gpointer value,
 #endif
 
 	if (range_contains (range, c->col, c->row)) {
-		DepFunc	 func = c->func;
+		GnmDepFunc func = c->func;
 		micro_hash_foreach_dep (deprange->deps, dep,
 			(func) (dep, c->user););
 	}
 }
 
 static void
-cell_foreach_range_dep (GnmCell const *cell, DepFunc func, gpointer user)
+cell_foreach_range_dep (GnmCell const *cell, GnmDepFunc func, gpointer user)
 {
 	search_rangedeps_closure_t closure;
 	GHashTable *bucket =
@@ -1703,7 +1703,7 @@ cell_foreach_range_dep (GnmCell const *cell, DepFunc func, gpointer user)
 
 static void
 cell_foreach_single_dep (Sheet const *sheet, int col, int row,
-			 DepFunc func, gpointer user)
+			 GnmDepFunc func, gpointer user)
 {
 	DependencySingle lookup, *single;
 	GnmDepContainer *deps = sheet->deps;
@@ -1718,7 +1718,7 @@ cell_foreach_single_dep (Sheet const *sheet, int col, int row,
 }
 
 void
-cell_foreach_dep (GnmCell const *cell, DepFunc func, gpointer user)
+cell_foreach_dep (GnmCell const *cell, GnmDepFunc func, gpointer user)
 {
 	g_return_if_fail (cell != NULL);
 
@@ -2404,7 +2404,7 @@ handle_referencing_names (GnmDepContainer *deps, Sheet *sheet)
 static void
 handle_outgoing_references (GnmDepContainer *deps, Sheet *sheet)
 {
-	DependentFlags what = DEPENDENT_USES_NAME;
+	GnmDependentFlags what = DEPENDENT_USES_NAME;
 	GSList *accum = NULL;
 
 	what |= (sheet->workbook && sheet->workbook->during_destruction)
diff --git a/src/dependent.h b/src/dependent.h
index 54e7288..873e51f 100644
--- a/src/dependent.h
+++ b/src/dependent.h
@@ -51,7 +51,7 @@ typedef enum {
 	/* An internal utility flag */
 	DEPENDENT_FLAGGED	   = 0x01000000,
 	DEPENDENT_CAN_RELOCATE	   = 0x02000000
-} DependentFlags;
+} GnmDependentFlags;
 
 #define dependent_type(dep)		((dep)->flags & DEPENDENT_TYPE_MASK)
 #define dependent_is_cell(dep)		(dependent_type (dep) == DEPENDENT_CELL)
@@ -81,7 +81,7 @@ struct _GnmDepContainer {
 	GHashTable *dynamic_deps;
 };
 
-typedef void (*DepFunc) (GnmDependent *dep, gpointer user);
+typedef void (*GnmDepFunc) (GnmDependent *dep, gpointer user);
 
 guint32	 dependent_type_register   (GnmDependentClass const *klass);
 void	 dependent_types_init	   (void);
@@ -98,7 +98,7 @@ GOUndo  *dependents_relocate	    (GnmExprRelocateInfo const *info);
 void	 dependents_link	    (GSList *deps);
 
 void	 cell_queue_recalc	    (GnmCell *cell);
-void	 cell_foreach_dep	    (GnmCell const *cell, DepFunc func, gpointer user);
+void	 cell_foreach_dep	    (GnmCell const *cell, GnmDepFunc func, gpointer user);
 gboolean gnm_cell_eval_content	    (GnmCell *cell);
 
 void sheet_region_queue_recalc	  (Sheet const *sheet, GnmRange const *range);
diff --git a/src/func-builtin.c b/src/func-builtin.c
index 48cbfe1..bac5fc4 100644
--- a/src/func-builtin.c
+++ b/src/func-builtin.c
@@ -119,7 +119,7 @@ gnumeric_version (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
 
 /***************************************************************************/
 
-static DependentFlags
+static GnmDependentFlags
 gnumeric_table_link (GnmFuncEvalInfo *ei)
 {
 	GnmDependent *dep = ei->pos->dep;
diff --git a/src/func.h b/src/func.h
index 3e2ddc3..d501a1c 100644
--- a/src/func.h
+++ b/src/func.h
@@ -126,7 +126,7 @@ typedef enum {
 typedef GnmValue	*(*GnmFuncArgs)	  (GnmFuncEvalInfo *ei, GnmValue const * const *args);
 typedef GnmValue	*(*GnmFuncNodes)  (GnmFuncEvalInfo *ei,
 					   int argc, GnmExprConstPtr const *argv);
-typedef DependentFlags	 (*GnmFuncLink)	  (GnmFuncEvalInfo *ei);
+typedef GnmDependentFlags	 (*GnmFuncLink)	  (GnmFuncEvalInfo *ei);
 typedef void		 (*GnmFuncUnlink) (GnmFuncEvalInfo *ei);
 
 typedef void	 (*GnmFuncRefNotify) (GnmFunc *f, int refcount);
diff --git a/src/sheet.c b/src/sheet.c
index ea99e30..759f209 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -4138,7 +4138,7 @@ sheet_cell_destroy (Sheet *sheet, GnmCell *cell, gboolean queue_recalc)
 	}
 
 	if (queue_recalc)
-		cell_foreach_dep (cell, (DepFunc)dependent_queue_recalc, NULL);
+		cell_foreach_dep (cell, (GnmDepFunc)dependent_queue_recalc, NULL);
 
 	sheet_cell_remove_from_hash (sheet, cell);
 	cell_free (cell);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]