Fix pointer types as appropriate

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index e868d3cb8a687edabd74b4e88fd29854ee59bc48..76b9a7d1ce5e48d58faffc1810f78872bc763183 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -113,7 +113,7 @@ erase_selection (GtkTextBuffer *buffer)
 static void
 on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
 {
-  GladeXML *xml = data;
+  GtkBuilder *xml = data;
 
   GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
 
@@ -137,7 +137,7 @@ on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
 static void
 erase (PsppireKeypad *kp, gpointer data)
 {
-  GladeXML *xml = data;
+  GtkBuilder *xml = data;
 
   GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
 

diff --git a/src/ui/gui/compute-dialog.h b/src/ui/gui/compute-dialog.h
index 8f16b5f6c02867662a102b696fc38a20202cce99..3611865e15de360bf1fa8d5688e14bbcbf547a20 100644 (file)
--- a/src/ui/gui/compute-dialog.h
+++ b/src/ui/gui/compute-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void compute_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/crosstabs-dialog.h b/src/ui/gui/crosstabs-dialog.h
index 33349b90ba71114336748d770772260214eb40d1..11da9814cfa462a37ab2960c5c16226f99b6b3ed 100644 (file)
--- a/src/ui/gui/crosstabs-dialog.h
+++ b/src/ui/gui/crosstabs-dialog.h
@@ -19,7 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 
 void crosstabs_dialog (GObject *o, gpointer data);

diff --git a/src/ui/gui/examine-dialog.h b/src/ui/gui/examine-dialog.h
index b8e70272e4802a8f9f6844ca7d40236ce6bdc1c4..d8e3fb6c259cab1560ff88645c1609689803d61e 100644 (file)
--- a/src/ui/gui/examine-dialog.h
+++ b/src/ui/gui/examine-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void examine_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/frequencies-dialog.h b/src/ui/gui/frequencies-dialog.h
index 90990a414b29c98a51fa6d8285474553a1aec648..f4d44f35b35f2e565b49fcacd510856949d51504 100644 (file)
--- a/src/ui/gui/frequencies-dialog.h
+++ b/src/ui/gui/frequencies-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void frequencies_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/goto-case-dialog.h b/src/ui/gui/goto-case-dialog.h
index 536ccb08e8edd86d0aa3d6ca6f5fbacc3997cd42..7b3da66d59969de80f0320405cf57db29d3ba62c 100644 (file)
--- a/src/ui/gui/goto-case-dialog.h
+++ b/src/ui/gui/goto-case-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void goto_case_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/rank-dialog.h b/src/ui/gui/rank-dialog.h
index a2ddace6e50cb4c8f8a5ec1c86d46776b791f0ba..8a5064f5c7e58bbb5c7d9071a4a3cfab5be82447 100644 (file)
--- a/src/ui/gui/rank-dialog.h
+++ b/src/ui/gui/rank-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void rank_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/regression-dialog.h b/src/ui/gui/regression-dialog.h
index ca79ba350c9f34f89ac155f37b368656f1212a43..d34a61c9f059a496999d873d85d2b9ce8e057383 100644 (file)
--- a/src/ui/gui/regression-dialog.h
+++ b/src/ui/gui/regression-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void regression_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/sort-cases-dialog.h b/src/ui/gui/sort-cases-dialog.h
index badcdd60f81af57130e53701883bd99e245b6931..000d2c00810634bbecc07a921b8dbca26afe7477 100644 (file)
--- a/src/ui/gui/sort-cases-dialog.h
+++ b/src/ui/gui/sort-cases-dialog.h
@@ -19,8 +19,6 @@
 
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-
 
 void sort_cases_dialog (GObject *o, gpointer data);
 

diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c
index 57f5733c6f49c3d9dbfa4efaa44041621b645c80..00f30c627080d53f96848d96c1c7ba4aca128ea7 100644 (file)
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -108,7 +108,7 @@ static void
 on_off_toggled (GtkToggleButton *togglebutton,
                gpointer         user_data)
 {
-  GladeXML *xml = user_data;
+  GtkBuilder *xml = user_data;
   GtkWidget *dest =   get_widget_assert (xml, "split-file-grouping-vars");
   GtkWidget *selector = get_widget_assert (xml, "split-file-selector");
   GtkWidget *source = get_widget_assert (xml, "split-file-dict-treeview");