Warnings: missing initializer for value_tables and function type cast (GObject)

I fixed the warnings:
warning: missing initializer for field ‘value_table’ of ‘GTypeInfo’
warning: cast between incompatible function types
by replacing the handwritten type info code with G_DEFINE_TYPE...
macros (preferred). When this was not possible due to usage of
base init functions I added casts and the initializer.

diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index bcd6e78cf633902805289b35852090327dd38725..abb90123ef95b4b51e5d47f4967dffa8aedb947f 100644 (file)
--- a/src/ui/gui/psppire-buttonbox.c
+++ b/src/ui/gui/psppire-buttonbox.c
@@ -31,37 +31,7 @@
 
 GType psppire_button_flags_get_type (void);
 
-
-static void psppire_button_box_class_init          (PsppireButtonBoxClass *);
-static void psppire_button_box_init                (PsppireButtonBox      *);
-
-
-GType
-psppire_button_box_get_type (void)
-{
-  static GType button_box_type = 0;
-
-  if (!button_box_type)
-    {
-      static const GTypeInfo button_box_info =
-      {
-       sizeof (PsppireButtonBoxClass),
-       NULL, /* base_init */
-        NULL, /* base_finalize */
-       (GClassInitFunc) psppire_button_box_class_init,
-        NULL, /* class_finalize */
-       NULL, /* class_data */
-        sizeof (PsppireButtonBox),
-       0,
-       (GInstanceInitFunc) psppire_button_box_init,
-      };
-
-      button_box_type = g_type_register_static (GTK_TYPE_BUTTON_BOX,
-                                           "PsppireButtonBox", &button_box_info, 0);
-    }
-
-  return button_box_type;
-}
+G_DEFINE_TYPE (PsppireButtonBox, psppire_button_box, GTK_TYPE_BUTTON_BOX)
 
 enum {
   PROP_BUTTONS = 1,

diff --git a/src/ui/gui/psppire-checkbox-treeview.c b/src/ui/gui/psppire-checkbox-treeview.c
index 3e144d5becdeedca275e1e5637aa7681b7ff9f08..5c543f22bbb5f755942b96b5ffa615e725e83e3a 100644 (file)
--- a/src/ui/gui/psppire-checkbox-treeview.c
+++ b/src/ui/gui/psppire-checkbox-treeview.c
@@ -32,37 +32,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_checkbox_treeview_init          (PsppireCheckboxTreeview      *cbtv);
-
-GType
-psppire_checkbox_treeview_get_type (void)
-{
-  static GType psppire_checkbox_treeview_type = 0;
-
-  if (!psppire_checkbox_treeview_type)
-    {
-      static const GTypeInfo psppire_checkbox_treeview_info =
-      {
-       sizeof (PsppireCheckboxTreeviewClass),
-       (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc) NULL,
-       (GClassFinalizeFunc) NULL,
-       NULL,
-        sizeof (PsppireCheckboxTreeview),
-       0,
-       (GInstanceInitFunc) psppire_checkbox_treeview_init,
-      };
-
-      psppire_checkbox_treeview_type =
-       g_type_register_static (GTK_TYPE_TREE_VIEW, "PsppireCheckboxTreeview",
-                               &psppire_checkbox_treeview_info, 0);
-    }
-
-  return psppire_checkbox_treeview_type;
-}
-
-
+G_DEFINE_TYPE (PsppireCheckboxTreeview, psppire_checkbox_treeview, GTK_TYPE_TREE_VIEW)
 
 /* Callback for checkbox cells in the statistics tree view.
    Toggles the checkbox. */
@@ -155,3 +125,8 @@ psppire_checkbox_treeview_populate (PsppireCheckboxTreeview *cbtv,
 
   gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (cbtv), CHECKBOX_COLUMN_TOOLTIP);
 }
+
+static void
+psppire_checkbox_treeview_class_init (PsppireCheckboxTreeviewClass *class)
+{
+}

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index eb65b63ad9ac2d19e59ad422f800932268f88cfe..1f5914ed722751eb8c6d1830be960b4540ef11c4 100644 (file)
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -28,44 +28,13 @@
 
 #include "psppire-conf.h"
 
