From 806d578c678996f8c6e34d8d91331126eedb22ac Mon Sep 17 00:00:00 2001 From: John Darrington <john@darrington.wattle.id.au> Date: Sat, 22 Nov 2008 14:21:13 +0900 Subject: [PATCH] Remove inline qualifiers --- lib/gtksheet/gsheet-column-iface.h | 37 +++++++------- lib/gtksheet/gsheetmodel.h | 80 +++++++++++++++--------------- lib/gtksheet/gtkextra-sheet.h | 4 +- src/ui/gui/psppire-case-file.h | 2 +- src/ui/gui/psppire-data-store.h | 4 +- src/ui/gui/psppire-dict.h | 2 +- 6 files changed, 63 insertions(+), 66 deletions(-) diff --git a/lib/gtksheet/gsheet-column-iface.h b/lib/gtksheet/gsheet-column-iface.h index e43ddd8b9a..34ccbf2101 100644 --- a/lib/gtksheet/gsheet-column-iface.h +++ b/lib/gtksheet/gsheet-column-iface.h @@ -44,7 +44,7 @@ struct _GSheetColumnIface /* Signals */ void (* columns_changed) (GSheetColumn *geo, - glong col, glong n_columns); + glong col, glong n_columns); /* Virtual Table */ gint (* get_width) (const GSheetColumn *gcolumn, glong col); @@ -62,45 +62,42 @@ struct _GSheetColumnIface gchar * (*get_subtitle)(const GSheetColumn *geo, glong col); gboolean (*get_button_visibility)(const GSheetColumn *geo, - glong col); + glong col); GtkJustification * (*get_button_justification)(const GSheetColumn *geo, - glong col); + glong col); }; -inline GType g_sheet_column_get_type (void) G_GNUC_CONST; +GType g_sheet_column_get_type (void) G_GNUC_CONST; -inline gint g_sheet_column_get_width (const GSheetColumn *gcolumn, - glong col); +gint g_sheet_column_get_width (const GSheetColumn *gcolumn, + glong col); -inline void g_sheet_column_set_width (GSheetColumn *gcolumn, - glong col, gint size); +void g_sheet_column_set_width (GSheetColumn *gcolumn, + glong col, gint size); -inline gboolean g_sheet_column_get_visibility (const GSheetColumn *gcolumn, - glong col); +gboolean g_sheet_column_get_sensitivity (const GSheetColumn *gcolumn, + glong col); -inline gboolean g_sheet_column_get_sensitivity (const GSheetColumn *gcolumn, - glong col); - -inline GtkSheetButton *g_sheet_column_get_button (const GSheetColumn *gcolumn, - glong col); +GtkSheetButton *g_sheet_column_get_button (const GSheetColumn *gcolumn, + glong col); gchar *g_sheet_column_get_subtitle (const GSheetColumn *, glong); -inline GtkJustification g_sheet_column_get_justification (const GSheetColumn *gcolumn, glong col); +GtkJustification g_sheet_column_get_justification (const GSheetColumn *gcolumn, glong col); -inline glong g_sheet_column_get_column_count (const GSheetColumn *geo); +glong g_sheet_column_get_column_count (const GSheetColumn *geo); -inline gint g_sheet_column_start_pixel (const GSheetColumn *geo, glong col); +gint g_sheet_column_start_pixel (const GSheetColumn *geo, glong col); -inline void g_sheet_column_columns_changed (GSheetColumn *geo, - glong first, glong n_columns); +void g_sheet_column_columns_changed (GSheetColumn *geo, + glong first, glong n_columns); G_END_DECLS diff --git a/lib/gtksheet/gsheetmodel.h b/lib/gtksheet/gsheetmodel.h index ae5a372bb6..43583eb3f0 100644 --- a/lib/gtksheet/gsheetmodel.h +++ b/lib/gtksheet/gsheetmodel.h @@ -85,10 +85,10 @@ struct _GSheetModelIface glong row, glong n_rows); void (* columns_inserted) (GSheetModel *sheet_model, - glong column, glong n_columns); + glong column, glong n_columns); void (* columns_deleted) (GSheetModel *sheet_model, - glong column, glong n_columns); + glong column, glong n_columns); @@ -96,7 +96,7 @@ struct _GSheetModelIface /* Virtual Table */ gchar * (* get_string) (const GSheetModel *sheet_model, - glong row, glong column); + glong row, glong column); gboolean (* set_string) (GSheetModel *sheet_model, const gchar *s, glong row, glong column); @@ -108,10 +108,10 @@ struct _GSheetModelIface gboolean (* is_editable) (const GSheetModel *sheet_model, glong row, glong column); GdkColor * (* get_foreground) (const GSheetModel *sheet_model, - glong row, glong column); + glong row, glong column); GdkColor * (* get_background) (const GSheetModel *sheet_model, - glong row, glong column); + glong row, glong column); const GtkJustification * (* get_justification) (const GSheetModel *sheet_model, glong row, glong column); @@ -134,63 +134,63 @@ struct _GSheetModelIface GType g_sheet_model_get_type (void) G_GNUC_CONST; -inline gchar * g_sheet_model_get_string (const GSheetModel *sheet_model, - glong row, glong column); +gchar * g_sheet_model_get_string (const GSheetModel *sheet_model, + glong row, glong column); -inline gboolean g_sheet_model_set_string (GSheetModel *sheet_model, - const gchar *s, - glong row, glong column); +gboolean g_sheet_model_set_string (GSheetModel *sheet_model, + const gchar *s, + glong row, glong column); -inline gboolean g_sheet_model_datum_clear (GSheetModel *sheet_model, - glong row, glong column); +gboolean g_sheet_model_datum_clear (GSheetModel *sheet_model, + glong row, glong column); -inline void g_sheet_model_range_changed (GSheetModel *sheet_model, - glong row0, glong col0, - glong rowi, glong coli); +void g_sheet_model_range_changed (GSheetModel *sheet_model, + glong row0, glong col0, + glong rowi, glong coli); -inline void g_sheet_model_rows_deleted (GSheetModel *sheet_model, - glong row, glong n_rows); +void g_sheet_model_rows_deleted (GSheetModel *sheet_model, + glong row, glong n_rows); -inline void g_sheet_model_rows_inserted (GSheetModel *sheet_model, - glong row, glong n_rows); +void g_sheet_model_rows_inserted (GSheetModel *sheet_model, + glong row, glong n_rows); -inline void g_sheet_model_columns_inserted (GSheetModel *sheet_model, - glong column, glong n_columns); +void g_sheet_model_columns_inserted (GSheetModel *sheet_model, + glong column, glong n_columns); -inline void g_sheet_model_columns_deleted (GSheetModel *sheet_model, - glong column, glong n_columns); +void g_sheet_model_columns_deleted (GSheetModel *sheet_model, + glong column, glong n_columns); -inline gboolean g_sheet_model_is_editable (const GSheetModel *model, - glong row, glong column); +gboolean g_sheet_model_is_editable (const GSheetModel *model, + glong row, glong column); -inline gboolean g_sheet_model_is_visible - (const GSheetModel *model, glong row, glong column); +gboolean g_sheet_model_is_visible + (const GSheetModel *model, glong row, glong column); -inline GdkColor *g_sheet_model_get_foreground - (const GSheetModel *model, glong row, glong column); +GdkColor *g_sheet_model_get_foreground + (const GSheetModel *model, glong row, glong column); -inline GdkColor *g_sheet_model_get_background - (const GSheetModel *model, glong row, glong column); +GdkColor *g_sheet_model_get_background + (const GSheetModel *model, glong row, glong column); -inline const GtkJustification *g_sheet_model_get_justification - (const GSheetModel *model, glong row, glong column); +const GtkJustification *g_sheet_model_get_justification + (const GSheetModel *model, glong row, glong column); -inline const PangoFontDescription *g_sheet_model_get_font_desc - (const GSheetModel *model, glong row, glong column); +const PangoFontDescription *g_sheet_model_get_font_desc + (const GSheetModel *model, glong row, glong column); -inline const GtkSheetCellBorder * g_sheet_model_get_cell_border - (const GSheetModel *model, glong row, glong column); +const GtkSheetCellBorder * g_sheet_model_get_cell_border + (const GSheetModel *model, glong row, glong column); -inline gboolean g_sheet_model_free_strings (const GSheetModel *sheet_model); +gboolean g_sheet_model_free_strings (const GSheetModel *sheet_model); -inline glong g_sheet_model_get_column_count (const GSheetModel *sheet_model); +glong g_sheet_model_get_column_count (const GSheetModel *sheet_model); -inline gint g_sheet_model_get_row_count (const GSheetModel *sheet_model); +gint g_sheet_model_get_row_count (const GSheetModel *sheet_model); G_END_DECLS diff --git a/lib/gtksheet/gtkextra-sheet.h b/lib/gtksheet/gtkextra-sheet.h index ae13c6a93d..16d4907507 100644 --- a/lib/gtksheet/gtkextra-sheet.h +++ b/lib/gtksheet/gtkextra-sheet.h @@ -46,9 +46,9 @@ typedef struct _GtkSheetButton GtkSheetButton; -GtkSheetButton * gtk_sheet_button_new(void); +GtkSheetButton * gtk_sheet_button_new (void); -inline void gtk_sheet_button_free(GtkSheetButton *button); +void gtk_sheet_button_free (GtkSheetButton *button); #endif /* __GTK_EXTRA_SHEET_H__ */ diff --git a/src/ui/gui/psppire-case-file.h b/src/ui/gui/psppire-case-file.h index 13cc08d4b7..12515d2bf8 100644 --- a/src/ui/gui/psppire-case-file.h +++ b/src/ui/gui/psppire-case-file.h @@ -71,7 +71,7 @@ PsppireCaseFile *psppire_case_file_new (struct casereader *); gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, struct ccase *c, casenumber row); -inline casenumber psppire_case_file_get_case_count (const PsppireCaseFile *cf); +casenumber psppire_case_file_get_case_count (const PsppireCaseFile *cf); union value * psppire_case_file_get_value (const PsppireCaseFile *cf, diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h index 55dcf0683d..06a5e4034d 100644 --- a/src/ui/gui/psppire-data-store.h +++ b/src/ui/gui/psppire-data-store.h @@ -110,7 +110,7 @@ struct _PsppireDataStoreClass }; -inline GType psppire_data_store_get_type (void) G_GNUC_CONST; +GType psppire_data_store_get_type (void) G_GNUC_CONST; PsppireDataStore *psppire_data_store_new (PsppireDict *dict); void psppire_data_store_set_case_file (PsppireDataStore *data_store, @@ -142,7 +142,7 @@ gboolean psppire_data_store_set_string (PsppireDataStore *ds, const gchar *text, glong row, glong column); -inline casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds); +casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds); size_t psppire_data_store_get_value_count (const PsppireDataStore *ds); #ifdef __cplusplus diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h index f645b355a6..1bf8bd3523 100644 --- a/src/ui/gui/psppire-dict.h +++ b/src/ui/gui/psppire-dict.h @@ -96,7 +96,7 @@ void psppire_dict_resize_variable (PsppireDict *, gboolean psppire_dict_check_name (const PsppireDict *dict, const gchar *name, gboolean report); -inline gint psppire_dict_get_next_value_idx (const PsppireDict *dict); +gint psppire_dict_get_next_value_idx (const PsppireDict *dict); gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v, const gchar *text); -- 2.30.2