[Pspp-cvs] pspp lib/gtksheet/gsheet-column-iface.c lib/gtk...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/03/25 09:19:31

Modified files:
        lib/gtksheet   : gsheet-column-iface.c gsheet-hetero-column.c 
                         gsheet-row-iface.c gsheetmodel.c gtksheet.c 
        src/libpspp    : abt.c hash.c 
        src/ui/gui     : psppire-case-file.c psppire-data-store.c 
                         psppire-data-store.h psppire-dict.c 
                         psppire-dict.h 

Log message:
        Remove inline qualifiers to keep gcc 4.2 happy

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gsheet-column-iface.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gsheet-hetero-column.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gsheet-row-iface.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gsheetmodel.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/abt.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/hash.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.h?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.h?cvsroot=pspp&r1=1.20&r2=1.21

Patches:
Index: lib/gtksheet/gsheet-column-iface.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gsheet-column-iface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/gtksheet/gsheet-column-iface.c  8 Jul 2007 10:49:29 -0000       1.9
+++ lib/gtksheet/gsheet-column-iface.c  25 Mar 2008 09:19:28 -0000      1.10
@@ -41,7 +41,7 @@
 static void      g_sheet_column_base_init   (gpointer g_class);
 
 
-inline GType
+GType
 g_sheet_column_get_type (void)
 {
   static GType sheet_column_type = 0;
@@ -100,7 +100,7 @@
 }
 
 
-inline void
+void
 g_sheet_column_set_width (GSheetColumn *column, glong col, gint size)
 {
   g_return_if_fail (G_IS_SHEET_COLUMN (column));
@@ -110,7 +110,7 @@
 }
 
 
-inline gint
+gint
 g_sheet_column_get_width (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
@@ -122,7 +122,7 @@
 
 
 
-inline gboolean
+gboolean
 g_sheet_column_get_visibility(const GSheetColumn *column,
                                            glong col)
 {
@@ -135,7 +135,7 @@
 
 }
 
-inline gboolean
+gboolean
 g_sheet_column_get_sensitivity(const GSheetColumn *column,
                                             glong col)
 {
@@ -149,7 +149,7 @@
 }
 
 
-inline GtkSheetButton *
+GtkSheetButton *
 g_sheet_column_get_button(const GSheetColumn *column,
                              glong col)
 {
@@ -165,7 +165,7 @@
   return button;
 }
 
-inline GtkJustification
+GtkJustification
 g_sheet_column_get_justification(const GSheetColumn *column,
                                     glong col)
 {
@@ -176,7 +176,7 @@
   return (G_SHEET_COLUMN_GET_IFACE (column)->get_justification) (column, col);
 }
 
-inline gchar *
+gchar *
 g_sheet_column_get_subtitle (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), NULL);
@@ -189,7 +189,7 @@
 
 
 
-inline gint
+gint
 g_sheet_column_get_left_text_column (const GSheetColumn *column,
                                         glong col)
 {
@@ -202,7 +202,7 @@
 
 }
 
-inline gint
+gint
 g_sheet_column_get_right_text_column (const GSheetColumn *column,
                                          glong col)
 {
@@ -215,7 +215,7 @@
 
 }
 
-inline void
+void
 g_sheet_column_set_left_text_column (const GSheetColumn *column,
                                         glong col, gint i)
 {
@@ -227,7 +227,7 @@
 }
 
 
-inline void
+void
 g_sheet_column_set_right_text_column (const GSheetColumn *column,
                                          glong col, gint i)
 {
@@ -237,7 +237,7 @@
     (G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column) (column, col, 
i);
 }
 
-inline glong
+glong
 g_sheet_column_get_column_count(const GSheetColumn *geo)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
@@ -247,7 +247,7 @@
   return (G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count) (geo);
 }
 
-inline gint
+gint
 g_sheet_column_start_pixel(const GSheetColumn *geo, glong col)
 {
   gint i;
@@ -269,7 +269,7 @@
 
 
 
-inline void
+void
 g_sheet_column_columns_changed(GSheetColumn *geo,
                                 glong first, glong n_columns)
 {

Index: lib/gtksheet/gsheet-hetero-column.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gsheet-hetero-column.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/gtksheet/gsheet-hetero-column.c 8 Jul 2007 10:49:29 -0000       1.10
+++ lib/gtksheet/gsheet-hetero-column.c 25 Mar 2008 09:19:29 -0000      1.11
@@ -226,7 +226,7 @@
 
 
 
-inline void
+void
 g_sheet_hetero_column_set_width (GSheetHeteroColumn *geo, glong i, gint size)
 {
   GSheetColumn *iface = G_SHEET_COLUMN (geo);

Index: lib/gtksheet/gsheet-row-iface.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gsheet-row-iface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/gtksheet/gsheet-row-iface.c     6 Mar 2008 09:47:13 -0000       1.9
+++ lib/gtksheet/gsheet-row-iface.c     25 Mar 2008 09:19:29 -0000      1.10
@@ -171,7 +171,7 @@
   return button;
 }
 
-inline gchar *
+gchar *
 g_sheet_row_get_subtitle (const GSheetRow *row_geo, glong row)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), NULL);