-static void psppire_conf_init            (PsppireConf      *conf);
-static void psppire_conf_class_init      (PsppireConfClass *class);
+G_DEFINE_TYPE (PsppireConf, psppire_conf, G_TYPE_OBJECT)
 
 static void psppire_conf_finalize        (GObject   *object);
 static void psppire_conf_dispose        (GObject   *object);
 
 static GObjectClass *parent_class = NULL;
 
-
-GType
-psppire_conf_get_type (void)
-{
-  static GType conf_type = 0;
-
-  if (!conf_type)
-    {
-      static const GTypeInfo conf_info =
-      {
-       sizeof (PsppireConfClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) psppire_conf_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (PsppireConf),
-       0,
-        (GInstanceInitFunc) psppire_conf_init,
-      };
-
-      conf_type = g_type_register_static (G_TYPE_OBJECT,
-                                               "PsppireConf",
-                                               &conf_info, 0);
-    }
-
-  return conf_type;
-}
-
-
 static void
 conf_read (PsppireConf *conf)
 {

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index d1b185c681e91f57062a3b5d546439c540d33f3e..150e92f311a2f797447048bd6f16e3b4bf579468 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -46,37 +46,9 @@
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 
-static void psppire_data_editor_class_init          (PsppireDataEditorClass *klass);
-static void psppire_data_editor_init                (PsppireDataEditor      *de);
-
 static void refresh_entry (PsppireDataEditor *);
 
-GType
-psppire_data_editor_get_type (void)
-{
-  static GType de_type = 0;
-
-  if (!de_type)
-    {
-      static const GTypeInfo de_info =
-      {
-       sizeof (PsppireDataEditorClass),
-       NULL, /* base_init */
-        NULL, /* base_finalize */
-       (GClassInitFunc) psppire_data_editor_class_init,
-        NULL, /* class_finalize */
-       NULL, /* class_data */
-        sizeof (PsppireDataEditor),
-       0,
-       (GInstanceInitFunc) psppire_data_editor_init,
-      };
-
-      de_type = g_type_register_static (GTK_TYPE_NOTEBOOK, "PsppireDataEditor",
-                                       &de_info, 0);
-    }
-
-  return de_type;
-}
+G_DEFINE_TYPE (PsppireDataEditor, psppire_data_editor, GTK_TYPE_NOTEBOOK)
 
 static GObjectClass * parent_class = NULL;
 

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index c0fc42a2f285a87ff32a5da5a9e3d1595990a621..0310601501c903de5d1f09bd3fa6ee6a8d559df0 100644 (file)
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -46,9 +46,6 @@
 
 #include "value-variant.h"
 
-static void psppire_data_store_init            (PsppireDataStore      *data_store);
-static void psppire_data_store_class_init      (PsppireDataStoreClass *class);
-
 static void psppire_data_store_finalize        (GObject           *object);
 static void psppire_data_store_dispose        (GObject           *object);
 
@@ -283,44 +280,9 @@ __tree_model_init (GtkTreeModelIface *iface)
   iface->iter_parent     = NULL;
 }
 
-
-GType
-psppire_data_store_get_type (void)
-{
-  static GType data_store_type = 0;
-
-  if (!data_store_type)
-    {
-      static const GTypeInfo data_store_info =
-      {
-       sizeof (PsppireDataStoreClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) psppire_data_store_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (PsppireDataStore),
-       0,
-        (GInstanceInitFunc) psppire_data_store_init,
-      };
-
-      static const GInterfaceInfo tree_model_info = {
-       (GInterfaceInitFunc) __tree_model_init,
-       NULL,
-       NULL
-      };
-
-      data_store_type = g_type_register_static (G_TYPE_OBJECT,
-                                               "PsppireDataStore",
-                                               &data_store_info, 0);
-
-      g_type_add_interface_static (data_store_type, GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
-    }
-
-  return data_store_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireDataStore, psppire_data_store, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               __tree_model_init))
 
 static void
 psppire_data_store_class_init (PsppireDataStoreClass *class)

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index c43c65d120ee7307fd68fba953b4f8fe83385d03..9202aa4344c46e9bf64e8e262ef1544f3504ddd9 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -101,10 +101,6 @@
 struct session *the_session;
 struct ll_list all_data_windows = LL_INITIALIZER (all_data_windows);
 
