dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: a bit of code cleanup. 

Especially some remnants of when Gimp(Toggle|Radio)Action were not descendants
of GimpActionImpl and had to reimplement GimpAction interface.

Also fixing a few details here and there.
This commit is contained in:
Jehan 2023-04-19 22:35:36 +02:00
parent e3bb3bf57f
commit 8a8914bc21
9 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpmenu.h
View File

@ -42,7 +42,7 @@ struct _GimpMenu
struct _GimpMenuClass
{
GtkMenuBarClass parent_class;
GtkMenuClass parent_class;
};

7
app/widgets/gimpmenubar.c
View File

@ -50,13 +50,6 @@
* This is why we need to implement our own GimpMenuBar subclass.
*/
enum
{
PROP_0 = GIMP_MENU_SHELL_PROP_LAST,
PROP_MODEL
};
struct _GimpMenuBarPrivate
{
GTree *menus;

2
app/widgets/gimpmenumodel.h
View File

@ -25,7 +25,7 @@
#define GIMP_TYPE_MENU_MODEL (gimp_menu_model_get_type ())
#define GIMP_MENU_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_MENU_MODEL, GimpMenuModel))
#define GIMP_MENU_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_MENU_MODEL, GimpMenuModelClass))
#define GIMP_IS_MENU_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_MENU_MODEL))
#define GIMP_IS_MENU_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_MENU_MODEL))
#define GIMP_IS_MENU_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_MENU_MODEL))
#define GIMP_MENU_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MENU_MODEL, GimpMenuModelClass))

2
app/widgets/gimpmenushell.c
View File

@ -67,7 +67,7 @@ static void gimp_menu_shell_append_model_drop_top (GimpMenuShell *s
GimpMenuModel *model);
G_DEFINE_INTERFACE (GimpMenuShell, gimp_menu_shell, G_TYPE_OBJECT)
G_DEFINE_INTERFACE (GimpMenuShell, gimp_menu_shell, GTK_TYPE_CONTAINER)
static guint signals[LAST_SIGNAL];

16
app/widgets/gimpradioaction.c
View File

@ -46,7 +46,7 @@
enum
{
PROP_0 = GIMP_ACTION_PROP_LAST,
PROP_0,
PROP_VALUE,
PROP_GROUP,
PROP_GROUP_LABEL,
@ -86,11 +86,9 @@ static void gimp_radio_action_activate (GAction *action
static gboolean gimp_radio_action_toggle (GimpToggleAction *action);
G_DEFINE_TYPE_WITH_CODE (GimpRadioAction, gimp_radio_action,
GIMP_TYPE_TOGGLE_ACTION,
G_DEFINE_TYPE_WITH_CODE (GimpRadioAction, gimp_radio_action, GIMP_TYPE_TOGGLE_ACTION,
G_ADD_PRIVATE (GimpRadioAction)
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION, gimp_radio_action_g_action_iface_init)
G_IMPLEMENT_INTERFACE (GIMP_TYPE_ACTION, NULL))
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION, gimp_radio_action_g_action_iface_init))
#define parent_class gimp_radio_action_parent_class
@ -107,8 +105,6 @@ gimp_radio_action_class_init (GimpRadioActionClass *klass)
toggle_class->toggle = gimp_radio_action_toggle;
gimp_action_install_properties (object_class);
/**
* GimpRadioAction:value:
*
@ -185,8 +181,6 @@ gimp_radio_action_init (GimpRadioAction *action)
action->priv->group = NULL;
action->priv->group_label = NULL;
gimp_action_init (GIMP_ACTION (action));
}
static void
@ -222,7 +216,7 @@ gimp_radio_action_get_property (GObject *object,
break;
default:
gimp_action_get_property (object, prop_id, value, pspec);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -263,7 +257,7 @@ gimp_radio_action_set_property (GObject *object,
break;
default:
gimp_action_set_property (object, prop_id, value, pspec);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

3
app/widgets/gimpradioaction.h
View File

@ -29,11 +29,10 @@
#define GIMP_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioAction))
#define GIMP_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
#define GIMP_IS_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_RADIO_ACTION))
#define GIMP_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ACTION))
#define GIMP_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_RADIO_ACTION))
#define GIMP_RADIO_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
typedef struct _GimpRadioAction GimpRadioAction;
typedef struct _GimpRadioActionClass GimpRadioActionClass;
typedef struct _GimpRadioActionPrivate GimpRadioActionPrivate;

13
app/widgets/gimptoggleaction.c
View File

@ -37,7 +37,7 @@
enum
{
PROP_0 = GIMP_ACTION_PROP_LAST,
PROP_0,
PROP_ACTIVE,
};
@ -80,8 +80,7 @@ static void gimp_toggle_action_toggle (GimpToggleAction *action
G_DEFINE_TYPE_WITH_CODE (GimpToggleAction, gimp_toggle_action,
GIMP_TYPE_ACTION_IMPL,
G_ADD_PRIVATE (GimpToggleAction)
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION, gimp_toggle_action_g_action_iface_init)
G_IMPLEMENT_INTERFACE (GIMP_TYPE_ACTION, NULL))
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION, gimp_toggle_action_g_action_iface_init))
#define parent_class gimp_toggle_action_parent_class
@ -106,8 +105,6 @@ gimp_toggle_action_class_init (GimpToggleActionClass *klass)
toggle_class->toggle = gimp_toggle_action_real_toggle;
gimp_action_install_properties (object_class);
/**
* GimpToggleAction:enabled:
*
@ -138,8 +135,6 @@ static void
gimp_toggle_action_init (GimpToggleAction *action)
{
action->priv = gimp_toggle_action_get_instance_private (action);
gimp_action_init (GIMP_ACTION (action));
}
static void
@ -157,7 +152,7 @@ gimp_toggle_action_get_property (GObject *object,
break;
default:
gimp_action_get_property (object, prop_id, value, pspec);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
@ -177,7 +172,7 @@ gimp_toggle_action_set_property (GObject *object,
break;
default:
gimp_action_set_property (object, prop_id, value, pspec);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}

3
app/widgets/gimptoggleaction.h
View File

@ -30,11 +30,10 @@
#define GIMP_TOGGLE_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleAction))
#define GIMP_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
#define GIMP_IS_TOGGLE_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_TOGGLE_ACTION))
#define GIMP_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_ACTION))
#define GIMP_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_TOGGLE_ACTION))
#define GIMP_TOGGLE_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
typedef struct _GimpToggleAction GimpToggleAction;
typedef struct _GimpToggleActionClass GimpToggleActionClass;
typedef struct _GimpToggleActionPrivate GimpToggleActionPrivate;

3
app/widgets/widgets-types.h
View File

@ -125,13 +125,16 @@ typedef struct _GimpToolPresetFactoryView GimpToolPresetFactoryView;
/* menus */
typedef struct _GimpAction GimpAction;
typedef struct _GimpActionImpl GimpActionImpl;
typedef struct _GimpActionFactory GimpActionFactory;
typedef struct _GimpActionGroup GimpActionGroup;
typedef struct _GimpDoubleAction GimpDoubleAction;
typedef struct _GimpEnumAction GimpEnumAction;
typedef struct _GimpMenuFactory GimpMenuFactory;
typedef struct _GimpProcedureAction GimpProcedureAction;
typedef struct _GimpRadioAction GimpRadioAction;
typedef struct _GimpStringAction GimpStringAction;
typedef struct _GimpToggleAction GimpToggleAction;
typedef struct _GimpUIManager GimpUIManager;