[gnumeric] Renaming
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Renaming
- Date: Fri, 18 May 2018 18:04:20 +0000 (UTC)
commit ffddb6703670f1dc50f62f0f689558c111c356a2
Author: Morten Welinder <terra gnome org>
Date: Fri May 18 14:03:37 2018 -0400
Renaming
Namespace cleanup.
po-functions/POTFILES.in | 10 ++--
po/POTFILES.in | 10 ++--
src/Makefile.am | 26 +++++-----
src/dialogs/dialog-advanced-filter.c | 2 +-
src/dialogs/dialog-analysis-tool-chi-squared.c | 2 +-
src/dialogs/dialog-analysis-tool-frequency.c | 2 +-
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 2 +-
src/dialogs/dialog-analysis-tool-normality.c | 2 +-
src/dialogs/dialog-analysis-tool-one-mean.c | 2 +-
.../dialog-analysis-tool-principal-components.c | 2 +-
src/dialogs/dialog-analysis-tool-sign-test.c | 2 +-
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 2 +-
src/dialogs/dialog-analysis-tools.c | 2 +-
src/dialogs/dialog-cell-comment.c | 2 +-
src/dialogs/dialog-cell-format.c | 8 ++--
src/dialogs/dialog-cell-sort.c | 6 +-
src/dialogs/dialog-consolidate.c | 14 +++---
src/dialogs/dialog-data-table.c | 2 +-
src/dialogs/dialog-define-names.c | 16 +++---
src/dialogs/dialog-formula-guru.c | 14 +++---
src/dialogs/dialog-goal-seek.c | 2 +-
src/dialogs/dialog-hyperlink.c | 2 +-
src/dialogs/dialog-merge.c | 2 +-
src/dialogs/dialog-preferences.c | 2 +-
src/dialogs/dialog-random-generator-cor.c | 2 +-
src/dialogs/dialog-random-generator.c | 2 +-
src/dialogs/dialog-search-replace.c | 2 +-
src/dialogs/dialog-search.c | 2 +-
src/dialogs/dialog-sheet-order.c | 18 +++---
src/dialogs/dialog-shuffle.c | 2 +-
src/dialogs/dialog-simulation.c | 2 +-
src/dialogs/dialog-so-list.c | 2 +-
src/dialogs/dialog-so-styled.c | 2 +-
src/dialogs/dialog-solver.c | 2 +-
src/dialogs/dialog-tabulate.c | 2 +-
src/dialogs/tool-dialogs.h | 2 +-
src/gui-util.c | 2 +-
src/item-edit.c | 2 +-
src/sheet-control-gui.c | 2 +-
src/sheet-object-widget.c | 2 +-
src/wbc-gtk-edit.c | 2 +-
src/wbc-gtk-impl.h | 2 +-
src/wbc-gtk.h | 2 +-
...expr-entry.c => gnm-cell-renderer-expr-entry.c} | 32 ++++++------
src/widgets/gnm-cell-renderer-expr-entry.h | 52 +++++++++++++++++++
...ll-renderer-text.c => gnm-cell-renderer-text.c} | 18 +++---
...ll-renderer-text.h => gnm-cell-renderer-text.h} | 24 +++++-----
...enderer-toggle.c => gnm-cell-renderer-toggle.c} | 28 +++++-----
...enderer-toggle.h => gnm-cell-renderer-toggle.h} | 24 +++++-----
src/widgets/gnm-dao.c | 2 +-
...shed-canvas-line.c => gnm-dashed-canvas-line.c} | 49 ++++++------------
...shed-canvas-line.h => gnm-dashed-canvas-line.h} | 12 ++--
.../{gnumeric-expr-entry.c => gnm-expr-entry.c} | 5 +-
.../{gnumeric-expr-entry.h => gnm-expr-entry.h} | 6 +-
.../{gnumeric-text-view.c => gnm-text-view.c} | 4 +-
.../{gnumeric-text-view.h => gnm-text-view.h} | 8 ++--
src/widgets/gnumeric-cell-renderer-expr-entry.h | 53 --------------------
57 files changed, 245 insertions(+), 262 deletions(-)
---
diff --git a/po-functions/POTFILES.in b/po-functions/POTFILES.in
index 3898b47..1aab8a3 100644
--- a/po-functions/POTFILES.in
+++ b/po-functions/POTFILES.in
@@ -331,11 +331,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c
-src/widgets/gnumeric-cell-renderer-expr-entry.c
-src/widgets/gnumeric-cell-renderer-text.c
-src/widgets/gnumeric-cell-renderer-toggle.c
-src/widgets/gnumeric-expr-entry.c
-src/widgets/gnumeric-text-view.c
+src/widgets/gnm-cell-renderer-expr-entry.c
+src/widgets/gnm-cell-renderer-text.c
+src/widgets/gnm-cell-renderer-toggle.c
+src/widgets/gnm-expr-entry.c
+src/widgets/gnm-text-view.c
src/workbook-cmd-format.c
src/workbook-control.c
src/workbook-view.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f65a892..f637db1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -390,11 +390,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c
-src/widgets/gnumeric-cell-renderer-expr-entry.c
-src/widgets/gnumeric-cell-renderer-text.c
-src/widgets/gnumeric-cell-renderer-toggle.c
-src/widgets/gnumeric-expr-entry.c
-src/widgets/gnumeric-text-view.c
+src/widgets/gnm-cell-renderer-expr-entry.c
+src/widgets/gnm-cell-renderer-text.c
+src/widgets/gnm-cell-renderer-toggle.c
+src/widgets/gnm-expr-entry.c
+src/widgets/gnm-text-view.c
src/workbook-cmd-format.c
src/workbook-control.c
src/workbook-view.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d18bc5..3190b76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -224,12 +224,12 @@ widgets_sources = \
widgets/gnm-sheet-slicer-combo-view.c \
widgets/gnm-so-anchor-mode-chooser.c \
widgets/gnm-workbook-sel.c \
- widgets/gnumeric-cell-renderer-text.c \
- widgets/gnumeric-cell-renderer-expr-entry.c \
- widgets/gnumeric-cell-renderer-toggle.c \
- widgets/gnumeric-dashed-canvas-line.c \
- widgets/gnumeric-expr-entry.c \
- widgets/gnumeric-text-view.c
+ widgets/gnm-cell-renderer-text.c \
+ widgets/gnm-cell-renderer-expr-entry.c \
+ widgets/gnm-cell-renderer-toggle.c \
+ widgets/gnm-dashed-canvas-line.c \
+ widgets/gnm-expr-entry.c \
+ widgets/gnm-text-view.c
widgets_headers = \
widgets/gnm-dao.h \
@@ -245,12 +245,12 @@ widgets_headers = \
widgets/gnm-sheet-slicer-combo-view.h \
widgets/gnm-so-anchor-mode-chooser.h \
widgets/gnm-workbook-sel.h \
- widgets/gnumeric-cell-renderer-text.h \
- widgets/gnumeric-cell-renderer-expr-entry.h \
- widgets/gnumeric-cell-renderer-toggle.h \
- widgets/gnumeric-dashed-canvas-line.h \
- widgets/gnumeric-expr-entry.h \
- widgets/gnumeric-text-view.h
+ widgets/gnm-cell-renderer-text.h \
+ widgets/gnm-cell-renderer-expr-entry.h \
+ widgets/gnm-cell-renderer-toggle.h \
+ widgets/gnm-dashed-canvas-line.h \
+ widgets/gnm-expr-entry.h \
+ widgets/gnm-text-view.h
tools_sources = \
tools/analysis-anova.c \
@@ -681,7 +681,7 @@ local.def: stamp-local.def
@true
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=''; \
for hdr in $$hdrs; do \
if test -f $(srcdir)/$$hdr; then \
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index b804edf..1116573 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -36,7 +36,7 @@
#include <value.h>
#include <wbc-gtk.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <tools/filter.h>
#include <tools/analysis-tools.h>
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index 739905c..f015fba 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 4c9bcd0..5045a90 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 2c793dc..2f36b55 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index 4cb2860..97a3d68 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 319ca72..deb47a1 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index a545d1a..779514d 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 12b6e84..402078d 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -47,7 +47,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 10ea915..5e1cf99 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 0876abc..c2a7319 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -49,7 +49,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
diff --git a/src/dialogs/dialog-cell-comment.c b/src/dialogs/dialog-cell-comment.c
index 1aa9bd5..debef39 100644
--- a/src/dialogs/dialog-cell-comment.c
+++ b/src/dialogs/dialog-cell-comment.c
@@ -30,7 +30,7 @@
#include <wbc-gtk.h>
#include <ranges.h>
#include <commands.h>
-#include <widgets/gnumeric-text-view.h>
+#include <widgets/gnm-text-view.h>
#define COMMENT_DIALOG_KEY "cell-comment-dialog"
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index c02b336..fb361d4 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -49,7 +49,7 @@
#include <commands.h>
#include <mathfunc.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 <style-conditions.h>
@@ -1175,7 +1175,7 @@ border_format_has_changed (FormatState *state, BorderPicker *edge)
for (i = 0; line_info[i].states != 0 ; ++i ) {
if (line_info[i].location == edge->index &&
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]),
edge->pattern_index);
}
@@ -1364,7 +1364,7 @@ draw_border_preview (FormatState *state)
& state->border.edge[line_info[i].location];
state->border.lines[i] =
goc_item_new (group,
- gnumeric_dashed_canvas_line_get_type (),
+ gnm_dashed_canvas_line_get_type (),
"x0", line_info[i].points[0],
"y0", line_info[i].points[1],
"x1", line_info[i].points[2],
@@ -1372,7 +1372,7 @@ draw_border_preview (FormatState *state)
NULL);
style = go_styled_object_get_style (GO_STYLED_OBJECT
(state->border.lines[i]));
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]),
p->pattern_index);
} else
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index 5922bb4..443b702 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -41,8 +41,8 @@
#include <sheet-view.h>
#include <wbc-gtk.h>
#include <gnumeric-conf.h>
-#include <widgets/gnumeric-cell-renderer-toggle.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-cell-renderer-toggle.h>
+#include <widgets/gnm-expr-entry.h>
#include <value.h>
#include <gsf/gsf-impl-utils.h>
@@ -1015,7 +1015,7 @@ dialog_init (SortFlowState *state)
"text", ITEM_NAME, NULL);
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),
"toggled",
G_CALLBACK (cb_toggled_descending), state);
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index ceea1cb..5d4a171 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -33,8 +33,8 @@
#include <value.h>
#include <sheet-view.h>
#include <selection.h>
-#include <widgets/gnumeric-expr-entry.h>
-#include <widgets/gnumeric-cell-renderer-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
+#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <wbc-gtk.h>
#include <dialogs/dao-gui-utils.h>
@@ -59,7 +59,7 @@ typedef struct {
GtkTreeView *source_view;
GtkTreeModel *source_areas;
- GnumericCellRendererExprEntry *cellrenderer;
+ GnmCellRendererExprEntry *cellrenderer;
GdkPixbuf *pixmap;
GtkButton *clear;
@@ -281,7 +281,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state)
data_analysis_output_t *dao;
if (state->cellrenderer->entry)
- gnumeric_cell_renderer_expr_entry_editing_done (
+ gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
@@ -341,7 +341,7 @@ cb_clear_clicked (G_GNUC_UNUSED GtkButton *button,
g_return_if_fail (state != NULL);
if (state->cellrenderer->entry)
- gnumeric_cell_renderer_expr_entry_editing_done (
+ gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
@@ -360,7 +360,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkButton *button,
gtk_tree_view_get_selection (state->source_view);
if (state->cellrenderer->entry)
- gnumeric_cell_renderer_expr_entry_editing_done (
+ gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
if (!gtk_tree_selection_get_selected (selection, NULL, &sel_iter))
@@ -422,7 +422,7 @@ setup_widgets (ConsolidateState *state, GtkBuilder *gui)
(state->source_view );
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 =
GNM_CELL_RENDERER_EXPR_ENTRY (renderer);
column = gtk_tree_view_column_new_with_attributes
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 4355b24..d5e43cc 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -35,7 +35,7 @@
#include <parse-util.h>
#include <commands.h>
#include <ranges.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <glib/gi18n.h>
#define DIALOG_DATA_TABLE_KEY "dialog-data-table"
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 4b68d42..365a72c 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -39,9 +39,9 @@
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
-#include <widgets/gnumeric-expr-entry.h>
-#include <widgets/gnumeric-cell-renderer-expr-entry.h>
-#include <widgets/gnumeric-cell-renderer-toggle.h>
+#include <widgets/gnm-expr-entry.h>
+#include <widgets/gnm-cell-renderer-expr-entry.h>
+#include <widgets/gnm-cell-renderer-toggle.h>
#include <string.h>
@@ -885,7 +885,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
static void
cb_name_guru_content_edited
-(G_GNUC_UNUSED GnumericCellRendererExprEntry *cell,
+(G_GNUC_UNUSED GnmCellRendererExprEntry *cell,
gchar *path_string,
gchar *new_text,
NameGuruState *state)
@@ -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);
if (is_paste_dialog) {
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_paste), state);
@@ -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),
column);
} else {
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_add_delete), state);
@@ -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),
column);
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_switch_scope),
@@ -1148,7 +1148,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
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_CALLBACK (cb_name_guru_content_edited), state);
column = gtk_tree_view_column_new_with_attributes
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 15c7bd1..a10b71b 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -42,8 +42,8 @@
#include <func.h>
#include <gnm-format.h>
#include <goffice/goffice.h>
-#include <widgets/gnumeric-expr-entry.h>
-#include <widgets/gnumeric-cell-renderer-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
+#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <locale.h>
#include <string.h>
@@ -83,7 +83,7 @@ typedef struct
gint old_height_request;
gint old_width_request;
- GnumericCellRendererExprEntry *cellrenderer;
+ GnmCellRendererExprEntry *cellrenderer;
GtkTreeViewColumn *column;
GtkCellEditable *editable;
} FormulaGuruState;
@@ -668,7 +668,7 @@ cb_dialog_formula_guru_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
FormulaGuruState *state)
{
if (state->cellrenderer->entry)
- gnumeric_cell_renderer_expr_entry_editing_done (
+ gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
wbcg_edit_finish (state->wbcg,
@@ -890,14 +890,14 @@ dialog_formula_guru_init (FormulaGuruState *state)
G_CALLBACK (cb_dialog_formula_guru_selection_changed), state);
column = gtk_tree_view_column_new_with_attributes (_("Name"),
- gnumeric_cell_renderer_text_new (),
+ gnm_cell_renderer_text_new (),
"text", ARG_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column);
column = gtk_tree_view_column_new_with_attributes (_("Type"),
- gnumeric_cell_renderer_text_new (),
+ gnm_cell_renderer_text_new (),
"text", ARG_TYPE, NULL);
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);
g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_dialog_formula_guru_edited), state);
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 705fa9c..77f0e44 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -43,7 +43,7 @@
#include <workbook-view.h>
#include <tools/goal-seek.h>
#include <mathfunc.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <selection.h>
#include <application.h>
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 5633f5d..50551b7 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -26,7 +26,7 @@
#include <dialogs/help.h>
#include <commands.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <expr-name.h>
#include <expr.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index e25993e..470d543 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -36,7 +36,7 @@
#include <value.h>
#include <commands.h>
#include <selection.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#define MERGE_KEY "merge-dialog"
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 494e7b4..ae84471 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -34,7 +34,7 @@
#include <workbook-control.h>
#include <wbc-gtk.h>
#include <number-match.h>
-#include <widgets/gnumeric-cell-renderer-text.h>
+#include <widgets/gnm-cell-renderer-text.h>
#include <gnumeric-conf.h>
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index 831c920..78971dd 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -44,7 +44,7 @@
#include <value.h>
#include <commands.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <string.h>
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index 82145ce..9763856 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -45,7 +45,7 @@
#include <value.h>
#include <commands.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <string.h>
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 18e4af8..99fe276 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -29,7 +29,7 @@
#include <gnumeric-conf.h>
#include <gui-util.h>
#include <search.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <wbc-gtk.h>
#include <selection.h>
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index d4cddc7..6774766 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -40,7 +40,7 @@
#include <sheet-object-cell-comment.h>
#include <selection.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <string.h>
#define SEARCH_KEY "search-dialog"
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index c8dbd02..41b0b1f 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -40,8 +40,8 @@
#include <style-color.h>
#include <commands.h>
#include <application.h>
-#include <widgets/gnumeric-cell-renderer-text.h>
-#include <widgets/gnumeric-cell-renderer-toggle.h>
+#include <widgets/gnm-cell-renderer-text.h>
+#include <widgets/gnm-cell-renderer-toggle.h>
#include <goffice/goffice.h>
#include <string.h>
@@ -697,7 +697,7 @@ create_sheet_list (SheetManager *state)
selection = gtk_tree_view_get_selection (state->sheet_list);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_toggled_lock), state);
@@ -710,7 +710,7 @@ create_sheet_list (SheetManager *state)
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_toggled_visible), state);
@@ -723,7 +723,7 @@ create_sheet_list (SheetManager *state)
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
- renderer = gnumeric_cell_renderer_toggle_new ();
+ renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), "toggled",
G_CALLBACK (cb_toggled_direction), state);
column = gtk_tree_view_column_new_with_attributes
@@ -740,7 +740,7 @@ create_sheet_list (SheetManager *state)
column = gtk_tree_view_column_new_with_attributes
/*Translators: Table header for column with number of "Rows"*/
(C_("sheetlist", "Rows"),
- gnumeric_cell_renderer_text_new (),
+ gnm_cell_renderer_text_new (),
"text", SHEET_ROW_MAX,
NULL);
gtk_tree_view_column_set_visible (column, FALSE);
@@ -750,7 +750,7 @@ create_sheet_list (SheetManager *state)
column = gtk_tree_view_column_new_with_attributes
/*Translators: Table header for column with number of "Cols"*/
(C_("sheetlist", "Cols"),
- gnumeric_cell_renderer_text_new (),
+ gnm_cell_renderer_text_new (),
"text", SHEET_COL_MAX,
NULL);
gtk_tree_view_column_set_visible (column, FALSE);
@@ -758,14 +758,14 @@ create_sheet_list (SheetManager *state)
state->col_max_column = column;
column = gtk_tree_view_column_new_with_attributes (_("Current Name"),
- gnumeric_cell_renderer_text_new (),
+ gnm_cell_renderer_text_new (),
"text", SHEET_NAME,
"background-rgba",BACKGROUND_COLOUR,
"foreground-rgba",FOREGROUND_COLOUR,
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
- renderer = gnumeric_cell_renderer_text_new ();
+ renderer = gnm_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer),
"editable", TRUE,
"editable-set", TRUE,
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index 6e1fa1e..0d146e9 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -38,7 +38,7 @@
#include <commands.h>
#include <selection.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <tools/data-shuffling.h>
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index efd79c5..6a18894 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -32,7 +32,7 @@
#include <value.h>
#include <wbc-gtk.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <tools/simulation.h>
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index aa81685..f3e4b17 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -35,7 +35,7 @@
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <glib/gi18n.h>
#define DIALOG_SO_LIST_KEY "so-list"
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 2cff99a..5f32b04 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -32,7 +32,7 @@
#include <sheet-object.h>
#include <gnm-so-line.h>
#include <goffice/goffice.h>
-#include <widgets/gnumeric-text-view.h>
+#include <widgets/gnm-text-view.h>
typedef struct {
GObject *so;
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index ac7ea37..f0894a3 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -44,7 +44,7 @@
#include <selection.h>
#include <application.h>
#include <tools/gnm-solver.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index a7dc4ac..3c72bcc 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -28,7 +28,7 @@
#include <dialogs/help.h>
#include <gui-util.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <tools/tabulate.h>
#include <wbc-gtk.h>
#include <ranges.h>
diff --git a/src/dialogs/tool-dialogs.h b/src/dialogs/tool-dialogs.h
index 15d4b1d..2b2782b 100644
--- a/src/dialogs/tool-dialogs.h
+++ b/src/dialogs/tool-dialogs.h
@@ -17,7 +17,7 @@
#include <gnumeric.h>
#include <numbers.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
typedef struct _scenario_state scenario_state_t;
diff --git a/src/gui-util.c b/src/gui-util.c
index 26d1112..dd5c178 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -22,7 +22,7 @@
#include <workbook.h>
#include <libgnumeric.h>
#include <wbc-gtk.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <goffice/goffice.h>
#include <atk/atkrelation.h>
diff --git a/src/item-edit.c b/src/item-edit.c
index 4c0ec97..a21a70d 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -32,7 +32,7 @@
#include <workbook.h>
#include <wbc-gtk.h>
#include <gui-util.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#define GNUMERIC_ITEM "EDIT"
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 3f82e06..dae05bb 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -60,7 +60,7 @@
#include <gnm-pane-impl.h>
#include <item-bar.h>
#include <item-cursor.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <gnm-sheet-slicer.h>
#include <input-msg.h>
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 33050d7..7a5def3 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -42,7 +42,7 @@
#include <sheet.h>
#include <cell.h>
#include <mathfunc.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <dialogs/dialogs.h>
#include <dialogs/help.h>
#include <xml-sax.h>
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index d1203c7..cd45ba0 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -47,7 +47,7 @@
#include <selection.h>
#include <validation.h>
#include <value.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <gui-util.h>
#include <command-context.h>
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 56b4bbe..ec9678a 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -5,7 +5,7 @@
#include <wbc-gtk.h>
#include <workbook-control-priv.h>
#include <style.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-notebook.h>
#include <goffice/goffice.h>
diff --git a/src/wbc-gtk.h b/src/wbc-gtk.h
index 7f93521..572ce26 100644
--- a/src/wbc-gtk.h
+++ b/src/wbc-gtk.h
@@ -4,7 +4,7 @@
#include <gnumeric.h>
#include <gnumeric-fwd.h>
#include <workbook-control.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnumeric-cell-renderer-expr-entry.c b/src/widgets/gnm-cell-renderer-expr-entry.c
similarity index 82%
rename from src/widgets/gnumeric-cell-renderer-expr-entry.c
rename to src/widgets/gnm-cell-renderer-expr-entry.c
index c353b8b..a6daab0 100644
--- a/src/widgets/gnumeric-cell-renderer-expr-entry.c
+++ b/src/widgets/gnm-cell-renderer-expr-entry.c
@@ -1,4 +1,4 @@
-/* gnumeric-cell-renderer-expr-entry.c
+/* gnm-cell-renderer-expr-entry.c
* Copyright (C) 2002 Andreas J. Guelzow <aguelzow taliesin ca>
*
* This program is free software; you can redistribute it and/or modify
@@ -16,17 +16,17 @@
*/
#include <gnumeric-config.h>
-#include <widgets/gnumeric-cell-renderer-expr-entry.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-cell-renderer-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <wbc-gtk.h>
#include <dead-kittens.h>
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_PATH "gnumeric-cell-renderer-expr-entry-path"
static void gnumeric_cell_renderer_expr_entry_class_init
- (GnumericCellRendererExprEntryClass *cell_expr_entry_class) ;
+ (GnmCellRendererExprEntryClass *cell_expr_entry_class) ;
-static GnumericCellRendererTextClass *parent_class = NULL;
+static GnmCellRendererTextClass *parent_class = NULL;
static GtkCellEditable *gnumeric_cell_renderer_expr_entry_start_editing
(GtkCellRenderer *cell,
@@ -38,7 +38,7 @@ static GtkCellEditable *gnumeric_cell_renderer_expr_entry_start_editing
GtkCellRendererState flags);
GType
-gnumeric_cell_renderer_expr_entry_get_type (void)
+gnm_cell_renderer_expr_entry_get_type (void)
{
static GType cell_expr_entry_type = 0;
@@ -46,19 +46,19 @@ gnumeric_cell_renderer_expr_entry_get_type (void)
{
static const GTypeInfo cell_expr_entry_info =
{
- sizeof (GnumericCellRendererExprEntryClass),
+ sizeof (GnmCellRendererExprEntryClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc)gnumeric_cell_renderer_expr_entry_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GnumericCellRendererExprEntry),
+ sizeof (GnmCellRendererExprEntry),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
cell_expr_entry_type = g_type_register_static (GNM_CELL_RENDERER_TEXT_TYPE,
- "GnumericCellRendererExprEntry",
+ "GnmCellRendererExprEntry",
&cell_expr_entry_info, 0);
}
@@ -67,7 +67,7 @@ gnumeric_cell_renderer_expr_entry_get_type (void)
static void
-gnumeric_cell_renderer_expr_entry_class_init (GnumericCellRendererExprEntryClass *class)
+gnumeric_cell_renderer_expr_entry_class_init (GnmCellRendererExprEntryClass *class)
{
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -79,9 +79,9 @@ gnumeric_cell_renderer_expr_entry_class_init (GnumericCellRendererExprEntryClass
GtkCellRenderer *
-gnumeric_cell_renderer_expr_entry_new (WBCGtk *wbcg)
+gnm_cell_renderer_expr_entry_new (WBCGtk *wbcg)
{
- GnumericCellRendererExprEntry *this =
+ GnmCellRendererExprEntry *this =
GNM_CELL_RENDERER_EXPR_ENTRY(g_object_new
(GNM_CELL_RENDERER_EXPR_ENTRY_TYPE, NULL));
this->wbcg = wbcg;
@@ -89,8 +89,8 @@ gnumeric_cell_renderer_expr_entry_new (WBCGtk *wbcg)
}
void
-gnumeric_cell_renderer_expr_entry_editing_done (GtkCellEditable *entry,
- GnumericCellRendererExprEntry *celltext)
+gnm_cell_renderer_expr_entry_editing_done (GtkCellEditable *entry,
+ GnmCellRendererExprEntry *celltext)
{
const gchar *path;
const gchar *new_text;
@@ -115,7 +115,7 @@ gnumeric_cell_renderer_expr_entry_start_editing (GtkCellRenderer *cell,
G_GNUC_UNUSED GdkRectangle const *cell_area,
G_GNUC_UNUSED GtkCellRendererState flags)
{
- GnumericCellRendererExprEntry *celltext;
+ GnmCellRendererExprEntry *celltext;
GtkEntry *entry;
GnmExprEntry *gentry;
char *text;
@@ -141,7 +141,7 @@ gnumeric_cell_renderer_expr_entry_start_editing (GtkCellRenderer *cell,
gtk_widget_show_all (GTK_WIDGET (gentry));
g_signal_connect (gentry,
"editing_done",
- G_CALLBACK (gnumeric_cell_renderer_expr_entry_editing_done),
+ G_CALLBACK (gnm_cell_renderer_expr_entry_editing_done),
celltext);
wbcg_set_entry (celltext->wbcg, gentry);
diff --git a/src/widgets/gnm-cell-renderer-expr-entry.h b/src/widgets/gnm-cell-renderer-expr-entry.h
new file mode 100644
index 0000000..b4ef9f6
--- /dev/null
+++ b/src/widgets/gnm-cell-renderer-expr-entry.h
@@ -0,0 +1,52 @@
+/* gnm-cell-renderer-expr-entry.h
+ * Copyright (C) 2002 Andreas J. Guelzow <aguelzow taliesin ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef GNM_CELL_RENDERER_EXPR_ENTRY_H__
+#define GNM_CELL_RENDERER_EXPR_ENTRY_H__
+
+#include <widgets/gnm-cell-renderer-text.h>
+#include <widgets/gnm-expr-entry.h>
+#include <gnumeric-fwd.h>
+
+G_BEGIN_DECLS
+
+#define GNM_CELL_RENDERER_EXPR_ENTRY_TYPE (gnm_cell_renderer_expr_entry_get_type ())
+#define GNM_CELL_RENDERER_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_CELL_RENDERER_EXPR_ENTRY_TYPE, GnmCellRendererExprEntry))
+#define GNM_IS_CELL_RENDERER_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
GNM_CELL_RENDERER_EXPR_ENTRY_TYPE))
+
+typedef struct GnmCellRendererExprEntry_ GnmCellRendererExprEntry;
+typedef struct GnmCellRendererExprEntryClass_ GnmCellRendererExprEntryClass;
+
+struct GnmCellRendererExprEntry_ {
+ GnmCellRendererText parent;
+
+ WBCGtk *wbcg;
+ GnmExprEntry *entry;
+};
+
+struct GnmCellRendererExprEntryClass_ {
+ GnmCellRendererTextClass parent_class;
+};
+
+GType gnm_cell_renderer_expr_entry_get_type (void);
+GtkCellRenderer *gnm_cell_renderer_expr_entry_new (WBCGtk *wbcg);
+void gnm_cell_renderer_expr_entry_editing_done (GtkCellEditable *entry,
+ GnmCellRendererExprEntry *celltext);
+
+G_END_DECLS
+
+#endif
diff --git a/src/widgets/gnumeric-cell-renderer-text.c b/src/widgets/gnm-cell-renderer-text.c
similarity index 88%
rename from src/widgets/gnumeric-cell-renderer-text.c
rename to src/widgets/gnm-cell-renderer-text.c
index a4fc821..81c4876 100644
--- a/src/widgets/gnumeric-cell-renderer-text.c
+++ b/src/widgets/gnm-cell-renderer-text.c
@@ -1,4 +1,4 @@
-/* gnumeric-cell-renderer-text.c
+/* gnm-cell-renderer-text.c
* Copyright (C) 2002 Andreas J. Guelzow <aguelzow taliesin ca>
*
* This program is free software; you can redistribute it and/or modify
@@ -16,17 +16,17 @@
*/
#include <gnumeric-config.h>
-#include <widgets/gnumeric-cell-renderer-text.h>
+#include <widgets/gnm-cell-renderer-text.h>
#include <dead-kittens.h>
#include <gui-util.h>
static void gnumeric_cell_renderer_text_class_init
- (GnumericCellRendererTextClass *cell_text_class);
+ (GnmCellRendererTextClass *cell_text_class);
static GtkCellRendererTextClass *parent_class = NULL;
GType
-gnumeric_cell_renderer_text_get_type (void)
+gnm_cell_renderer_text_get_type (void)
{
static GType cell_text_type = 0;
@@ -34,18 +34,18 @@ gnumeric_cell_renderer_text_get_type (void)
{
static const GTypeInfo cell_text_info =
{
- sizeof (GnumericCellRendererTextClass),
+ sizeof (GnmCellRendererTextClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc)gnumeric_cell_renderer_text_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GnumericCellRendererText),
+ sizeof (GnmCellRendererText),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
- cell_text_type = g_type_register_static (GTK_TYPE_CELL_RENDERER_TEXT,
"GnumericCellRendererText", &cell_text_info, 0);
+ cell_text_type = g_type_register_static (GTK_TYPE_CELL_RENDERER_TEXT, "GnmCellRendererText",
&cell_text_info, 0);
}
return cell_text_type;
@@ -109,7 +109,7 @@ gnumeric_cell_renderer_text_render (GtkCellRenderer *cell,
}
static void
-gnumeric_cell_renderer_text_class_init (GnumericCellRendererTextClass *class)
+gnumeric_cell_renderer_text_class_init (GnmCellRendererTextClass *class)
{
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -121,7 +121,7 @@ gnumeric_cell_renderer_text_class_init (GnumericCellRendererTextClass *class)
GtkCellRenderer *
-gnumeric_cell_renderer_text_new (void)
+gnm_cell_renderer_text_new (void)
{
return GTK_CELL_RENDERER (g_object_new (GNM_CELL_RENDERER_TEXT_TYPE, NULL));
}
diff --git a/src/widgets/gnumeric-cell-renderer-text.h b/src/widgets/gnm-cell-renderer-text.h
similarity index 61%
rename from src/widgets/gnumeric-cell-renderer-text.h
rename to src/widgets/gnm-cell-renderer-text.h
index f831bce..e7dcf2b 100644
--- a/src/widgets/gnumeric-cell-renderer-text.h
+++ b/src/widgets/gnm-cell-renderer-text.h
@@ -1,4 +1,4 @@
-/* gnumeric-cell-renderer-text.h
+/* gnm-cell-renderer-text.h
* Copyright (C) 2002 Andreas J. Guelzow <aguelzow taliesin ca>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,34 +15,34 @@
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef __GNUMERIC_CELL_RENDERER_TEXT_H__
-#define __GNUMERIC_CELL_RENDERER_TEXT_H__
+#ifndef GNM__CELL_RENDERER_TEXT_H__
+#define GNM__CELL_RENDERER_TEXT_H__
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define GNM_CELL_RENDERER_TEXT_TYPE (gnumeric_cell_renderer_text_get_type ())
-#define GNM_CELL_RENDERER_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_CELL_RENDERER_TEXT_TYPE, GnumericCellRendererText))
+#define GNM_CELL_RENDERER_TEXT_TYPE (gnm_cell_renderer_text_get_type ())
+#define GNM_CELL_RENDERER_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_CELL_RENDERER_TEXT_TYPE, GnmCellRendererText))
#define GNM_IS_CELL_RENDERER_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_CELL_RENDERER_TEXT_TYPE))
-typedef struct _GnumericCellRendererText GnumericCellRendererText;
-typedef struct _GnumericCellRendererTextClass GnumericCellRendererTextClass;
+typedef struct GnmCellRendererText_ GnmCellRendererText;
+typedef struct GnmCellRendererTextClass_ GnmCellRendererTextClass;
-struct _GnumericCellRendererText
+struct GnmCellRendererText_
{
GtkCellRendererText parent;
};
-struct _GnumericCellRendererTextClass
+struct GnmCellRendererTextClass_
{
GtkCellRendererTextClass parent_class;
};
-GType gnumeric_cell_renderer_text_get_type (void);
-GtkCellRenderer *gnumeric_cell_renderer_text_new (void);
+GType gnm_cell_renderer_text_get_type (void);
+GtkCellRenderer *gnm_cell_renderer_text_new (void);
G_END_DECLS
-#endif /* __GTK_CELL_RENDERER_TEXT_H__ */
+#endif
diff --git a/src/widgets/gnumeric-cell-renderer-toggle.c b/src/widgets/gnm-cell-renderer-toggle.c
similarity index 88%
rename from src/widgets/gnumeric-cell-renderer-toggle.c
rename to src/widgets/gnm-cell-renderer-toggle.c
index 7045c64..fe52798 100644
--- a/src/widgets/gnumeric-cell-renderer-toggle.c
+++ b/src/widgets/gnm-cell-renderer-toggle.c
@@ -1,4 +1,4 @@
-/* gnumeric-cell-renderer-toggle.c
+/* gnm-cell-renderer-toggle.c
*
* Author:
* Andreas J. Guelzow <aguelzow taliesin ca>
@@ -20,7 +20,7 @@
*/
#include <gnumeric-config.h>
-#include <widgets/gnumeric-cell-renderer-toggle.h>
+#include <widgets/gnm-cell-renderer-toggle.h>
#include <gsf/gsf-impl-utils.h>
#include <gnm-i18n.h>
@@ -49,7 +49,7 @@ static void gnumeric_cell_renderer_toggle_render (GtkCellRenderer *cell,
GtkCellRendererState flags);
static void gnumeric_cell_renderer_toggle_class_init
- (GnumericCellRendererToggleClass *cell_toggle_class);
+ (GnmCellRendererToggleClass *cell_toggle_class);
static GtkCellRendererToggleClass *parent_class = NULL;
@@ -59,7 +59,7 @@ enum {
};
GType
-gnumeric_cell_renderer_toggle_get_type (void)
+gnm_cell_renderer_toggle_get_type (void)
{
static GType cell_toggle_type = 0;
@@ -67,19 +67,19 @@ gnumeric_cell_renderer_toggle_get_type (void)
{
static const GTypeInfo cell_toggle_info =
{
- sizeof (GnumericCellRendererToggleClass),
+ sizeof (GnmCellRendererToggleClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc)gnumeric_cell_renderer_toggle_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GnumericCellRendererToggle),
+ sizeof (GnmCellRendererToggle),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
cell_toggle_type = g_type_register_static (GTK_TYPE_CELL_RENDERER_TOGGLE,
- "GnumericCellRendererToggle",
+ "GnmCellRendererToggle",
&cell_toggle_info, 0);
}
@@ -89,13 +89,13 @@ gnumeric_cell_renderer_toggle_get_type (void)
static void
gnumeric_cell_renderer_toggle_dispose (GObject *obj)
{
- GnumericCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (obj);
+ GnmCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (obj);
g_clear_object (&celltoggle->pixbuf);
G_OBJECT_CLASS (parent_class)->dispose (obj);
}
static void
-gnumeric_cell_renderer_toggle_class_init (GnumericCellRendererToggleClass *class)
+gnumeric_cell_renderer_toggle_class_init (GnmCellRendererToggleClass *class)
{
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -120,7 +120,7 @@ gnumeric_cell_renderer_toggle_class_init (GnumericCellRendererToggleClass *class
GtkCellRenderer *
-gnumeric_cell_renderer_toggle_new (void)
+gnm_cell_renderer_toggle_new (void)
{
return GTK_CELL_RENDERER (g_object_new (GNM_CELL_RENDERER_TOGGLE_TYPE, NULL));
}
@@ -131,7 +131,7 @@ gnumeric_cell_renderer_toggle_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GnumericCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (object);
+ GnmCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (object);
switch (param_id) {
case PROP_PIXBUF:
@@ -150,7 +150,7 @@ gnumeric_cell_renderer_toggle_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GnumericCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (object);
+ GnmCellRendererToggle *celltoggle = GNM_CELL_RENDERER_TOGGLE (object);
GdkPixbuf *pixbuf;
switch (param_id) {
@@ -177,7 +177,7 @@ gnumeric_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
gint *width,
gint *height)
{
- GnumericCellRendererToggle *cellpixbuf = (GnumericCellRendererToggle *) cell;
+ GnmCellRendererToggle *cellpixbuf = (GnmCellRendererToggle *) cell;
gint pixbuf_width = 0;
gint pixbuf_height = 0;
gint calc_width;
@@ -233,7 +233,7 @@ gnumeric_cell_renderer_toggle_render (GtkCellRenderer *cell,
GdkRectangle const *cell_area,
G_GNUC_UNUSED GtkCellRendererState flags)
{
- GnumericCellRendererToggle *cellpixbuf = (GnumericCellRendererToggle *) cell;
+ GnmCellRendererToggle *cellpixbuf = (GnmCellRendererToggle *) cell;
GdkPixbuf *pixbuf;
GdkRectangle pix_rect;
GdkRectangle draw_rect;
diff --git a/src/widgets/gnumeric-cell-renderer-toggle.h b/src/widgets/gnm-cell-renderer-toggle.h
similarity index 62%
rename from src/widgets/gnumeric-cell-renderer-toggle.h
rename to src/widgets/gnm-cell-renderer-toggle.h
index cc33eaf..d627702 100644
--- a/src/widgets/gnumeric-cell-renderer-toggle.h
+++ b/src/widgets/gnm-cell-renderer-toggle.h
@@ -1,4 +1,4 @@
-/* gnumeric-cell-renderer-toggle.h
+/* gnm-cell-renderer-toggle.h
*
* Author:
* Andreas J. Guelzow <aguelzow taliesin ca>
@@ -19,36 +19,36 @@
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef __GNUMERIC_CELL_RENDERER_TOGGLE_H__
-#define __GNUMERIC_CELL_RENDERER_TOGGLE_H__
+#ifndef GNM__CELL_RENDERER_TOGGLE_H__
+#define GNM__CELL_RENDERER_TOGGLE_H__
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define GNM_CELL_RENDERER_TOGGLE_TYPE (gnumeric_cell_renderer_toggle_get_type ())
-#define GNM_CELL_RENDERER_TOGGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_CELL_RENDERER_TOGGLE_TYPE, GnumericCellRendererToggle))
+#define GNM_CELL_RENDERER_TOGGLE_TYPE (gnm_cell_renderer_toggle_get_type ())
+#define GNM_CELL_RENDERER_TOGGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_CELL_RENDERER_TOGGLE_TYPE, GnmCellRendererToggle))
#define GNM_IS_CELL_RENDERER_TOGGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
GNM_CELL_RENDERER_TOGGLE_TYPE))
-typedef struct _GnumericCellRendererToggle GnumericCellRendererToggle;
-typedef struct _GnumericCellRendererToggleClass GnumericCellRendererToggleClass;
+typedef struct GnmCellRendererToggle_ GnmCellRendererToggle;
+typedef struct GnmCellRendererToggleClass_ GnmCellRendererToggleClass;
-struct _GnumericCellRendererToggle
+struct GnmCellRendererToggle_
{
GtkCellRendererToggle parent;
GdkPixbuf *pixbuf;
};
-struct _GnumericCellRendererToggleClass
+struct GnmCellRendererToggleClass_
{
GtkCellRendererToggleClass parent_class;
};
-GType gnumeric_cell_renderer_toggle_get_type (void);
-GtkCellRenderer *gnumeric_cell_renderer_toggle_new (void);
+GType gnm_cell_renderer_toggle_get_type (void);
+GtkCellRenderer *gnm_cell_renderer_toggle_new (void);
G_END_DECLS
-#endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */
+#endif
diff --git a/src/widgets/gnm-dao.c b/src/widgets/gnm-dao.c
index ca2fc45..5afc263 100644
--- a/src/widgets/gnm-dao.c
+++ b/src/widgets/gnm-dao.c
@@ -19,7 +19,7 @@
#include <gnumeric-config.h>
#include <widgets/gnm-dao.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <tools/dao.h>
#include <value.h>
#include <workbook-control.h>
diff --git a/src/widgets/gnumeric-dashed-canvas-line.c b/src/widgets/gnm-dashed-canvas-line.c
similarity index 78%
rename from src/widgets/gnumeric-dashed-canvas-line.c
rename to src/widgets/gnm-dashed-canvas-line.c
index bddca3f..e32742f 100644
--- a/src/widgets/gnumeric-dashed-canvas-line.c
+++ b/src/widgets/gnm-dashed-canvas-line.c
@@ -1,5 +1,5 @@
/*
- * gnumeric-dashed-canvas-line.c : A canvas line with support for dash styles.
+ * gnm-dashed-canvas-line.c : A canvas line with support for dash styles.
*
* Author:
* Jody Goldberg (jody gnome org)
@@ -8,31 +8,16 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include <widgets/gnumeric-dashed-canvas-line.h>
+#include <widgets/gnm-dashed-canvas-line.h>
#include <gsf/gsf-impl-utils.h>
#include <math.h>
static GocItemClass *parent_class;
-static void gnumeric_dashed_canvas_line_draw (GocItem const *item,
- cairo_t *cr);
+static void gnm_dashed_canvas_line_draw (GocItem const *item, cairo_t *cr);
-static GnmDashedCanvasLineClass *gnumeric_dashed_canvas_line_class;
-
-static inline double
-hypothenuse (double xlength, double ylength)
-{
- /* A little optimisation for speed. Horizontal or vertical lines
- * are a lot more common than slanted */
- if (xlength == 0)
- return fabs (ylength);
- else if (ylength == 0)
- return fabs (xlength);
- else
- return sqrt (xlength * xlength + ylength * ylength);
-
-}
+static GnmDashedCanvasLineClass *gnm_dashed_canvas_line_class;
static void
line_draw (GocItem const *item, GnmStyleBorderType const i, cairo_t *cr)
@@ -117,7 +102,7 @@ double_line_draw (GocItem const *item, GnmStyleBorderType const i, cairo_t *cr)
xdiff = coords[2] - coords[0];
ydiff = coords[3] - coords[1];
- length = hypothenuse (xdiff, ydiff);
+ length = hypot (xdiff, ydiff);
yoffs = xdiff/length;
xoffs = -ydiff/length;
@@ -140,7 +125,7 @@ double_line_draw (GocItem const *item, GnmStyleBorderType const i, cairo_t *cr)
}
static void
-gnumeric_dashed_canvas_line_draw (GocItem const *item, cairo_t *cr)
+gnm_dashed_canvas_line_draw (GocItem const *item, cairo_t *cr)
{
GnmDashedCanvasLine *line = GNM_DASHED_CANVAS_LINE (item);
@@ -152,7 +137,7 @@ gnumeric_dashed_canvas_line_draw (GocItem const *item, cairo_t *cr)
}
static void
-gnumeric_dashed_canvas_line_update_bounds (GocItem *item)
+gnm_dashed_canvas_line_update_bounds (GocItem *item)
{
GOStyle *style = go_styled_object_get_style (GO_STYLED_OBJECT (item));
double saved_width = style->line.width;
@@ -162,32 +147,32 @@ gnumeric_dashed_canvas_line_update_bounds (GocItem *item)
}
static void
-gnumeric_dashed_canvas_line_class_init (GnmDashedCanvasLineClass *klass)
+gnm_dashed_canvas_line_class_init (GnmDashedCanvasLineClass *klass)
{
GocItemClass *item_class;
parent_class = g_type_class_peek_parent (klass);
- gnumeric_dashed_canvas_line_class = klass;
+ gnm_dashed_canvas_line_class = klass;
item_class = (GocItemClass *) klass;
- item_class->draw = gnumeric_dashed_canvas_line_draw;
- item_class->update_bounds = gnumeric_dashed_canvas_line_update_bounds;
+ item_class->draw = gnm_dashed_canvas_line_draw;
+ item_class->update_bounds = gnm_dashed_canvas_line_update_bounds;
}
static void
-gnumeric_dashed_canvas_line_init (GnmDashedCanvasLine *line)
+gnm_dashed_canvas_line_init (GnmDashedCanvasLine *line)
{
line->dash_style_index = GNM_STYLE_BORDER_THIN;
}
-GSF_CLASS (GnmDashedCanvasLine, gnumeric_dashed_canvas_line,
- gnumeric_dashed_canvas_line_class_init,
- gnumeric_dashed_canvas_line_init, GOC_TYPE_LINE)
+GSF_CLASS (GnmDashedCanvasLine, gnm_dashed_canvas_line,
+ gnm_dashed_canvas_line_class_init,
+ gnm_dashed_canvas_line_init, GOC_TYPE_LINE)
void
-gnumeric_dashed_canvas_line_set_dash_index (GnmDashedCanvasLine *line,
- GnmStyleBorderType const indx)
+gnm_dashed_canvas_line_set_dash_index (GnmDashedCanvasLine *line,
+ GnmStyleBorderType const indx)
{
gint const width = gnm_style_border_get_width (indx);
GOStyle *style = go_styled_object_get_style (GO_STYLED_OBJECT (line));
diff --git a/src/widgets/gnumeric-dashed-canvas-line.h b/src/widgets/gnm-dashed-canvas-line.h
similarity index 68%
rename from src/widgets/gnumeric-dashed-canvas-line.h
rename to src/widgets/gnm-dashed-canvas-line.h
index 11bd3a9..2a95f62 100644
--- a/src/widgets/gnumeric-dashed-canvas-line.h
+++ b/src/widgets/gnm-dashed-canvas-line.h
@@ -1,12 +1,12 @@
-#ifndef GNUMERIC_DASHED_CANVAS_LINE_H
-#define GNUMERIC_DASHED_CANVAS_LINE_H
+#ifndef GNM_DASHED_CANVAS_LINE_H
+#define GNM_DASHED_CANVAS_LINE_H
/* dashed Line item for the canvas */
#include <goffice/goffice.h>
#include <style-border.h>
#define GNM_DASHED_CANVAS_LINE_TYPE\
- (gnumeric_dashed_canvas_line_get_type ())
+ (gnm_dashed_canvas_line_get_type ())
#define GNM_DASHED_CANVAS_LINE(obj)\
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_DASHED_CANVAS_LINE_TYPE, GnmDashedCanvasLine))
#define GNM_IS_DASHED_CANVAS_LINE(obj)\
@@ -26,10 +26,10 @@ struct GnmDashedCanvasLine_ {
GnmStyleBorderType dash_style_index;
};
-void gnumeric_dashed_canvas_line_set_dash_index (GnmDashedCanvasLine *line,
- GnmStyleBorderType const indx);
+void gnm_dashed_canvas_line_set_dash_index (GnmDashedCanvasLine *line,
+ GnmStyleBorderType const indx);
/* Standard Gtk function */
-GType gnumeric_dashed_canvas_line_get_type (void);
+GType gnm_dashed_canvas_line_get_type (void);
#endif
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnm-expr-entry.c
similarity index 99%
rename from src/widgets/gnumeric-expr-entry.c
rename to src/widgets/gnm-expr-entry.c
index bda1054..fb0882a 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnm-expr-entry.c
@@ -1,6 +1,5 @@
-
/*
- * gnumeric-expr-entry.c: An entry widget specialized to handle expressions
+ * gnm-expr-entry.c: An entry widget specialized to handle expressions
* and ranges.
*
* Author:
@@ -10,7 +9,7 @@
#include <gnumeric-config.h>
#include <gnm-i18n.h>
#include <gnumeric.h>
-#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-expr-entry.h>
#include <wbc-gtk-impl.h>
#include <sheet-control-gui-priv.h>
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnm-expr-entry.h
similarity index 97%
rename from src/widgets/gnumeric-expr-entry.h
rename to src/widgets/gnm-expr-entry.h
index 430e6cb..6e96734 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnm-expr-entry.h
@@ -1,5 +1,5 @@
-#ifndef GNUMERIC_EXPR_ENTRY_H
-#define GNUMERIC_EXPR_ENTRY_H
+#ifndef GNM_EXPR_ENTRY_H
+#define GNM_EXPR_ENTRY_H
#include <gnumeric-fwd.h>
#include <parse-util.h>
@@ -90,4 +90,4 @@ gboolean gnm_expr_entry_editing_canceled (GnmExprEntry *gee);
/* private : for internal use */
void gnm_expr_entry_signal_update (GnmExprEntry *gee, gboolean user_requested);
-#endif /* GNUMERIC_EXPR_ENTRY_H */
+#endif
diff --git a/src/widgets/gnumeric-text-view.c b/src/widgets/gnm-text-view.c
similarity index 99%
rename from src/widgets/gnumeric-text-view.c
rename to src/widgets/gnm-text-view.c
index f445e70..c366a15 100644
--- a/src/widgets/gnumeric-text-view.c
+++ b/src/widgets/gnm-text-view.c
@@ -1,5 +1,5 @@
/*
- * gnumeric-text-view.c: A textview extension handling formatting
+ * gnm-text-view.c: A textview extension handling formatting
*
* Copyright (C) 2009 Andreas J. Guelzow
@@ -22,7 +22,7 @@
#include <gnumeric-config.h>
#include <gnm-i18n.h>
#include <gnumeric.h>
-#include <widgets/gnumeric-text-view.h>
+#include <widgets/gnm-text-view.h>
#include <gui-util.h>
diff --git a/src/widgets/gnumeric-text-view.h b/src/widgets/gnm-text-view.h
similarity index 87%
rename from src/widgets/gnumeric-text-view.h
rename to src/widgets/gnm-text-view.h
index 74dbf07..e3564a2 100644
--- a/src/widgets/gnumeric-text-view.h
+++ b/src/widgets/gnm-text-view.h
@@ -1,5 +1,5 @@
/*
- * gnumeric-text-view.c: A textview extension handling formatting
+ * gnm-text-view.h: A textview extension handling formatting
*
* Copyright (C) 2009 Andreas J. Guelzow
@@ -19,8 +19,8 @@
* USA
*/
-#ifndef GNUMERIC_TEXT_VIEW_H
-#define GNUMERIC_TEXT_VIEW_H
+#ifndef GNM_TEXT_VIEW_H
+#define GNM_TEXT_VIEW_H
#include <gnumeric-fwd.h>
@@ -33,4 +33,4 @@ typedef struct _GnmTextView GnmTextView;
GType gnm_text_view_get_type (void);
GnmTextView *gnm_text_view_new (void);
-#endif /* GNUMERIC_TEXT_VIEW_H */
+#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