-static void psppire_data_window_class_init    (PsppireDataWindowClass *class);
-static void psppire_data_window_init          (PsppireDataWindow      *data_editor);
-
-
 static void psppire_data_window_iface_init (PsppireWindowIface *iface);
 
 static void psppire_data_window_dispose (GObject *object);
@@ -118,45 +114,10 @@ static void psppire_data_window_get_property (GObject         *object,
                                               GValue          *value,
                                               GParamSpec      *pspec);
 
-GType
-psppire_data_window_get_type (void)
-{
-  static GType psppire_data_window_type = 0;
-
-  if (!psppire_data_window_type)
-    {
-      static const GTypeInfo psppire_data_window_info =
-       {
-         sizeof (PsppireDataWindowClass),
-         NULL,
-         NULL,
-         (GClassInitFunc)psppire_data_window_class_init,
-         (GClassFinalizeFunc) NULL,
-         NULL,
-         sizeof (PsppireDataWindow),
-         0,
-         (GInstanceInitFunc) psppire_data_window_init,
-       };
-
-      static const GInterfaceInfo window_interface_info =
-       {
-         (GInterfaceInitFunc) psppire_data_window_iface_init,
-         NULL,
-         NULL
-       };
-
-      psppire_data_window_type =
-       g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireDataWindow",
-                               &psppire_data_window_info, 0);
-
 
-      g_type_add_interface_static (psppire_data_window_type,
-                                  PSPPIRE_TYPE_WINDOW_MODEL,
-                                  &window_interface_info);
-    }
-
-  return psppire_data_window_type;
-}
+G_DEFINE_TYPE_WITH_CODE (PsppireDataWindow, psppire_data_window, PSPPIRE_TYPE_WINDOW,
+                        G_IMPLEMENT_INTERFACE (PSPPIRE_TYPE_WINDOW_MODEL,
+                                               psppire_data_window_iface_init))
 
 static GObjectClass *parent_class ;
 

diff --git a/src/ui/gui/psppire-delimited-text.c b/src/ui/gui/psppire-delimited-text.c
index dd3715f6b97bb68a36bfefb855d980788daf9ed2..51f238405f95c8f3a8e2394424a23983c9a1bb93 100644 (file)
--- a/src/ui/gui/psppire-delimited-text.c
+++ b/src/ui/gui/psppire-delimited-text.c
@@ -169,10 +169,6 @@ psppire_delimited_text_get_property (GObject         *object,
     };
 }
 
-
-static void psppire_delimited_text_init            (PsppireDelimitedText      *text_file);
-static void psppire_delimited_text_class_init      (PsppireDelimitedTextClass *class);
-
 static void psppire_delimited_text_finalize        (GObject           *object);
 static void psppire_delimited_text_dispose        (GObject           *object);
 
@@ -486,44 +482,9 @@ __tree_model_init (GtkTreeModelIface *iface)
   iface->iter_parent     = __iter_parent;
 }
 
-
-GType
-psppire_delimited_text_get_type (void)
-{
-  static GType text_file_type = 0;
-
-  if (!text_file_type)
-    {
-      static const GTypeInfo text_file_info =
-       {
-         sizeof (PsppireDelimitedTextClass),
-         NULL,         /* base_init */
-         NULL,         /* base_finalize */
-         (GClassInitFunc) psppire_delimited_text_class_init,
-         NULL,         /* class_finalize */
-         NULL,         /* class_data */
-         sizeof (PsppireDelimitedText),
-         0,
-         (GInstanceInitFunc) psppire_delimited_text_init,
-       };
-
-      static const GInterfaceInfo tree_model_info = {
-       (GInterfaceInitFunc) __tree_model_init,
-       NULL,
-       NULL
-      };
-
-      text_file_type = g_type_register_static (G_TYPE_OBJECT,
-                                              "PsppireDelimitedText",
-                                              &text_file_info, 0);
-
-      g_type_add_interface_static (text_file_type, GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
-    }
-
-  return text_file_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireDelimitedText, psppire_delimited_text, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               __tree_model_init))
 
 static void
 psppire_delimited_text_class_init (PsppireDelimitedTextClass *class)

