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

libgimp: some object's header cleanup. 

Using G_DECLARE_*() macros everywhere, aligning functions, including the
parent class header…
This commit is contained in:
Jehan 2024-07-06 22:45:53 +02:00
parent b1736a6736
commit 87d89ba062
7 changed files with 55 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libgimp/gimpdisplay.c
View File

@ -37,9 +37,10 @@ enum
};
struct _GimpDisplayPrivate
struct _GimpDisplay
{
gint id;
GObject parent_instance;
gint id;
};
@ -53,7 +54,7 @@ static void gimp_display_get_property (GObject *object,
GParamSpec *pspec);
G_DEFINE_TYPE_WITH_PRIVATE (GimpDisplay, gimp_display, G_TYPE_OBJECT)
G_DEFINE_TYPE (GimpDisplay, gimp_display, G_TYPE_OBJECT)
#define parent_class gimp_display_parent_class
@ -82,7 +83,6 @@ gimp_display_class_init (GimpDisplayClass *klass)
static void
gimp_display_init (GimpDisplay *display)
{
display->priv = gimp_display_get_instance_private (display);
}
static void
@ -96,7 +96,7 @@ gimp_display_set_property (GObject *object,
switch (property_id)
{
case PROP_ID:
display->priv->id = g_value_get_int (value);
display->id = g_value_get_int (value);
break;
default:
@ -116,7 +116,7 @@ gimp_display_get_property (GObject *object,
switch (property_id)
{
case PROP_ID:
g_value_set_int (value, display->priv->id);
g_value_set_int (value, display->id);
break;
default:
@ -139,7 +139,7 @@ gimp_display_get_property (GObject *object,
gint32
gimp_display_get_id (GimpDisplay *display)
{
return display ? display->priv->id : -1;
return display ? display->id : -1;
}
/**

35
libgimp/gimpdisplay.h
View File

@ -31,41 +31,10 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#define GIMP_TYPE_DISPLAY (gimp_display_get_type ())
#define GIMP_DISPLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY, GimpDisplay))
#define GIMP_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DISPLAY, GimpDisplayClass))
#define GIMP_IS_DISPLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DISPLAY))
#define GIMP_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DISPLAY))
#define GIMP_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DISPLAY, GimpDisplayClass))
#define GIMP_TYPE_DISPLAY (gimp_display_get_type ())
G_DECLARE_FINAL_TYPE (GimpDisplay, gimp_display, GIMP, DISPLAY, GObject)
typedef struct _GimpDisplayClass GimpDisplayClass;
typedef struct _GimpDisplayPrivate GimpDisplayPrivate;
struct _GimpDisplay
{
GObject parent_instance;
GimpDisplayPrivate *priv;
};
struct _GimpDisplayClass
{
GObjectClass parent_class;
/* Padding for future expansion */
void (*_gimp_reserved1) (void);
void (*_gimp_reserved2) (void);
void (*_gimp_reserved3) (void);
void (*_gimp_reserved4) (void);
void (*_gimp_reserved5) (void);
void (*_gimp_reserved6) (void);
void (*_gimp_reserved7) (void);
void (*_gimp_reserved8) (void);
};
GType gimp_display_get_type (void) G_GNUC_CONST;
gint32 gimp_display_get_id (GimpDisplay *display);
GimpDisplay * gimp_display_get_by_id (gint32 display_id);

68
libgimp/gimpimage.h
View File

@ -35,48 +35,48 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GimpImage, gimp_image, GIMP, IMAGE, GObject)
gint32 gimp_image_get_id (GimpImage *image);
GimpImage * gimp_image_get_by_id (gint32 image_id);
gint32 gimp_image_get_id (GimpImage *image);
GimpImage * gimp_image_get_by_id (gint32 image_id);
gboolean gimp_image_is_valid (GimpImage *image);
gboolean gimp_image_is_valid (GimpImage *image);
GList * gimp_list_images (void);
GList * gimp_list_images (void);
GList * gimp_image_list_layers (GimpImage *image);
GList * gimp_image_list_channels (GimpImage *image);
GList * gimp_image_list_vectors (GimpImage *image);
GList * gimp_image_list_layers (GimpImage *image);
GList * gimp_image_list_channels (GimpImage *image);
GList * gimp_image_list_vectors (GimpImage *image);
GList * gimp_image_list_selected_layers (GimpImage *image);
gboolean gimp_image_take_selected_layers (GimpImage *image,
GList *layers);
GList * gimp_image_list_selected_channels (GimpImage *image);
gboolean gimp_image_take_selected_channels (GimpImage *image,
GList *channels);
GList * gimp_image_list_selected_vectors (GimpImage *image);
gboolean gimp_image_take_selected_vectors (GimpImage *image,
GList *vectors);
GList * gimp_image_list_selected_layers (GimpImage *image);
gboolean gimp_image_take_selected_layers (GimpImage *image,
GList *layers);
GList * gimp_image_list_selected_channels (GimpImage *image);
gboolean gimp_image_take_selected_channels (GimpImage *image,
GList *channels);
GList * gimp_image_list_selected_vectors (GimpImage *image);
gboolean gimp_image_take_selected_vectors (GimpImage *image,
GList *vectors);
GList * gimp_image_list_selected_drawables(GimpImage *image);
GList * gimp_image_list_selected_drawables (GimpImage *image);
guchar * gimp_image_get_colormap (GimpImage *image,
gint *colormap_len,
gint *num_colors);
gboolean gimp_image_set_colormap (GimpImage *image,
const guchar *colormap,
gint num_colors);
guchar * gimp_image_get_colormap (GimpImage *image,
gint *colormap_len,
gint *num_colors);
gboolean gimp_image_set_colormap (GimpImage *image,
const guchar *colormap,
gint num_colors);
GBytes * gimp_image_get_thumbnail_data (GimpImage *image,
gint *width,
gint *height,
gint *bpp);
GdkPixbuf * gimp_image_get_thumbnail (GimpImage *image,
gint width,
gint height,
GimpPixbufTransparency alpha);
GBytes * gimp_image_get_thumbnail_data (GimpImage *image,
gint *width,
gint *height,
gint *bpp);
GdkPixbuf * gimp_image_get_thumbnail (GimpImage *image,
gint width,
gint height,
GimpPixbufTransparency alpha);
GimpMetadata * gimp_image_get_metadata (GimpImage *image);
gboolean gimp_image_set_metadata (GimpImage *image,
GimpMetadata *metadata);
GimpMetadata * gimp_image_get_metadata (GimpImage *image);
gboolean gimp_image_set_metadata (GimpImage *image,
GimpMetadata *metadata);
G_END_DECLS

3
libgimp/gimplayer.h
View File

@ -30,6 +30,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#include <libgimp/gimpdrawable.h>
#define GIMP_TYPE_LAYER (gimp_layer_get_type ())
G_DECLARE_DERIVABLE_TYPE (GimpLayer, gimp_layer, GIMP, LAYER, GimpDrawable)

3
libgimp/gimplayermask.h
View File

@ -31,6 +31,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#include <libgimp/gimpchannel.h>
#define GIMP_TYPE_LAYER_MASK (gimp_layer_mask_get_type ())
G_DECLARE_FINAL_TYPE (GimpLayerMask, gimp_layer_mask, GIMP, LAYER_MASK, GimpChannel)

3
libgimp/gimpselection.h
View File

@ -30,6 +30,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#include <libgimp/gimpchannel.h>
#define GIMP_TYPE_SELECTION (gimp_selection_get_type ())
G_DECLARE_FINAL_TYPE (GimpSelection, gimp_selection, GIMP, SELECTION, GimpChannel)

3
libgimp/gimptextlayer.h
View File

@ -31,6 +31,9 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
#include <libgimp/gimplayer.h>
#define GIMP_TYPE_TEXT_LAYER (gimp_text_layer_get_type ())
G_DECLARE_FINAL_TYPE (GimpTextLayer, gimp_text_layer, GIMP, TEXT_LAYER, GimpLayer)