From 193090d0821d84eee24d5d340c91bc069bb55827 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 25 May 2017 07:35:01 +0200 Subject: [PATCH] Update identifiers to reflect new identity of upstream package --- src/ui/gui/efficient-sheet.mk | 32 ++++++++++++------------ src/ui/gui/goto-case-dialog.c | 4 +-- src/ui/gui/psppire-data-editor.c | 36 +++++++++++++-------------- src/ui/gui/psppire-data-sheet.c | 12 ++++----- src/ui/gui/psppire-data-sheet.h | 8 +++--- src/ui/gui/psppire-data-window.c | 16 ++++++------ src/ui/gui/psppire-dict.c | 10 ++++---- src/ui/gui/psppire-var-sheet-header.c | 8 +++--- src/ui/gui/psppire-variable-sheet.c | 22 ++++++++-------- src/ui/gui/psppire-variable-sheet.h | 8 +++--- 10 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/ui/gui/efficient-sheet.mk b/src/ui/gui/efficient-sheet.mk index a91226e607..04042766d7 100644 --- a/src/ui/gui/efficient-sheet.mk +++ b/src/ui/gui/efficient-sheet.mk @@ -1,26 +1,26 @@ src_ui_gui_psppire_SOURCES += \ - src/ui/gui/efficient-sheet/src/jmd-axis-model.c \ - src/ui/gui/efficient-sheet/src/jmd-constraint.c \ - src/ui/gui/efficient-sheet/src/jmd-sheet.c \ - src/ui/gui/efficient-sheet/src/jmd-sheet-axis.c \ - src/ui/gui/efficient-sheet/src/jmd-sheet-body.c \ - src/ui/gui/efficient-sheet/src/jmd-sheet-single.c \ - src/ui/gui/efficient-sheet/src/jmd-datum.c \ - src/ui/gui/efficient-sheet/src/jmd-cell.c + src/ui/gui/efficient-sheet/src/ssw-axis-model.c \ + src/ui/gui/efficient-sheet/src/ssw-constraint.c \ + src/ui/gui/efficient-sheet/src/ssw-sheet.c \ + src/ui/gui/efficient-sheet/src/ssw-sheet-axis.c \ + src/ui/gui/efficient-sheet/src/ssw-sheet-body.c \ + src/ui/gui/efficient-sheet/src/ssw-sheet-single.c \ + src/ui/gui/efficient-sheet/src/ssw-datum.c \ + src/ui/gui/efficient-sheet/src/ssw-cell.c nodist_src_ui_gui_psppire_SOURCES += \ - src/ui/gui/efficient-sheet/jmd-marshaller.c \ - src/ui/gui/efficient-sheet/jmd-marshaller.h + src/ui/gui/efficient-sheet/src/ssw-marshaller.c \ + src/ui/gui/efficient-sheet/src/ssw-marshaller.h src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet/src BUILT_SOURCES += \ - src/ui/gui/efficient-sheet/src/jmd-marshaller.c \ - src/ui/gui/efficient-sheet/src/jmd-marshaller.h + src/ui/gui/efficient-sheet/src/ssw-marshaller.c \ + src/ui/gui/efficient-sheet/src/ssw-marshaller.h -src/ui/gui/efficient-sheet/src/jmd-marshaller.c: src/ui/gui/efficient-sheet/src/marshall-list - glib-genmarshal --body --prefix=jmd_cclosure_marshal $< > $@ +src/ui/gui/efficient-sheet/src/ssw-marshaller.c: src/ui/gui/efficient-sheet/src/marshall-list + glib-genmarshal --body --prefix=ssw_cclosure_marshal $< > $@ -src/ui/gui/efficient-sheet/src/jmd-marshaller.h: src/ui/gui/efficient-sheet/src/marshall-list - glib-genmarshal --header --prefix=jmd_cclosure_marshal $< > $@ +src/ui/gui/efficient-sheet/src/ssw-marshaller.h: src/ui/gui/efficient-sheet/src/marshall-list + glib-genmarshal --header --prefix=ssw_cclosure_marshal $< > $@ diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c index 9d694bf651..1b5e39a45d 100644 --- a/src/ui/gui/goto-case-dialog.c +++ b/src/ui/gui/goto-case-dialog.c @@ -66,8 +66,8 @@ goto_case_dialog (PsppireDataSheet *ds) if (case_num >= 0 && case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL)) { - jmd_sheet_scroll_to (ds, -1, case_num); - jmd_sheet_set_active_cell (ds, -1, case_num, 0); + ssw_sheet_scroll_to (ds, -1, case_num); + ssw_sheet_set_active_cell (ds, -1, case_num, 0); } } } diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 3f1f627ded..66ec49930a 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -41,7 +41,7 @@ #include "ui/gui/psppire-data-sheet.h" -#include "ui/gui/efficient-sheet/src/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/ssw-sheet.h" #include #define _(msgid) gettext (msgid) @@ -295,19 +295,19 @@ on_var_sheet_var_double_clicked (void *var_sheet, gint dict_index, gtk_notebook_set_current_page (GTK_NOTEBOOK (de), PSPPIRE_DATA_EDITOR_DATA_VIEW); - jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1); + ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1); } static void -on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index, +on_data_sheet_var_double_clicked (SswSheet *data_sheet, gint dict_index, PsppireDataEditor *de) { gtk_notebook_set_current_page (GTK_NOTEBOOK (de), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); - jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index); + ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index); } @@ -318,7 +318,7 @@ static void refresh_entry (PsppireDataEditor *de) { gint row, col; - if (jmd_sheet_get_active_cell (JMD_SHEET (de->data_sheet), &col, &row)) + if (ssw_sheet_get_active_cell (SSW_SHEET (de->data_sheet), &col, &row)) { union value val; const struct variable *var = psppire_dict_get_variable (de->dict, col); @@ -346,7 +346,7 @@ on_datum_entry_activate (PsppireValueEntry *entry, PsppireDataEditor *de) /* Called when the active cell or the selection in the data sheet changes */ static void -on_data_selection_change (PsppireDataEditor *de, JmdRange *sel) +on_data_selection_change (PsppireDataEditor *de, SswRange *sel) { gchar *ref_cell_text = NULL; @@ -395,7 +395,7 @@ static void set_font_recursively (GtkWidget *w, gpointer data); void psppire_data_editor_data_delete_variables (PsppireDataEditor *de) { - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; + SswRange *range = SSW_SHEET(de->data_sheet)->selection; psppire_dict_delete_variables (de->dict, range->start_x, (range->end_x - range->start_x + 1)); @@ -406,7 +406,7 @@ psppire_data_editor_data_delete_variables (PsppireDataEditor *de) void psppire_data_editor_var_delete_variables (PsppireDataEditor *de) { - JmdRange *range = JMD_SHEET(de->var_sheet)->selection; + SswRange *range = SSW_SHEET(de->var_sheet)->selection; psppire_dict_delete_variables (de->dict, range->start_y, (range->end_y - range->start_y + 1)); @@ -460,7 +460,7 @@ psppire_data_editor_init (PsppireDataEditor *de) de->split = FALSE; de->data_sheet = psppire_data_sheet_new (); - GtkWidget *data_button = jmd_sheet_get_button (JMD_SHEET (de->data_sheet)); + GtkWidget *data_button = ssw_sheet_get_button (SSW_SHEET (de->data_sheet)); gtk_button_set_label (GTK_BUTTON (data_button), _("Case")); de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0); @@ -477,7 +477,7 @@ psppire_data_editor_init (PsppireDataEditor *de) de->var_sheet = psppire_variable_sheet_new (); - GtkWidget *var_button = jmd_sheet_get_button (JMD_SHEET (de->var_sheet)); + GtkWidget *var_button = ssw_sheet_get_button (SSW_SHEET (de->var_sheet)); gtk_button_set_label (GTK_BUTTON (var_button), _("Variable")); gtk_notebook_append_page (GTK_NOTEBOOK (de), de->var_sheet, @@ -519,8 +519,8 @@ psppire_data_editor_new (PsppireDict *dict, void psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible) { - g_object_set (JMD_SHEET (de->var_sheet), "gridlines", grid_visible, NULL); - g_object_set (JMD_SHEET (de->data_sheet), "gridlines", grid_visible, NULL); + g_object_set (SSW_SHEET (de->var_sheet), "gridlines", grid_visible, NULL); + g_object_set (SSW_SHEET (de->data_sheet), "gridlines", grid_visible, NULL); } @@ -592,12 +592,12 @@ psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index) switch (page) { case PSPPIRE_DATA_EDITOR_DATA_VIEW: - jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1); - jmd_sheet_set_active_cell (JMD_SHEET (de->data_sheet), dict_index, -1, NULL); + ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1); + ssw_sheet_set_active_cell (SSW_SHEET (de->data_sheet), dict_index, -1, NULL); break; case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: - jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index); - jmd_sheet_set_active_cell (JMD_SHEET (de->var_sheet), -1, dict_index, NULL); + ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index); + ssw_sheet_set_active_cell (SSW_SHEET (de->var_sheet), -1, dict_index, NULL); break; } } @@ -620,10 +620,10 @@ store_set_datum (GtkTreeModel *model, gint col, gint row, void psppire_data_editor_paste (PsppireDataEditor *de) { - JmdSheet *sheet = JMD_SHEET (de->data_sheet); + SswSheet *sheet = SSW_SHEET (de->data_sheet); GtkClipboard *clip = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)), GDK_SELECTION_CLIPBOARD); - jmd_sheet_paste (sheet, clip, store_set_datum); + ssw_sheet_paste (sheet, clip, store_set_datum); } diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c index 983fa68998..ca22471c88 100644 --- a/src/ui/gui/psppire-data-sheet.c +++ b/src/ui/gui/psppire-data-sheet.c @@ -30,7 +30,7 @@ static void do_sort (PsppireDataSheet *sheet, GtkSortType order) { - JmdRange *range = JMD_SHEET(sheet)->selection; + SswRange *range = SSW_SHEET(sheet)->selection; PsppireDataStore *data_store = NULL; g_object_get (sheet, "data-model", &data_store, NULL); @@ -103,7 +103,7 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value) } static gchar * -data_store_value_to_string (JmdSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v) +data_store_value_to_string (SswSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v) { return psppire_data_store_value_to_string (store, col, row, v); } @@ -155,7 +155,7 @@ insert_new_case (PsppireDataSheet *sheet) static void delete_cases (PsppireDataSheet *sheet) { - JmdRange *range = JMD_SHEET(sheet)->selection; + SswRange *range = SSW_SHEET(sheet)->selection; PsppireDataStore *data_store = NULL; g_object_get (sheet, "data-model", &data_store, NULL); @@ -236,7 +236,7 @@ insert_new_variable (PsppireDataSheet *sheet) static void set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointer p) { - JmdRange *range = selection; + SswRange *range = selection; PsppireDataStore *data_store = NULL; g_object_get (sheet, "data-model", &data_store, NULL); @@ -262,7 +262,7 @@ set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointe static void delete_variables (PsppireDataSheet *sheet) { - JmdRange *range = JMD_SHEET(sheet)->selection; + SswRange *range = SSW_SHEET(sheet)->selection; PsppireDataStore *data_store = NULL; g_object_get (sheet, "data-model", &data_store, NULL); @@ -322,7 +322,7 @@ create_data_column_header_popup_menu (PsppireDataSheet *sheet) -G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, JMD_TYPE_SHEET) +G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET) static GObjectClass * parent_class = NULL; static gboolean dispose_has_run = FALSE; diff --git a/src/ui/gui/psppire-data-sheet.h b/src/ui/gui/psppire-data-sheet.h index 2297adbcd7..b2285aa2fc 100644 --- a/src/ui/gui/psppire-data-sheet.h +++ b/src/ui/gui/psppire-data-sheet.h @@ -19,11 +19,11 @@ #define _PSPPIRE_DATA_SHEET_H #include -#include "ui/gui/efficient-sheet/src/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/ssw-sheet.h" struct _PsppireDataSheet { - JmdSheet parent_instance; + SswSheet parent_instance; GtkWidget *data_sheet_cases_column_popup; @@ -38,12 +38,12 @@ struct _PsppireDataSheet struct _PsppireDataSheetClass { - JmdSheetClass parent_class; + SswSheetClass parent_class; }; #define PSPPIRE_TYPE_DATA_SHEET psppire_data_sheet_get_type () -G_DECLARE_FINAL_TYPE (PsppireDataSheet, psppire_data_sheet, PSPPIRE, DATA_SHEET, JmdSheet) +G_DECLARE_FINAL_TYPE (PsppireDataSheet, psppire_data_sheet, PSPPIRE, DATA_SHEET, SswSheet) GtkWidget *psppire_data_sheet_new (void); diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 7b13b8198a..6cee5a77b3 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -47,7 +47,7 @@ #include "gl/c-strcasestr.h" #include "gl/xvasprintf.h" -#include "ui/gui/efficient-sheet/src/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/ssw-sheet.h" #include "find-dialog.h" #include "options-dialog.h" @@ -1070,8 +1070,8 @@ on_cut (PsppireDataWindow *dw) g_object_get (dw->data_editor, "dictionary", &dict, NULL); gint x, y; - JmdSheet *sheet = JMD_SHEET (dw->data_editor->data_sheet); - JmdRange sel = *sheet->selection; + SswSheet *sheet = SSW_SHEET (dw->data_editor->data_sheet); + SswRange sel = *sheet->selection; GtkClipboard *clip = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), @@ -1123,7 +1123,7 @@ on_copy (PsppireDataWindow *dw) gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), GDK_SELECTION_CLIPBOARD); - jmd_sheet_set_clip (JMD_SHEET (dw->data_editor->data_sheet), clip); + ssw_sheet_set_clip (SSW_SHEET (dw->data_editor->data_sheet), clip); } } @@ -1144,7 +1144,7 @@ on_clear_cases (PsppireDataWindow *dw) int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; + SswRange *range = SSW_SHEET(de->data_sheet)->selection; psppire_data_store_delete_cases (de->data_store, range->start_y, range->end_y - range->start_y + 1); gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet)); @@ -1174,12 +1174,12 @@ insert_variable (PsppireDataWindow *dw) if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; + SswRange *range = SSW_SHEET(de->data_sheet)->selection; psppire_data_editor_insert_new_variable_at_posn (de, range->start_x); } else { - JmdRange *range = JMD_SHEET(de->var_sheet)->selection; + SswRange *range = SSW_SHEET(de->var_sheet)->selection; psppire_data_editor_insert_new_variable_at_posn (de, range->start_y); } } @@ -1188,7 +1188,7 @@ static void insert_case_at_row (PsppireDataWindow *dw) { PsppireDataEditor *de = dw->data_editor; - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; + SswRange *range = SSW_SHEET(de->data_sheet)->selection; psppire_data_editor_insert_new_case_at_posn (de, range->start_y); } diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 5368538fe3..fe064709e0 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -34,7 +34,7 @@ #include "ui/gui/psppire-marshal.h" #include "ui/gui/psppire-var-ptr.h" -#include "ui/gui/efficient-sheet/src/jmd-datum.h" +#include "ui/gui/efficient-sheet/src/ssw-datum.h" #include @@ -81,13 +81,13 @@ gni (GListModel *list) static GType git (GListModel *list) { - return JMD_TYPE_DATUM; + return SSW_TYPE_DATUM; } static gpointer gi (GListModel *list, guint id) { - JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL)); + SswDatum *gd = SSW_DATUM (g_object_new (SSW_TYPE_DATUM, NULL)); PsppireDict *dict = PSPPIRE_DICT (list); @@ -108,7 +108,7 @@ gi (GListModel *list, guint id) static void -jmd_init_iface (GListModelInterface *iface) +ssw_init_iface (GListModelInterface *iface) { iface->get_n_items = gni; iface->get_item = gi; @@ -152,7 +152,7 @@ psppire_dict_get_type (void) }; static const GInterfaceInfo list_model_info = { - (GInterfaceInitFunc) jmd_init_iface, + (GInterfaceInitFunc) ssw_init_iface, NULL, NULL }; diff --git a/src/ui/gui/psppire-var-sheet-header.c b/src/ui/gui/psppire-var-sheet-header.c index fe262600e7..e7770dedb5 100644 --- a/src/ui/gui/psppire-var-sheet-header.c +++ b/src/ui/gui/psppire-var-sheet-header.c @@ -21,8 +21,8 @@ #include "psppire-var-sheet-header.h" -#include "efficient-sheet/src/jmd-axis-model.h" -#include "efficient-sheet/src/jmd-datum.h" +#include "efficient-sheet/src/ssw-axis-model.h" +#include "efficient-sheet/src/ssw-datum.h" enum {CHANGED, n_SIGNALS}; @@ -38,13 +38,13 @@ gni (GListModel *list) static GType git (GListModel *list) { - return JMD_TYPE_DATUM; + return SSW_TYPE_DATUM; } static gpointer gi (GListModel *list, guint position) { - JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL)); + SswDatum *gd = SSW_DATUM (g_object_new (SSW_TYPE_DATUM, NULL)); switch (position) { diff --git a/src/ui/gui/psppire-variable-sheet.c b/src/ui/gui/psppire-variable-sheet.c index 7af764d7c9..2adef3f4d5 100644 --- a/src/ui/gui/psppire-variable-sheet.c +++ b/src/ui/gui/psppire-variable-sheet.c @@ -34,7 +34,7 @@ #define P_(X) (X) -G_DEFINE_TYPE (PsppireVariableSheet, psppire_variable_sheet, JMD_TYPE_SHEET) +G_DEFINE_TYPE (PsppireVariableSheet, psppire_variable_sheet, SSW_TYPE_SHEET) static void set_var_type (GtkCellRenderer *renderer, @@ -44,7 +44,7 @@ set_var_type (GtkCellRenderer *renderer, { PsppireVariableSheet *sheet = PSPPIRE_VARIABLE_SHEET (user_data); gint row = -1, col = -1; - jmd_sheet_get_active_cell (JMD_SHEET (sheet), &col, &row); + ssw_sheet_get_active_cell (SSW_SHEET (sheet), &col, &row); PsppireDict *dict = NULL; g_object_get (sheet, "data-model", &dict, NULL); @@ -69,7 +69,7 @@ set_missing_values (GtkCellRenderer *renderer, { PsppireVariableSheet *sheet = PSPPIRE_VARIABLE_SHEET (user_data); gint row = -1, col = -1; - jmd_sheet_get_active_cell (JMD_SHEET (sheet), &col, &row); + ssw_sheet_get_active_cell (SSW_SHEET (sheet), &col, &row); PsppireDict *dict = NULL; g_object_get (sheet, "data-model", &dict, NULL); @@ -96,7 +96,7 @@ set_value_labels (GtkCellRenderer *renderer, { PsppireVariableSheet *sheet = PSPPIRE_VARIABLE_SHEET (user_data); gint row = -1, col = -1; - jmd_sheet_get_active_cell (JMD_SHEET (sheet), &col, &row); + ssw_sheet_get_active_cell (SSW_SHEET (sheet), &col, &row); PsppireDict *dict = NULL; g_object_get (sheet, "data-model", &dict, NULL); @@ -213,7 +213,7 @@ select_renderer_func (PsppireVariableSheet *sheet, gint col, gint row, GType typ static void -show_variables_row_popup (JmdSheet *sheet, int row, uint button, +show_variables_row_popup (SswSheet *sheet, int row, uint button, uint state, gpointer p) { PsppireVariableSheet *var_sheet = PSPPIRE_VARIABLE_SHEET (sheet); @@ -253,9 +253,9 @@ insert_new_variable_var (PsppireVariableSheet *var_sheet) static void -delete_variables (JmdSheet *sheet) +delete_variables (SswSheet *sheet) { - JmdRange *range = sheet->selection; + SswRange *range = sheet->selection; PsppireDict *dict = NULL; g_object_get (sheet, "data-model", &dict, NULL); @@ -296,10 +296,10 @@ create_var_row_header_popup_menu (PsppireVariableSheet *var_sheet) static void -set_var_popup_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) +set_var_popup_sensitivity (SswSheet *sheet, gpointer selection, gpointer p) { PsppireVariableSheet *var_sheet = PSPPIRE_VARIABLE_SHEET (sheet); - JmdRange *range = selection; + SswRange *range = selection; gint width = gtk_tree_model_get_n_columns (sheet->data_model); gboolean whole_row_selected = (range->start_x == 0 && @@ -381,7 +381,7 @@ change_var_property (PsppireVariableSheet *var_sheet, gint col, gint row, const } static gchar * -var_sheet_data_to_string (JmdSheet *sheet, GtkTreeModel *m, +var_sheet_data_to_string (SswSheet *sheet, GtkTreeModel *m, gint col, gint row, const GValue *in) { if (col >= n_DICT_COLS - 1) /* -1 because psppire-dict has an extra column */ @@ -413,7 +413,7 @@ var_sheet_data_to_string (JmdSheet *sheet, GtkTreeModel *m, return text; } - return jmd_sheet_default_forward_conversion (sheet, m, col, row, in); + return ssw_sheet_default_forward_conversion (sheet, m, col, row, in); } diff --git a/src/ui/gui/psppire-variable-sheet.h b/src/ui/gui/psppire-variable-sheet.h index bbc32da71a..7d4a901cee 100644 --- a/src/ui/gui/psppire-variable-sheet.h +++ b/src/ui/gui/psppire-variable-sheet.h @@ -19,12 +19,12 @@ #define _PSPPIRE_VARIABLE_SHEET_H #include -#include "ui/gui/efficient-sheet/src/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/ssw-sheet.h" struct _PsppireVariableSheet { - JmdSheet parent_instance; + SswSheet parent_instance; GtkCellRenderer *value_label_renderer; GtkCellRenderer *missing_values_renderer; @@ -39,12 +39,12 @@ struct _PsppireVariableSheet struct _PsppireVariableSheetClass { - JmdSheetClass parent_class; + SswSheetClass parent_class; }; #define PSPPIRE_TYPE_VARIABLE_SHEET psppire_variable_sheet_get_type () -G_DECLARE_FINAL_TYPE (PsppireVariableSheet, psppire_variable_sheet, PSPPIRE, VARIABLE_SHEET, JmdSheet) +G_DECLARE_FINAL_TYPE (PsppireVariableSheet, psppire_variable_sheet, PSPPIRE, VARIABLE_SHEET, SswSheet) GtkWidget *psppire_variable_sheet_new (void); -- 2.30.2