diff --git a/src/ui/gui/psppire-dialog-action.c b/src/ui/gui/psppire-dialog-action.c
index c65162379c4c9b2b2c04a4706210c45db04363b5..b44244132fa2b93fbe02bb3cebc3753729dbf459 100644 (file)
--- a/src/ui/gui/psppire-dialog-action.c
+++ b/src/ui/gui/psppire-dialog-action.c
@@ -24,12 +24,8 @@
 #include "psppire-data-window.h"
 #include "builder-wrapper.h"
 
-static void psppire_dialog_action_init            (PsppireDialogAction      *act);
-static void psppire_dialog_action_class_init      (PsppireDialogActionClass *class);
-
 static GObjectClass * parent_class = NULL;
 
-
 static const gchar *
 __get_name (GAction *act)
 {
@@ -89,44 +85,11 @@ action_model_init (GActionInterface *iface)
   iface->activate = __activate;
 }
 
-
-GType
-psppire_dialog_action_get_type (void)
-{
-  static GType de_type = 0;
-
-  if (!de_type)
-    {
-      static const GTypeInfo de_info =
-      {
-       sizeof (PsppireDialogActionClass),
-       NULL, /* base_init */
-        NULL, /* base_finalize */
-       (GClassInitFunc) psppire_dialog_action_class_init,
-        NULL, /* class_finalize */
-       NULL, /* class_data */
-        sizeof (PsppireDialogAction),
-       0,
-       (GInstanceInitFunc) psppire_dialog_action_init,
-      };
-
-
-      static const GInterfaceInfo ga_info = {
-       (GInterfaceInitFunc) action_model_init,
-       NULL,
-       NULL
-      };
-
-
-      de_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDialogAction",
-                                       &de_info, G_TYPE_FLAG_ABSTRACT);
-
-      g_type_add_interface_static (de_type, G_TYPE_ACTION, &ga_info);
-    }
-
-  return de_type;
-}
-
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (PsppireDialogAction, \
+                                 psppire_dialog_action, \
+                                 G_TYPE_OBJECT, \
+                                 G_IMPLEMENT_INTERFACE (G_TYPE_ACTION, \
+                                                        action_model_init))
 
 /* Properties */
 enum

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index 4d85a4ece3c3955a332ca6eb13c4d222ef43b814..4f3bb243132dbe8c85dd69c471ecc2dfebcab696 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -70,14 +70,15 @@ psppire_dialog_get_type (void)
       static const GTypeInfo dialog_info =
       {
        sizeof (PsppireDialogClass),
-       (GBaseInitFunc) psppire_dialog_base_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_dialog_base_init,
         NULL, /* base_finalize */
-       (GClassInitFunc) psppire_dialog_class_init,
+       (GClassInitFunc) (void (*)(void)) psppire_dialog_class_init,
         NULL, /* class_finalize */
        NULL, /* class_data */
         sizeof (PsppireDialog),
        0,
-       (GInstanceInitFunc) psppire_dialog_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_dialog_init,
+       NULL /* value_table */
       };
 
       dialog_type = g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE,

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index e381e5dab7a40050df1a47f89e33564ded7341f6..acf73af7a75370a4dbb7f0dcd99364b33a04adb2 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -63,8 +63,6 @@ enum  {
 
 
 /* --- prototypes --- */
-static void psppire_dict_class_init    (PsppireDictClass       *class);
-static void psppire_dict_init  (PsppireDict            *dict);
 static void psppire_dict_dispose       (GObject                *object);
 
 static void dictionary_tree_model_init (GtkTreeModelIface *iface);
@@ -141,55 +139,12 @@ static GObjectClass     *parent_class = NULL;
 static guint signals [n_SIGNALS];
 
 /* --- functions --- */
-/**
- * psppire_dict_get_type:
- * @returns: the type ID for accelerator groups.
- */
-GType
-psppire_dict_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info = {
-       sizeof (PsppireDictClass),
-       (GBaseInitFunc) NULL,
-       (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc) psppire_dict_class_init,
-       NULL,   /* class_finalize */
-       NULL,   /* class_data */
-       sizeof (PsppireDict),
-       0,      /* n_preallocs */
-       (GInstanceInitFunc) psppire_dict_init,
-      };
-
-      static const GInterfaceInfo tree_model_info = {
-       (GInterfaceInitFunc) dictionary_tree_model_init,
-       NULL,
-       NULL
-      };
-
-      static const GInterfaceInfo list_model_info = {
-       (GInterfaceInitFunc) ssw_init_iface,
-       NULL,
-       NULL
-      };
-
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                           "PsppireDict",
-                                           &object_info, 0);
-
-      g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
-
-      g_type_add_interface_static (object_type, G_TYPE_LIST_MODEL,
-                                  &list_model_info);
-    }
-
-  return object_type;
-}
 
