Warnings: removed fallthrough in case statements

[pspp] / src / ui / gui / psppire-dictview.c

diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c
index 37361455f81239556a90d31238604bb9f62da4ea..8f4a677b29d03b640855f51768bbcfe52e54fc83 100644 (file)
--- a/src/ui/gui/psppire-dictview.c
+++ b/src/ui/gui/psppire-dictview.c
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2017  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2017,
+   2020  Free Software Foundation
 
    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
@@ -45,14 +46,15 @@ psppire_dict_view_get_type (void)
       static const GTypeInfo psppire_dict_view_info =
       {
        sizeof (PsppireDictViewClass),
-       (GBaseInitFunc) psppire_dict_view_base_init,
-        (GBaseFinalizeFunc) psppire_dict_view_base_finalize,
-       (GClassInitFunc)psppire_dict_view_class_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_dict_view_base_init,
+        (GBaseFinalizeFunc) (void (*)(void)) psppire_dict_view_base_finalize,
+       (GClassInitFunc) (void (*)(void)) psppire_dict_view_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireDictView),
        0,
-       (GInstanceInitFunc) psppire_dict_view_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_dict_view_init,
+       NULL /* value_table */
       };
 
       psppire_dict_view_type =
@@ -113,14 +115,18 @@ unsorted (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
-
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+  gint rval = compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 static gint
@@ -129,13 +135,18 @@ sort_by_name (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+  gint rval =  g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 
@@ -145,13 +156,18 @@ sort_by_label (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+  gint rval = g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 
@@ -189,15 +205,15 @@ set_model (PsppireDictView *dict_view)
 {
   GtkTreeModel *model = NULL;
 
-  if ( dict_view->dict == NULL)
+  if (dict_view->dict == NULL)
     return;
 
   dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict));
   gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dict_view->sorted_model), default_sort, dict_view, 0);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model), 
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
 
-   if ( dict_view->predicate )
+   if (dict_view->predicate)
     {
       model = gtk_tree_model_filter_new (dict_view->sorted_model,       NULL);
 
@@ -275,6 +291,7 @@ psppire_dict_view_get_property (GObject         *object,
 
        g_value_set_enum (value, gtk_tree_selection_get_mode (selection));
       }
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -389,6 +406,8 @@ var_description_cell_data_func (GtkTreeViewColumn *col,
     {
       g_object_set (cell, "text", var_get_name (var), NULL);
     }
+
+  var_unref (var);
 }
 
 
@@ -411,6 +430,8 @@ var_icon_cell_data_func (GtkTreeViewColumn *col,
                "icon-name", get_var_measurement_stock_id (var_get_print_format (var)->type,
                                                           var_get_measure (var)),
                 NULL);
+
+  var_unref (var);
 }
 
 const char *
@@ -488,11 +509,13 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
   if (!ok)
     return FALSE;
 
-
   gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR,  &var, -1);
 
-  if ( ! var_has_label (var))
-    return FALSE;
+  if (! var_has_label (var))
+    {
+      var_unref (var);
+      return FALSE;
+    }
 
   {
     const gchar *tip ;
@@ -500,7 +523,7 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
 
     get_base_model (tree_model, NULL, &m, NULL);
 
-    if ( use_labels (PSPPIRE_DICT_VIEW (treeview)))
+    if (use_labels (PSPPIRE_DICT_VIEW (treeview)))
       tip = var_get_name (var);
     else
       tip = var_get_label (var);
@@ -508,17 +531,17 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
     gtk_tooltip_set_text (tooltip, tip);
   }
 
+  var_unref (var);
   return TRUE;
 }
 
 static gboolean
-show_menu (PsppireDictView *dv, GdkEventButton *event, gpointer data)
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
 {
-  if (event->button != 3)
+  if (((GdkEventButton *) event)->button != 3)
     return FALSE;
 
-  gtk_menu_popup (GTK_MENU (dv->menu), NULL, NULL, NULL, NULL,
-                 event->button, event->time);
+  gtk_menu_popup_at_pointer (GTK_MENU (dv->menu), event);
 
   return TRUE;
 }
@@ -534,9 +557,9 @@ toggle_label_preference (GtkCheckMenuItem *checkbox, gpointer data)
 
   if (gtk_check_menu_item_get_inconsistent (checkbox))
     gtk_check_menu_item_set_active (checkbox, !global_setting);
-  
+
   gtk_check_menu_item_set_inconsistent (checkbox, FALSE);
-  
+
   gtk_widget_queue_draw (GTK_WIDGET (dv));
 }
 
@@ -642,7 +665,7 @@ psppire_dict_view_init (PsppireDictView *dict_view)
     dict_view->override_button = item;
     gtk_check_menu_item_set_inconsistent (GTK_CHECK_MENU_ITEM (item),
                                          TRUE);
-    
+
     g_signal_connect (item, "toggled",
                      G_CALLBACK (toggle_label_preference), dict_view);
 
@@ -758,5 +781,3 @@ psppire_dict_view_get_selected_variable (PsppireDictView *dict_view)
   else
     return NULL;
 }
-
-