Commit ffddb670 authored by Morten Welinder's avatar Morten Welinder

Renaming

Namespace cleanup.
parent afdf443c
...@@ -331,11 +331,11 @@ src/widgets/gnm-sheet-sel.c ...@@ -331,11 +331,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c src/widgets/gnm-workbook-sel.c
src/widgets/gnumeric-cell-renderer-expr-entry.c src/widgets/gnm-cell-renderer-expr-entry.c
src/widgets/gnumeric-cell-renderer-text.c src/widgets/gnm-cell-renderer-text.c
src/widgets/gnumeric-cell-renderer-toggle.c src/widgets/gnm-cell-renderer-toggle.c
src/widgets/gnumeric-expr-entry.c src/widgets/gnm-expr-entry.c
src/widgets/gnumeric-text-view.c src/widgets/gnm-text-view.c
src/workbook-cmd-format.c src/workbook-cmd-format.c
src/workbook-control.c src/workbook-control.c
src/workbook-view.c src/workbook-view.c
......
...@@ -390,11 +390,11 @@ src/widgets/gnm-sheet-sel.c ...@@ -390,11 +390,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c src/widgets/gnm-workbook-sel.c
src/widgets/gnumeric-cell-renderer-expr-entry.c src/widgets/gnm-cell-renderer-expr-entry.c
src/widgets/gnumeric-cell-renderer-text.c src/widgets/gnm-cell-renderer-text.c
src/widgets/gnumeric-cell-renderer-toggle.c src/widgets/gnm-cell-renderer-toggle.c
src/widgets/gnumeric-expr-entry.c src/widgets/gnm-expr-entry.c
src/widgets/gnumeric-text-view.c src/widgets/gnm-text-view.c
src/workbook-cmd-format.c src/workbook-cmd-format.c
src/workbook-control.c src/workbook-control.c
src/workbook-view.c src/workbook-view.c
......
...@@ -224,12 +224,12 @@ widgets_sources = \ ...@@ -224,12 +224,12 @@ widgets_sources = \
widgets/gnm-sheet-slicer-combo-view.c \ widgets/gnm-sheet-slicer-combo-view.c \
widgets/gnm-so-anchor-mode-chooser.c \ widgets/gnm-so-anchor-mode-chooser.c \
widgets/gnm-workbook-sel.c \ widgets/gnm-workbook-sel.c \
widgets/gnumeric-cell-renderer-text.c \ widgets/gnm-cell-renderer-text.c \
widgets/gnumeric-cell-renderer-expr-entry.c \ widgets/gnm-cell-renderer-expr-entry.c \
widgets/gnumeric-cell-renderer-toggle.c \ widgets/gnm-cell-renderer-toggle.c \
widgets/gnumeric-dashed-canvas-line.c \ widgets/gnm-dashed-canvas-line.c \
widgets/gnumeric-expr-entry.c \ widgets/gnm-expr-entry.c \
widgets/gnumeric-text-view.c widgets/gnm-text-view.c
widgets_headers = \ widgets_headers = \
widgets/gnm-dao.h \ widgets/gnm-dao.h \
...@@ -245,12 +245,12 @@ widgets_headers = \ ...@@ -245,12 +245,12 @@ widgets_headers = \
widgets/gnm-sheet-slicer-combo-view.h \ widgets/gnm-sheet-slicer-combo-view.h \
widgets/gnm-so-anchor-mode-chooser.h \ widgets/gnm-so-anchor-mode-chooser.h \
widgets/gnm-workbook-sel.h \ widgets/gnm-workbook-sel.h \
widgets/gnumeric-cell-renderer-text.h \ widgets/gnm-cell-renderer-text.h \
widgets/gnumeric-cell-renderer-expr-entry.h \ widgets/gnm-cell-renderer-expr-entry.h \
widgets/gnumeric-cell-renderer-toggle.h \ widgets/gnm-cell-renderer-toggle.h \
widgets/gnumeric-dashed-canvas-line.h \ widgets/gnm-dashed-canvas-line.h \
widgets/gnumeric-expr-entry.h \ widgets/gnm-expr-entry.h \
widgets/gnumeric-text-view.h widgets/gnm-text-view.h
tools_sources = \ tools_sources = \
tools/analysis-anova.c \ tools/analysis-anova.c \
...@@ -681,7 +681,7 @@ local.def: stamp-local.def ...@@ -681,7 +681,7 @@ local.def: stamp-local.def
@true @true
stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/dumpdef.pl stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/dumpdef.pl
hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/dao.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h widgets/gnumeric-expr-entry.h'; \ hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/dao.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h widgets/gnm-expr-entry.h'; \
hdrs_list=''; \ hdrs_list=''; \
for hdr in $$hdrs; do \ for hdr in $$hdrs; do \
if test -f $(srcdir)/$$hdr; then \ if test -f $(srcdir)/$$hdr; then \
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <value.h> #include <value.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <tools/filter.h> #include <tools/filter.h>
#include <tools/analysis-tools.h> #include <tools/analysis-tools.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <ranges.h> #include <ranges.h>
#include <commands.h> #include <commands.h>
#include <widgets/gnumeric-text-view.h> #include <widgets/gnm-text-view.h>
#define COMMENT_DIALOG_KEY "cell-comment-dialog" #define COMMENT_DIALOG_KEY "cell-comment-dialog"
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <commands.h> #include <commands.h>
#include <mathfunc.h> #include <mathfunc.h>
#include <preview-grid.h> #include <preview-grid.h>
#include <widgets/gnumeric-dashed-canvas-line.h> #include <widgets/gnm-dashed-canvas-line.h>
#include <widgets/gnm-format-sel.h> #include <widgets/gnm-format-sel.h>
#include <style-conditions.h> #include <style-conditions.h>
...@@ -1175,7 +1175,7 @@ border_format_has_changed (FormatState *state, BorderPicker *edge) ...@@ -1175,7 +1175,7 @@ border_format_has_changed (FormatState *state, BorderPicker *edge)
for (i = 0; line_info[i].states != 0 ; ++i ) { for (i = 0; line_info[i].states != 0 ; ++i ) {
if (line_info[i].location == edge->index && if (line_info[i].location == edge->index &&
state->border.lines[i] != NULL) { state->border.lines[i] != NULL) {
gnumeric_dashed_canvas_line_set_dash_index ( gnm_dashed_canvas_line_set_dash_index (
GNM_DASHED_CANVAS_LINE (state->border.lines[i]), GNM_DASHED_CANVAS_LINE (state->border.lines[i]),
edge->pattern_index); edge->pattern_index);
} }
...@@ -1364,7 +1364,7 @@ draw_border_preview (FormatState *state) ...@@ -1364,7 +1364,7 @@ draw_border_preview (FormatState *state)
& state->border.edge[line_info[i].location]; & state->border.edge[line_info[i].location];
state->border.lines[i] = state->border.lines[i] =
goc_item_new (group, goc_item_new (group,
gnumeric_dashed_canvas_line_get_type (), gnm_dashed_canvas_line_get_type (),
"x0", line_info[i].points[0], "x0", line_info[i].points[0],
"y0", line_info[i].points[1], "y0", line_info[i].points[1],
"x1", line_info[i].points[2], "x1", line_info[i].points[2],
...@@ -1372,7 +1372,7 @@ draw_border_preview (FormatState *state) ...@@ -1372,7 +1372,7 @@ draw_border_preview (FormatState *state)
NULL); NULL);
style = go_styled_object_get_style (GO_STYLED_OBJECT (state->border.lines[i])); style = go_styled_object_get_style (GO_STYLED_OBJECT (state->border.lines[i]));
style->line.color = p->rgba; style->line.color = p->rgba;
gnumeric_dashed_canvas_line_set_dash_index ( gnm_dashed_canvas_line_set_dash_index (
GNM_DASHED_CANVAS_LINE (state->border.lines[i]), GNM_DASHED_CANVAS_LINE (state->border.lines[i]),
p->pattern_index); p->pattern_index);
} else } else
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#include <sheet-view.h> #include <sheet-view.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gnumeric-conf.h> #include <gnumeric-conf.h>
#include <widgets/gnumeric-cell-renderer-toggle.h> #include <widgets/gnm-cell-renderer-toggle.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <value.h> #include <value.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
...@@ -1015,7 +1015,7 @@ dialog_init (SortFlowState *state) ...@@ -1015,7 +1015,7 @@ dialog_init (SortFlowState *state)
"text", ITEM_NAME, NULL); "text", ITEM_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column); gtk_tree_view_append_column (state->treeview, column);
renderer = gnumeric_cell_renderer_toggle_new (); renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), g_signal_connect (G_OBJECT (renderer),
"toggled", "toggled",
G_CALLBACK (cb_toggled_descending), state); G_CALLBACK (cb_toggled_descending), state);
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include <value.h> #include <value.h>
#include <sheet-view.h> #include <sheet-view.h>
#include <selection.h> #include <selection.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h> #include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <dialogs/dao-gui-utils.h> #include <dialogs/dao-gui-utils.h>
...@@ -59,7 +59,7 @@ typedef struct { ...@@ -59,7 +59,7 @@ typedef struct {
GtkTreeView *source_view; GtkTreeView *source_view;
GtkTreeModel *source_areas; GtkTreeModel *source_areas;
GnumericCellRendererExprEntry *cellrenderer; GnmCellRendererExprEntry *cellrenderer;
GdkPixbuf *pixmap; GdkPixbuf *pixmap;
GtkButton *clear; GtkButton *clear;
...@@ -281,7 +281,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state) ...@@ -281,7 +281,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state)
data_analysis_output_t *dao; data_analysis_output_t *dao;
if (state->cellrenderer->entry) if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done ( gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry), GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer); state->cellrenderer);
...@@ -341,7 +341,7 @@ cb_clear_clicked (G_GNUC_UNUSED GtkButton *button, ...@@ -341,7 +341,7 @@ cb_clear_clicked (G_GNUC_UNUSED GtkButton *button,
g_return_if_fail (state != NULL); g_return_if_fail (state != NULL);
if (state->cellrenderer->entry) if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done ( gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry), GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer); state->cellrenderer);
...@@ -360,7 +360,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkButton *button, ...@@ -360,7 +360,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkButton *button,
gtk_tree_view_get_selection (state->source_view); gtk_tree_view_get_selection (state->source_view);
if (state->cellrenderer->entry) if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done ( gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry), GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer); state->cellrenderer);
if (!gtk_tree_selection_get_selected (selection, NULL, &sel_iter)) if (!gtk_tree_selection_get_selected (selection, NULL, &sel_iter))
...@@ -422,7 +422,7 @@ setup_widgets (ConsolidateState *state, GtkBuilder *gui) ...@@ -422,7 +422,7 @@ setup_widgets (ConsolidateState *state, GtkBuilder *gui)
(state->source_view ); (state->source_view );
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
renderer = gnumeric_cell_renderer_expr_entry_new (state->base.wbcg); renderer = gnm_cell_renderer_expr_entry_new (state->base.wbcg);
state->cellrenderer = state->cellrenderer =
GNM_CELL_RENDERER_EXPR_ENTRY (renderer); GNM_CELL_RENDERER_EXPR_ENTRY (renderer);
column = gtk_tree_view_column_new_with_attributes column = gtk_tree_view_column_new_with_attributes
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <parse-util.h> #include <parse-util.h>
#include <commands.h> #include <commands.h>
#include <ranges.h> #include <ranges.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#define DIALOG_DATA_TABLE_KEY "dialog-data-table" #define DIALOG_DATA_TABLE_KEY "dialog-data-table"
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <gui-util.h> #include <gui-util.h>
#include <parse-util.h> #include <parse-util.h>
#include <commands.h> #include <commands.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h> #include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-toggle.h> #include <widgets/gnm-cell-renderer-toggle.h>
#include <string.h> #include <string.h>
...@@ -885,7 +885,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text, ...@@ -885,7 +885,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
static void static void
cb_name_guru_content_edited cb_name_guru_content_edited
(G_GNUC_UNUSED GnumericCellRendererExprEntry *cell, (G_GNUC_UNUSED GnmCellRendererExprEntry *cell,
gchar *path_string, gchar *path_string,
gchar *new_text, gchar *new_text,
NameGuruState *state) NameGuruState *state)
...@@ -1107,7 +1107,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog) ...@@ -1107,7 +1107,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), column); gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), column);
if (is_paste_dialog) { if (is_paste_dialog) {
renderer = gnumeric_cell_renderer_toggle_new (); renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), g_signal_connect (G_OBJECT (renderer),
"toggled", "toggled",
G_CALLBACK (cb_name_guru_paste), state); G_CALLBACK (cb_name_guru_paste), state);
...@@ -1120,7 +1120,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog) ...@@ -1120,7 +1120,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column); column);
} else { } else {
renderer = gnumeric_cell_renderer_toggle_new (); renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), g_signal_connect (G_OBJECT (renderer),
"toggled", "toggled",
G_CALLBACK (cb_name_guru_add_delete), state); G_CALLBACK (cb_name_guru_add_delete), state);
...@@ -1133,7 +1133,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog) ...@@ -1133,7 +1133,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column); column);
renderer = gnumeric_cell_renderer_toggle_new (); renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), g_signal_connect (G_OBJECT (renderer),
"toggled", "toggled",
G_CALLBACK (cb_name_guru_switch_scope), G_CALLBACK (cb_name_guru_switch_scope),
...@@ -1148,7 +1148,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog) ...@@ -1148,7 +1148,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
column); column);
} }
renderer = gnumeric_cell_renderer_expr_entry_new (state->wbcg); renderer = gnm_cell_renderer_expr_entry_new (state->wbcg);
g_signal_connect (G_OBJECT (renderer), "edited", g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_name_guru_content_edited), state); G_CALLBACK (cb_name_guru_content_edited), state);
column = gtk_tree_view_column_new_with_attributes column = gtk_tree_view_column_new_with_attributes
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#include <func.h> #include <func.h>
#include <gnm-format.h> #include <gnm-format.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h> #include <widgets/gnm-cell-renderer-expr-entry.h>
#include <locale.h> #include <locale.h>
#include <string.h> #include <string.h>
...@@ -83,7 +83,7 @@ typedef struct ...@@ -83,7 +83,7 @@ typedef struct
gint old_height_request; gint old_height_request;
gint old_width_request; gint old_width_request;
GnumericCellRendererExprEntry *cellrenderer; GnmCellRendererExprEntry *cellrenderer;
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkCellEditable *editable; GtkCellEditable *editable;
} FormulaGuruState; } FormulaGuruState;
...@@ -668,7 +668,7 @@ cb_dialog_formula_guru_ok_clicked (G_GNUC_UNUSED GtkWidget *button, ...@@ -668,7 +668,7 @@ cb_dialog_formula_guru_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
FormulaGuruState *state) FormulaGuruState *state)
{ {
if (state->cellrenderer->entry) if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done ( gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry), GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer); state->cellrenderer);
wbcg_edit_finish (state->wbcg, wbcg_edit_finish (state->wbcg,
...@@ -890,14 +890,14 @@ dialog_formula_guru_init (FormulaGuruState *state) ...@@ -890,14 +890,14 @@ dialog_formula_guru_init (FormulaGuruState *state)
G_CALLBACK (cb_dialog_formula_guru_selection_changed), state); G_CALLBACK (cb_dialog_formula_guru_selection_changed), state);
column = gtk_tree_view_column_new_with_attributes (_("Name"), column = gtk_tree_view_column_new_with_attributes (_("Name"),
gnumeric_cell_renderer_text_new (), gnm_cell_renderer_text_new (),
"text", ARG_NAME, NULL); "text", ARG_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column); gtk_tree_view_append_column (state->treeview, column);
column = gtk_tree_view_column_new_with_attributes (_("Type"), column = gtk_tree_view_column_new_with_attributes (_("Type"),
gnumeric_cell_renderer_text_new (), gnm_cell_renderer_text_new (),
"text", ARG_TYPE, NULL); "text", ARG_TYPE, NULL);
gtk_tree_view_append_column (state->treeview, column); gtk_tree_view_append_column (state->treeview, column);
renderer = gnumeric_cell_renderer_expr_entry_new (state->wbcg); renderer = gnm_cell_renderer_expr_entry_new (state->wbcg);
state->cellrenderer = GNM_CELL_RENDERER_EXPR_ENTRY (renderer); state->cellrenderer = GNM_CELL_RENDERER_EXPR_ENTRY (renderer);
g_signal_connect (G_OBJECT (renderer), "edited", g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_dialog_formula_guru_edited), state); G_CALLBACK (cb_dialog_formula_guru_edited), state);
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <workbook-view.h> #include <workbook-view.h>
#include <tools/goal-seek.h> #include <tools/goal-seek.h>
#include <mathfunc.h> #include <mathfunc.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <selection.h> #include <selection.h>
#include <application.h> #include <application.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <dialogs/help.h> #include <dialogs/help.h>
#include <commands.h> #include <commands.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <expr-name.h> #include <expr-name.h>
#include <expr.h> #include <expr.h>
#include <gui-util.h> #include <gui-util.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <value.h> #include <value.h>
#include <commands.h> #include <commands.h>
#include <selection.h> #include <selection.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#define MERGE_KEY "merge-dialog" #define MERGE_KEY "merge-dialog"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <workbook-control.h> #include <workbook-control.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <number-match.h> #include <number-match.h>
#include <widgets/gnumeric-cell-renderer-text.h> #include <widgets/gnm-cell-renderer-text.h>
#include <gnumeric-conf.h> #include <gnumeric-conf.h>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <value.h> #include <value.h>
#include <commands.h> #include <commands.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <string.h> #include <string.h>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <value.h> #include <value.h>
#include <commands.h> #include <commands.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <string.h> #include <string.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <gnumeric-conf.h> #include <gnumeric-conf.h>
#include <gui-util.h> #include <gui-util.h>
#include <search.h> #include <search.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <selection.h> #include <selection.h>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <sheet-object-cell-comment.h> #include <sheet-object-cell-comment.h>
#include <selection.h> #include <selection.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnm-expr-entry.h>
#include <string.h> #include <string.h>
#define SEARCH_KEY "search-dialog" #define SEARCH_KEY "search-dialog"
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include <style-color.h> #include <style-color.h>
#include <commands.h> #include <commands.h>
#include <application.h> #include <application.h>
#include <widgets/gnumeric-cell-renderer-text.h> #include <widgets/gnm-cell-renderer-text.h>
#include <widgets/gnumeric-cell-renderer-toggle.h> #include <widgets/gnm-cell-renderer-toggle.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <string.h> #include <string.h>
...@@ -697,7 +697,7 @@ create_sheet_list (SheetManager *state) ...@@ -697,7 +697,7 @@ create_sheet_list (SheetManager *state)