+G_DEFINE_TYPE_WITH_CODE (PsppireDict, psppire_dict, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               dictionary_tree_model_init)
+                        G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                               ssw_init_iface))
 
 static void
 psppire_dict_class_init (PsppireDictClass *class)

diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c
index 40a131b72bd5345ac1580498c30610a32d820288..d51a22381b26efe01970dd9368eb8d0cb4303f97 100644 (file)
--- a/src/ui/gui/psppire-dictview.c
+++ b/src/ui/gui/psppire-dictview.c
@@ -46,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 =

diff --git a/src/ui/gui/psppire-keypad.c b/src/ui/gui/psppire-keypad.c
index 417d6a99c341da49e2560d9428f69cc634a78108..edf46ac1edc9f60e843c60946cf5cbc98061429a 100644 (file)
--- a/src/ui/gui/psppire-keypad.c
+++ b/src/ui/gui/psppire-keypad.c
@@ -25,37 +25,9 @@ enum {
   n_SIGNALS
 };
 
-static void psppire_keypad_class_init          (PsppireKeypadClass *klass);
-static void psppire_keypad_init                (PsppireKeypad      *kp);
-
 static guint keypad_signals [n_SIGNALS] = { 0 };
 
-GType
-psppire_keypad_get_type (void)
-{
-  static GType kp_type = 0;
-
-  if (!kp_type)
-    {
-      static const GTypeInfo kp_info =
-      {
-       sizeof (PsppireKeypadClass),
-       NULL, /* base_init */
-        NULL, /* base_finalize */
-       (GClassInitFunc) psppire_keypad_class_init,
-        NULL, /* class_finalize */
-       NULL, /* class_data */
-        sizeof (PsppireKeypad),
-       0,
-       (GInstanceInitFunc) psppire_keypad_init,
-      };
-
-      kp_type = g_type_register_static (GTK_TYPE_EVENT_BOX, "PsppireKeypad",
-                                       &kp_info, 0);
-    }
-
-  return kp_type;
-}
+G_DEFINE_TYPE (PsppireKeypad, psppire_keypad, GTK_TYPE_EVENT_BOX)
 
 static GObjectClass * parent_class = NULL;
 

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 680618de92bfdfe17eb4f59ea07e2cd285ab24b6..458769d583c040fd745f9ef346e0fda36c753f23 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -48,36 +48,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_output_window_class_init    (PsppireOutputWindowClass *class);
-static void psppire_output_window_init          (PsppireOutputWindow      *window);
-
-GType
-psppire_output_window_get_type (void)
-{
-  static GType psppire_output_window_type = 0;
-
-  if (!psppire_output_window_type)
-    {
-      static const GTypeInfo psppire_output_window_info =
-      {
-       sizeof (PsppireOutputWindowClass),
-       (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc)psppire_output_window_class_init,
-       (GClassFinalizeFunc) NULL,
-       NULL,
-        sizeof (PsppireOutputWindow),
-       0,
-       (GInstanceInitFunc) psppire_output_window_init,
-      };
-
-      psppire_output_window_type =
-       g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow",
-                               &psppire_output_window_info, 0);
-    }
-
-  return psppire_output_window_type;
-}
+G_DEFINE_TYPE (PsppireOutputWindow, psppire_output_window, PSPPIRE_TYPE_WINDOW)
 
 static GObjectClass *parent_class;
 

diff --git a/src/ui/gui/psppire-select-dest.c b/src/ui/gui/psppire-select-dest.c
index b9d0eba6f1549dca17d5a1d593288a7fa43108cc..c585851f9a8e082fcd410ac7262e1962494787a9 100644 (file)
--- a/src/ui/gui/psppire-select-dest.c
+++ b/src/ui/gui/psppire-select-dest.c
@@ -36,7 +36,8 @@ psppire_select_dest_widget_get_type (void)
        NULL,           /* class_data */
        0,
        0,              /* n_preallocs */
