Prefer GTK+ style casts rather than C-style casts.

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 150e92f311a2f797447048bd6f16e3b4bf579468..1928e10820106cef76636baa2f5767618cfd8e18 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -55,7 +55,7 @@ static GObjectClass * parent_class = NULL;
 static void
 psppire_data_editor_finalize (GObject *obj)
 {
-  PsppireDataEditor *de = (PsppireDataEditor *) obj;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (obj);
   if (de->font)
     pango_font_description_free (de->font);
 
@@ -66,7 +66,7 @@ psppire_data_editor_finalize (GObject *obj)
 static void
 psppire_data_editor_dispose (GObject *obj)
 {
-  PsppireDataEditor *de = (PsppireDataEditor *) obj;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (obj);
 
   if (de->dispose_has_run)
     return;

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index edf46ac1edc9f60e843c60946cf5cbc98061429a..3c51926f187b184f737b6eae27dd845f1dcd0060 100644 (file)
--- a/src/ui/gui/psppire-keypad.c
+++ b/src/ui/gui/psppire-keypad.c
@@ -34,7 +34,7 @@ static GObjectClass * parent_class = NULL;
 static void
 psppire_keypad_dispose (GObject *obj)
 {
-  PsppireKeypad *kp = (PsppireKeypad *)obj;
+  PsppireKeypad *kp = PSPPIRE_KEYPAD (obj);
 
   if (kp->dispose_has_run)
     return;

diff --git a/src/ui/gui/psppire-keypad.h b/src/ui/gui/psppire-keypad.h
index a128ddd14993c11dd8bbd4cee92365cca952920f..89ae6b7d31d776980d6c3a29f71270d044b951eb 100644 (file)
--- a/src/ui/gui/psppire-keypad.h
+++ b/src/ui/gui/psppire-keypad.h
@@ -55,8 +55,8 @@
 G_BEGIN_DECLS
 
 #define PSPPIRE_KEYPAD_TYPE            (psppire_keypad_get_type ())
-#define PSPPIRE_KEYPAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_KEYPAD_TYPE, Psppire_Keypad))
-#define PSPPIRE_KEYPAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_KEYPAD_TYPE, Psppire_KeypadClass))
+#define PSPPIRE_KEYPAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_KEYPAD_TYPE, PsppireKeypad))
+#define PSPPIRE_KEYPAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_KEYPAD_TYPE, PsppireKeypadClass))
 #define PSPPIRE_IS_KEYPAD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_KEYPAD_TYPE))
 #define PSPPIRE_IS_KEYPAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_KEYPAD_TYPE))
 

diff --git a/src/ui/gui/psppire-means-layer.c b/src/ui/gui/psppire-means-layer.c
index bc8ab840087c00979276fb30df91211a1485106e..255dc6dfe701a456d680a8ace20add12db2b019c 100644 (file)
--- a/src/ui/gui/psppire-means-layer.c
+++ b/src/ui/gui/psppire-means-layer.c
@@ -36,7 +36,7 @@ static GObjectClass *parent_class = NULL;
 static void
 psppire_means_layer_dispose (GObject *obj)
 {
-  PsppireMeansLayer *w = (PsppireMeansLayer *)obj;
+  PsppireMeansLayer *w = PSPPIRE_MEANS_LAYER (obj);
 
   if (w->dispose_has_run)
     return;

diff --git a/src/ui/gui/psppire-scanf.c b/src/ui/gui/psppire-scanf.c
index 1673eea965382d445b4dc0968bfe852a3bfca6a4..986f48c79fad2e3392279e40be8bf1e309a2ae62 100644 (file)
--- a/src/ui/gui/psppire-scanf.c
+++ b/src/ui/gui/psppire-scanf.c
@@ -238,7 +238,7 @@ static GObjectClass *parent_class = NULL;
 static void
 psppire_scanf_dispose (GObject *obj)
 {
-  PsppireScanf *w = (PsppireScanf *)obj;
+  PsppireScanf *w = PSPPIRE_SCANF (obj);
 
   if (w->dispose_has_run)
     return;

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 4da38801d87b0a480ccf169b5174f05caaad0a95..3c486848352dd12bd7ab1e0d5e3f12b3bd4c4807 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -115,7 +115,7 @@ psppire_syntax_window_finalize (GObject *object)
 static void
 psppire_syntax_window_dispose (GObject *obj)
 {
-  PsppireSyntaxWindow *sw = (PsppireSyntaxWindow *)obj;
+  PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (obj);
 
   GtkClipboard *clip_selection;
   GtkClipboard *clip_primary;