Index: lib/gtksheet/gsheetmodel.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gsheetmodel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/gtksheet/gsheetmodel.c  8 Jul 2007 10:49:30 -0000       1.7
+++ lib/gtksheet/gsheetmodel.c  25 Mar 2008 09:19:29 -0000      1.8
@@ -37,7 +37,7 @@
 static void      g_sheet_model_base_init   (gpointer           g_class);
 
 
-inline GType
+GType
 g_sheet_model_get_type (void)
 {
   static GType sheet_model_type = 0;
@@ -148,7 +148,7 @@
  * Returns: True if strings obtained with get_string should be freed by the
  * sheet when no longer required.
  **/
-inline  gboolean
+gboolean
 g_sheet_model_free_strings (const GSheetModel *sheet_model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), FALSE);
@@ -166,7 +166,7 @@
  * Retrieves the datum at location ROW, COLUMN in the form of a string.
  * Returns: The string representation of the datum, or NULL on error.
  **/
-inline gchar *
+gchar *
 g_sheet_model_get_string (const GSheetModel *sheet_model,
                          glong row, glong column)
 {
@@ -335,7 +335,7 @@
  *
  * Returns: TRUE if the cell is editable, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_editable (const GSheetModel *model,
                             glong row, glong column)
 {
@@ -356,7 +356,7 @@
  *
  * Returns: TRUE if the cell is visible, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_visible (const GSheetModel *model,
                          glong row, glong column)
 {
@@ -379,7 +379,7 @@
  * Returns the foreground colour of the cell at @row, @column
  * Returns: the foreground colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_foreground (const GSheetModel *model,
                                glong row, glong column)
 {
@@ -401,7 +401,7 @@
  * Returns the background colour of the cell at @row, @column
  * Returns: the background colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_background (const GSheetModel *model,
                                glong row, glong column)
 {
@@ -423,7 +423,7 @@
  * Returns the justification of the cell at @row, @column
  * Returns: the justification, or NULL on error.
  **/
-inline const GtkJustification *
+const GtkJustification *
 g_sheet_model_get_justification (const GSheetModel *model,
                                   glong row, glong column)
 {
@@ -445,7 +445,7 @@
  * Returns the font description of the cell at @row, @column
  * Returns: the font description, or NULL on error.
  **/
-inline const PangoFontDescription *
+const PangoFontDescription *
 g_sheet_model_get_font_desc(const GSheetModel *model,
                              glong row, glong column)
 {
@@ -466,7 +466,7 @@
  * Returns the cell border of the cell at @row, @column
  * Returns: the cell border, or NULL on error.
  **/
-inline const GtkSheetCellBorder *
+const GtkSheetCellBorder *
 g_sheet_model_get_cell_border (const GSheetModel *model,
                                 glong row, glong column)
 {
@@ -486,7 +486,7 @@
  *
  * Returns the total number of columns represented by the model
  **/
-inline glong
+glong
 g_sheet_model_get_column_count (const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);
@@ -500,7 +500,7 @@
  *
  * Returns the total number of rows represented by the model
  **/
-inline gint
+gint
 g_sheet_model_get_row_count(const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);

Index: lib/gtksheet/gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- lib/gtksheet/gtksheet.c     8 Mar 2008 01:23:48 -0000       1.44
+++ lib/gtksheet/gtksheet.c     25 Mar 2008 09:19:30 -0000      1.45
@@ -7839,7 +7839,7 @@
 }
 
 
-inline void
+void
 gtk_sheet_button_free (GtkSheetButton *button)
 {
   if (!button) return ;

Index: src/libpspp/abt.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/abt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/libpspp/abt.c   7 Jul 2007 06:14:19 -0000       1.4
+++ src/libpspp/abt.c   25 Mar 2008 09:19:30 -0000      1.5
@@ -118,7 +118,7 @@
    the tree, if AFTER is true, or the last node, if AFTER is
    false. */
 static inline void
-insert_relative (struct abt *abt, struct abt_node *p, bool after,
+insert_relative (struct abt *abt, const struct abt_node *p, bool after,
                  struct abt_node *node)
 {
   node->down[0] = NULL;
@@ -145,8 +145,8 @@
           p = p->down[dir];
           dir = !after;
         }
-      p->down[dir] = node;
-      node->up = p;
+      ((struct abt_node *) p)->down[dir] = node;
+      node->up = (struct abt_node *) p;
       abt_reaugmented (abt, node);
     }
 
@@ -167,7 +167,7 @@
                   const struct abt_node *p, struct abt_node *node)
 {
   assert (abt->compare == NULL);
-  insert_relative (abt, (struct abt_node *) p, true, node);
+  insert_relative (abt, p, true, node);
 }
 
 /* Inserts NODE before node P in ABT.
@@ -180,7 +180,7 @@
                    const struct abt_node *p, struct abt_node *node)
 {
   assert (abt->compare == NULL);
-  insert_relative (abt, (struct abt_node *) p, false, node);
+  insert_relative (abt, p, false, node);
 }
 
 /* Deletes P from ABT. */

Index: src/libpspp/hash.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/hash.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/libpspp/hash.c  12 Oct 2007 04:59:29 -0000      1.13
+++ src/libpspp/hash.c  25 Mar 2008 09:19:30 -0000      1.14
@@ -449,7 +449,7 @@
    to a pointer to that entry; otherwise returns a pointer to a
    NULL entry which *must* be used to insert a new entry having
    the same key data.  */
-inline void **
+void **
 hsh_probe (struct hsh_table *h, const void *target)
 {
   unsigned i;

Index: src/ui/gui/psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/ui/gui/psppire-case-file.c      14 Mar 2008 10:42:55 -0000      1.35
+++ src/ui/gui/psppire-case-file.c      25 Mar 2008 09:19:30 -0000      1.36
@@ -278,7 +278,7 @@
 }
 
 
-inline casenumber
+casenumber
 psppire_case_file_get_case_count (const PsppireCaseFile *cf)
 {
   g_return_val_if_fail (cf, FALSE);

Index: src/ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/ui/gui/psppire-data-store.c     14 Mar 2008 10:42:55 -0000      1.58
+++ src/ui/gui/psppire-data-store.c     25 Mar 2008 09:19:31 -0000      1.59
@@ -68,7 +68,7 @@
 static guint signals [n_SIGNALS];
 
 
-inline GType
+GType
 psppire_data_store_get_type (void)
 {
   static GType data_store_type = 0;
@@ -162,7 +162,7 @@
   return psppire_dict_get_var_cnt (store->dict);
 }
 
-inline casenumber
+casenumber
 psppire_data_store_get_case_count (const PsppireDataStore *store)
 {
   return psppire_case_file_get_case_count (store->case_file);
@@ -174,7 +174,7 @@
   return psppire_dict_get_value_cnt (store->dict);
 }
 
-inline casenumber
+casenumber
 psppire_data_store_get_case_count_wrapper (const GSheetModel *model)
 {
   const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);

Index: src/ui/gui/psppire-data-store.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/ui/gui/psppire-data-store.h     3 Feb 2008 12:09:25 -0000       1.22
+++ src/ui/gui/psppire-data-store.h     25 Mar 2008 09:19:31 -0000      1.23
@@ -142,7 +142,7 @@
                                        const gchar *text,
                                        glong row, glong column);
 
-casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
+inline casenumber psppire_data_store_get_case_count (const PsppireDataStore 
*ds);
 size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
 
 #ifdef __cplusplus

Index: src/ui/gui/psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/ui/gui/psppire-dict.c   14 Mar 2008 11:10:16 -0000      1.36
+++ src/ui/gui/psppire-dict.c   25 Mar 2008 09:19:31 -0000      1.37
@@ -487,7 +487,7 @@
 }
 
 
-inline gint
+gint
 psppire_dict_get_next_value_idx (const PsppireDict *dict)
 {
   return dict_get_next_value_idx (dict->dict);

Index: src/ui/gui/psppire-dict.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/ui/gui/psppire-dict.h   19 Sep 2007 04:29:00 -0000      1.20
+++ src/ui/gui/psppire-dict.h   25 Mar 2008 09:19:31 -0000      1.21
@@ -96,7 +96,7 @@
 gboolean psppire_dict_check_name (const PsppireDict *dict,
                              const gchar *name, gboolean report);
 
-gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
+inline gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
 
 gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
                              const gchar *text);