-       NULL
+       NULL,
+       NULL            /* value_table */
       };
 
       dest_widget_type =

diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c
index fbc88f1aa8f41fc21f064c809da5d0ffe20d4ecc..cada9ef683305e4f2bf69b778869bef8a38edb2c 100644 (file)
--- a/src/ui/gui/psppire-selector.c
+++ b/src/ui/gui/psppire-selector.c
@@ -67,9 +67,7 @@
 
 #include "psppire-selector.h"
 
-static void psppire_selector_class_init    (PsppireSelectorClass *class);
-static void psppire_selector_init          (PsppireSelector      *selector);
-
+G_DEFINE_TYPE (PsppireSelector, psppire_selector, GTK_TYPE_BUTTON)
 
 static void set_direction (PsppireSelector *, enum psppire_selector_dir);
 
@@ -100,39 +98,8 @@ on_row_inserted (PsppireSelector *selector)
   g_signal_emit (selector, signals [DE_SELECTED], 0);
 }
 
-
-GType
-psppire_selector_get_type (void)
-{
-  static GType psppire_selector_type = 0;
-
-  if (!psppire_selector_type)
-    {
-      static const GTypeInfo psppire_selector_info =
-      {
-       sizeof (PsppireSelectorClass),
-       (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc)psppire_selector_class_init,
-       (GClassFinalizeFunc) NULL,
-       NULL,
-        sizeof (PsppireSelector),
-       0,
-       (GInstanceInitFunc) psppire_selector_init,
-      };
-
-      psppire_selector_type =
-       g_type_register_static (GTK_TYPE_BUTTON, "PsppireSelector",
-                               &psppire_selector_info, 0);
-    }
-
-  return psppire_selector_type;
-}
-
 static GObjectClass * parent_class = NULL;
 
-
-
 static void
 dump_hash_entry (gpointer key, gpointer value, gpointer obj)
 {

diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 83a82d44fdd772cdf40ab3112288b8a6ae247263..0bf362ae7bd23c565b5964d84190b3b4a381ce6b 100644 (file)
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -33,57 +33,18 @@
 #include "psppire-spreadsheet-model.h"
 #include "data/spreadsheet-reader.h"
 
-
-static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
-                                            spreadsheetModel);
-static void psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass
-                                                  * class);
-
 static void psppire_spreadsheet_model_finalize (GObject * object);
 static void psppire_spreadsheet_model_dispose (GObject * object);
 
 static GObjectClass *parent_class = NULL;
 
-
 static void spreadsheet_tree_model_init (GtkTreeModelIface * iface);
 
-
-GType
-psppire_spreadsheet_model_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo spreadsheet_model_info = {
-        sizeof (PsppireSpreadsheetModelClass),
-        NULL,                   /* base_init */
-        NULL,                   /* base_finalize */
-        (GClassInitFunc) psppire_spreadsheet_model_class_init,
-        NULL,                   /* class_finalize */
-        NULL,                   /* class_data */
-        sizeof (PsppireSpreadsheetModel),
-        0,
-        (GInstanceInitFunc) psppire_spreadsheet_model_init,
-      };
-
-      static const GInterfaceInfo tree_model_info = {
-        (GInterfaceInitFunc) spreadsheet_tree_model_init,
-        NULL,
-        NULL
-      };
-
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "PsppireSpreadsheetModel",
-                                            &spreadsheet_model_info, 0);
-
-      g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL,
-                                   &tree_model_info);
-    }
-
-  return object_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireSpreadsheetModel,\
+                        psppire_spreadsheet_model,\
+                        G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               spreadsheet_tree_model_init))
 
 /* Properties */
 enum
@@ -146,6 +107,7 @@ psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class)
                                                        | G_PARAM_WRITABLE);
 
   parent_class = g_type_class_peek_parent (class);
