From: John Darrington Date: Tue, 17 Mar 2009 10:22:21 +0000 (+0900) Subject: Namespace police duty. X-Git-Tag: v0.7.3~220 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85b74d9faae382bba86a4042d5119d41672bf3ff;p=pspp-builds.git Namespace police duty. Changed a number of instances of G_TYPE_ to PSPPIRE_TYPE_ --- diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c index d121d961..184ebd16 100644 --- a/src/ui/gui/psppire-buttonbox.c +++ b/src/ui/gui/psppire-buttonbox.c @@ -142,7 +142,7 @@ psppire_button_box_class_init (PsppireButtonBoxClass *class) g_param_spec_flags ("buttons", _("Buttons"), _("The mask that decides what buttons appear in the button box"), - G_TYPE_PSPPIRE_BUTTON_MASK, + PSPPIRE_TYPE_BUTTON_MASK, PSPPIRE_BUTTON_OK_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_RESET_MASK | diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h index 3f865fac..03f9fe34 100644 --- a/src/ui/gui/psppire-buttonbox.h +++ b/src/ui/gui/psppire-buttonbox.h @@ -71,7 +71,7 @@ _psppire_button_box_child_requisition (GtkWidget *widget, int *width, -#define G_TYPE_PSPPIRE_BUTTON_MASK \ +#define PSPPIRE_TYPE_BUTTON_MASK \ (psppire_button_flags_get_type()) int *height); diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 6a6733d2..dbe4612f 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -213,7 +213,7 @@ psppire_dialog_class_init (PsppireDialogClass *class) g_param_spec_enum ("orientation", "Orientation", "Which way widgets are packed", - G_TYPE_PSPPIRE_ORIENTATION, + PSPPIRE_TYPE_ORIENTATION, PSPPIRE_HORIZONTAL /* default value */, G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE); diff --git a/src/ui/gui/psppire-dialog.h b/src/ui/gui/psppire-dialog.h index 5a1b1f57..6c175cfb 100644 --- a/src/ui/gui/psppire-dialog.h +++ b/src/ui/gui/psppire-dialog.h @@ -87,7 +87,7 @@ void psppire_dialog_notify_change (PsppireDialog *); GType psppire_orientation_get_type (void); -#define G_TYPE_PSPPIRE_ORIENTATION (psppire_orientation_get_type ()) +#define PSPPIRE_TYPE_ORIENTATION (psppire_orientation_get_type ()) G_END_DECLS diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 91293956..564257f4 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -315,7 +315,7 @@ psppire_dict_init (PsppireDict *psppire_dict) PsppireDict* psppire_dict_new_from_dict (struct dictionary *d) { - PsppireDict *new_dict = g_object_new (G_TYPE_PSPPIRE_DICT, NULL); + PsppireDict *new_dict = g_object_new (PSPPIRE_TYPE_DICT, NULL); new_dict->dict = d; dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict); diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h index 534f0707..6d731f21 100644 --- a/src/ui/gui/psppire-dict.h +++ b/src/ui/gui/psppire-dict.h @@ -30,12 +30,12 @@ G_BEGIN_DECLS /* --- type macros --- */ -#define G_TYPE_PSPPIRE_DICT (psppire_dict_get_type ()) -#define PSPPIRE_DICT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_PSPPIRE_DICT, PsppireDict)) -#define PSPPIRE_DICT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_PSPPIRE_DICT, PsppireDictClass)) -#define PSPPIRE_IS_DICT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_PSPPIRE_DICT)) -#define PSPPIRE_IS_DICT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_PSPPIRE_DICT)) -#define PSPPIRE_DICT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_PSPPIRE_DICT, PsppireDictClass)) +#define PSPPIRE_TYPE_DICT (psppire_dict_get_type ()) +#define PSPPIRE_DICT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PSPPIRE_TYPE_DICT, PsppireDict)) +#define PSPPIRE_DICT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_TYPE_DICT, PsppireDictClass)) +#define PSPPIRE_IS_DICT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PSPPIRE_TYPE_DICT)) +#define PSPPIRE_IS_DICT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_TYPE_DICT)) +#define PSPPIRE_DICT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PSPPIRE_TYPE_DICT, PsppireDictClass)) /* --- typedefs & structures --- */ diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c index d955fae1..08cb2387 100644 --- a/src/ui/gui/psppire-dictview.c +++ b/src/ui/gui/psppire-dictview.c @@ -195,7 +195,7 @@ psppire_dict_view_class_init (PsppireDictViewClass *class) g_param_spec_object ("model", "Model", _("The dictionary to be displayed by this widget"), - G_TYPE_PSPPIRE_DICT, + PSPPIRE_TYPE_DICT, G_PARAM_READABLE | G_PARAM_WRITABLE); GParamSpec *predicate_spec = diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c index 2f9dbe06..d6ea3375 100644 --- a/src/ui/gui/psppire-selector.c +++ b/src/ui/gui/psppire-selector.c @@ -179,7 +179,7 @@ psppire_selector_class_init (PsppireSelectorClass *class) g_param_spec_enum ("orientation", "Orientation", "Where the selector is relative to its subjects", - G_TYPE_PSPPIRE_SELECTOR_ORIENTATION, + PSPPIRE_TYPE_SELECTOR_ORIENTATION, PSPPIRE_SELECT_SOURCE_BEFORE_DEST /* default value */, G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE); diff --git a/src/ui/gui/psppire-selector.h b/src/ui/gui/psppire-selector.h index bdd358eb..6fff5d42 100644 --- a/src/ui/gui/psppire-selector.h +++ b/src/ui/gui/psppire-selector.h @@ -130,7 +130,7 @@ typedef enum { PSPPIRE_SELECT_SOURCE_BELOW_DEST } PsppireSelectorOrientation; -#define G_TYPE_PSPPIRE_SELECTOR_ORIENTATION \ +#define PSPPIRE_TYPE_SELECTOR_ORIENTATION \ (psppire_selector_orientation_get_type()) diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index b092de30..8e78e2ec 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -191,7 +191,7 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) "Variable format type", ("Whether variables have input or output " "formats"), - G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE, + PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE, PSPPIRE_VAR_STORE_OUTPUT_FORMATS, G_PARAM_READWRITE); diff --git a/src/ui/gui/psppire-var-store.h b/src/ui/gui/psppire-var-store.h index cf437589..4cda0159 100644 --- a/src/ui/gui/psppire-var-store.h +++ b/src/ui/gui/psppire-var-store.h @@ -34,7 +34,7 @@ typedef enum } PsppireVarStoreFormatType; -#define G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE \ +#define PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE \ (psppire_var_store_format_type_get_type ()) /* PSPPIRE variable store. */