From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 13 Sep 2017 08:22:51 +0000 (+0200)
Subject: Fix some compiler warnings
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=bf62643ef9f4f991acd777b26aa747adc7886d8f

Fix some compiler warnings
---

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 1b5e39a45d..713c1e354a 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))
       {
-	ssw_sheet_scroll_to (ds, -1, case_num);
-	ssw_sheet_set_active_cell (ds, -1, case_num, 0);
+	ssw_sheet_scroll_to (SSW_SHEET (ds), -1, case_num);
+	ssw_sheet_set_active_cell (SSW_SHEET (ds), -1, case_num, 0);
       }
     }
 }
diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index b9c6fb6214..8ceda9c5e5 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -31,6 +31,7 @@
 #include "ui/gui/val-labs-dialog.h"
 #include "ui/gui/missing-val-dialog.h"
 #include "ui/gui/var-type-dialog.h"
+#include "ui/gui/value-variant.h"
 #include "ui/gui/psppire-dict.h"
 #include "ui/gui/psppire-data-store.h"
 #include "ui/gui/psppire-data-window.h"
@@ -380,7 +381,7 @@ on_datum_entry_activate (GtkEntry *entry, PsppireDataEditor *de)
       value_destroy (&val, width);
 
       gtk_widget_grab_focus (de->data_sheet);
-      ssw_sheet_set_active_cell (de->data_sheet, col, row, NULL);
+      ssw_sheet_set_active_cell (SSW_SHEET (de->data_sheet), col, row, NULL);
     }
 }
 
diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 59268d21f4..86122d35f8 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -360,7 +360,7 @@ psppire_data_sheet_new (void)
 static gboolean
 indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 {
-  guint row = g_object_get_data (widget, "row");
+  guint row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
 
   if (!psppire_data_store_filtered (store, row))
     return FALSE;
@@ -380,8 +380,8 @@ button_post_create (GtkWidget *button, uint i, gpointer user_data)
 {
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
 
-  g_object_set_data (button, "row", GUINT_TO_POINTER (i));
-  g_signal_connect_after (button, "draw", indicate_filtered_case, data_store);
+  g_object_set_data (G_OBJECT (button), "row", GUINT_TO_POINTER (i));
+  g_signal_connect_after (button, "draw", G_CALLBACK (indicate_filtered_case), data_store);
 }
 
 static void
diff --git a/src/ui/gui/psppire-text-file.c b/src/ui/gui/psppire-text-file.c
index 590455d90e..c105db7864 100644
--- a/src/ui/gui/psppire-text-file.c
+++ b/src/ui/gui/psppire-text-file.c
@@ -304,7 +304,6 @@ __tree_model_get_flags (GtkTreeModel *model)
 static gint
 __tree_model_get_n_columns (GtkTreeModel *tree_model)
 {
-  PsppireTextFile *tf  = PSPPIRE_TEXT_FILE (tree_model);
   return 2;
 }
 
diff --git a/src/ui/gui/psppire-value-entry.c b/src/ui/gui/psppire-value-entry.c
index 30b18219d7..650fed8c14 100644
--- a/src/ui/gui/psppire-value-entry.c
+++ b/src/ui/gui/psppire-value-entry.c
@@ -146,7 +146,6 @@ psppire_value_entry_text_changed (GtkEntryBuffer *buffer,
 static void
 on_entry_activate (GtkWidget *w)
 {
-  PsppireValueEntry *ve = PSPPIRE_VALUE_ENTRY (w);
   g_signal_emit (w, signals [EDIT_DONE], 0);
 }