+
   object_class = (GObjectClass *) class;
 
   object_class->set_property = psppire_spreadsheet_model_set_property;

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 261254cf644a69216ffde308b509daea029d2baa..f76b86dbfe264a45ad99d8a025964769ba15479e 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -111,19 +111,20 @@ psppire_syntax_window_get_type (void)
       static const GTypeInfo psppire_syntax_window_info =
       {
        sizeof (PsppireSyntaxWindowClass),
-       (GBaseInitFunc) psppire_syntax_window_base_init,
-        (GBaseFinalizeFunc) psppire_syntax_window_base_finalize,
-       (GClassInitFunc)psppire_syntax_window_class_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_syntax_window_base_init,
+        (GBaseFinalizeFunc) (void (*)(void)) psppire_syntax_window_base_finalize,
+       (GClassInitFunc) (void (*)(void)) psppire_syntax_window_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireSyntaxWindow),
        0,
-       (GInstanceInitFunc) psppire_syntax_window_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_syntax_window_init,
+       NULL /* value_table */
       };
 
       static const GInterfaceInfo window_interface_info =
        {
-         (GInterfaceInitFunc) psppire_syntax_window_iface_init,
+         (GInterfaceInitFunc) (void (*)(void)) psppire_syntax_window_iface_init,
          NULL,
          NULL
        };

diff --git a/src/ui/gui/psppire-text-file.c b/src/ui/gui/psppire-text-file.c
index e9aa8a3b1603bf4f252ca6e4932f6cf3a23fef41..e978fcb626279f37e1dac5d4e12323071a91b9a7 100644 (file)
--- a/src/ui/gui/psppire-text-file.c
+++ b/src/ui/gui/psppire-text-file.c
@@ -184,10 +184,6 @@ psppire_text_file_get_property (GObject         *object,
     };
 }
 
-
-static void psppire_text_file_init            (PsppireTextFile      *text_file);
-static void psppire_text_file_class_init      (PsppireTextFileClass *class);
-
 static void psppire_text_file_finalize        (GObject           *object);
 static void psppire_text_file_dispose        (GObject           *object);
 
@@ -386,44 +382,9 @@ __tree_model_init (GtkTreeModelIface *iface)
   iface->iter_parent     = __iter_parent;
 }
 
-
-GType
-psppire_text_file_get_type (void)
-{
-  static GType text_file_type = 0;
-
-  if (!text_file_type)
-    {
-      static const GTypeInfo text_file_info =
-       {
-         sizeof (PsppireTextFileClass),
-         NULL,         /* base_init */
-         NULL,         /* base_finalize */
-         (GClassInitFunc) psppire_text_file_class_init,
-         NULL,         /* class_finalize */
-         NULL,         /* class_data */
-         sizeof (PsppireTextFile),
-         0,
-         (GInstanceInitFunc) psppire_text_file_init,
-       };
-
-      static const GInterfaceInfo tree_model_info = {
-       (GInterfaceInitFunc) __tree_model_init,
-       NULL,
-       NULL
-      };
-
-      text_file_type = g_type_register_static (G_TYPE_OBJECT,
-                                              "PsppireTextFile",
-                                              &text_file_info, 0);
-
-      g_type_add_interface_static (text_file_type, GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
-    }
-
-  return text_file_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireTextFile, psppire_text_file, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               __tree_model_init))
 
 static void
 psppire_text_file_class_init (PsppireTextFileClass *class)

diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c
index 09c0ec35d044e3a3dbd56b46b43931ada560707d..6a9b876a4356a4a09abc27af44db2ec84a1d6c76 100644 (file)
--- a/src/ui/gui/psppire-val-chooser.c
+++ b/src/ui/gui/psppire-val-chooser.c
@@ -37,8 +37,6 @@ static void psppire_val_chooser_init          (PsppireValChooser      *vc);
 
 static void psppire_val_chooser_realize       (GtkWidget *w);
 
-
-
 GType
 psppire_val_chooser_get_type (void)
 {
@@ -49,14 +47,15 @@ psppire_val_chooser_get_type (void)
       static const GTypeInfo psppire_val_chooser_info =
       {
        sizeof (PsppireValChooserClass),
-       (GBaseInitFunc) psppire_val_chooser_base_init,
-        (GBaseFinalizeFunc) psppire_val_chooser_base_finalize,
-       (GClassInitFunc)psppire_val_chooser_class_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_val_chooser_base_init,
+        (GBaseFinalizeFunc)  (void (*)(void)) psppire_val_chooser_base_finalize,
+       (GClassInitFunc)  (void (*)(void)) psppire_val_chooser_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireValChooser),
        0,
-       (GInstanceInitFunc) psppire_val_chooser_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_val_chooser_init,
+       NULL /* value_table */
       };
 
       psppire_val_chooser_type =

diff --git a/src/ui/gui/psppire-var-view.c b/src/ui/gui/psppire-var-view.c
index 360bfe0febf618f686b7a959f2f81faca821a3f8..ee245e72fb9a665d3550133776efda599c9d2fce 100644 (file)
--- a/src/ui/gui/psppire-var-view.c
+++ b/src/ui/gui/psppire-var-view.c
@@ -74,18 +74,19 @@ psppire_var_view_get_type (void)
       static const GTypeInfo psppire_var_view_info =
       {
        sizeof (PsppireVarViewClass),
-       (GBaseInitFunc) psppire_var_view_base_init,
-        (GBaseFinalizeFunc) psppire_var_view_base_finalize,
-       (GClassInitFunc)psppire_var_view_class_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_var_view_base_init,
+        (GBaseFinalizeFunc) (void (*)(void)) psppire_var_view_base_finalize,
+       (GClassInitFunc) (void (*)(void)) psppire_var_view_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireVarView),
        0,
-       (GInstanceInitFunc) psppire_var_view_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_var_view_init,
+       NULL /* value_table */
       };
 
       static const GInterfaceInfo var_view_model_info = {
-       (GInterfaceInitFunc) model_init, /* Fill this in */
+       (GInterfaceInitFunc) (void (*)(void)) model_init, /* Fill this in */
        NULL,
        NULL
       };

diff --git a/src/ui/gui/psppire-window-register.c b/src/ui/gui/psppire-window-register.c
index 66e7353fb107abc7eeae56cd4a1d25e860f3968d..6345b729145900e68f440aee86e2df1b2e7619cb 100644 (file)
--- a/src/ui/gui/psppire-window-register.c
+++ b/src/ui/gui/psppire-window-register.c
@@ -18,9 +18,6 @@
 
 #include "psppire-window-register.h"
 
-static void psppire_window_register_init            (PsppireWindowRegister      *window_register);
-static void psppire_window_register_class_init      (PsppireWindowRegisterClass *class);
-
 static void psppire_window_register_finalize        (GObject   *object);
 static void psppire_window_register_dispose        (GObject   *object);
 
@@ -35,34 +32,7 @@ enum  {
 
 static guint signals [n_SIGNALS];
 
-GType
-psppire_window_register_get_type (void)
-{
-  static GType window_register_type = 0;
-
-  if (!window_register_type)
-    {
-      static const GTypeInfo window_register_info =
-      {
-       sizeof (PsppireWindowRegisterClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) psppire_window_register_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (PsppireWindowRegister),
-       0,
-        (GInstanceInitFunc) psppire_window_register_init,
-      };
-
-      window_register_type = g_type_register_static (G_TYPE_OBJECT,
-                                               "PsppireWindowRegister",
-                                               &window_register_info, 0);
-    }
-
-  return window_register_type;
-}
-
+G_DEFINE_TYPE (PsppireWindowRegister, psppire_window_register, G_TYPE_OBJECT)
 
 static void
 psppire_window_register_finalize (GObject *object)

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 8dcde94ad53c739ff20f6900967932cf16a8af86..ca81692305052e2596ddff40bebf4029bb7008ae 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -61,14 +61,15 @@ psppire_window_get_type (void)
       static const GTypeInfo psppire_window_info =
       {
        sizeof (PsppireWindowClass),
-       (GBaseInitFunc) psppire_window_base_init,
+       (GBaseInitFunc) (void (*)(void)) psppire_window_base_init,
         (GBaseFinalizeFunc) NULL,
-       (GClassInitFunc) psppire_window_class_init,
+       (GClassInitFunc) (void (*)(void)) psppire_window_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
         sizeof (PsppireWindow),
        0,
-       (GInstanceInitFunc) psppire_window_init,
+       (GInstanceInitFunc) (void (*)(void)) psppire_window_init,
+       NULL /* value_table */
       };
 
       psppire_window_type =
@@ -565,7 +566,8 @@ psppire_window_model_get_type (void)
        NULL,           /* class_data */
        0,
        0,              /* n_preallocs */
-       NULL
+       NULL,
+       NULL            /* value_table */
       };
 
       window_model_type =