diff --git a/app/core/gimpparamspecs.h b/app/core/gimpparamspecs.h index 382ad6c9f0..5b1dc5c6e5 100644 --- a/app/core/gimpparamspecs.h +++ b/app/core/gimpparamspecs.h @@ -85,7 +85,6 @@ void gimp_param_spec_enum_exclude_value (GimpParamSpecEnum *espec, */ #define GIMP_COMPILATION #include "../../libgimp/gimpparamspecs.h" -#include "../../libgimp/gimpparamspecs-resource.h" #undef GIMP_COMPILATION diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 177054cb8b..48c2a79e27 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/libgimp/gimpparamspecs-body.c b/libgimp/gimpparamspecs-body.c index 0b7fae698e..ac86abafb3 100644 --- a/libgimp/gimpparamspecs-body.c +++ b/libgimp/gimpparamspecs-body.c @@ -1016,8 +1016,6 @@ gimp_param_spec_resource (const gchar *name, } - - /* * GIMP_TYPE_PARAM_BRUSH */ @@ -1098,16 +1096,15 @@ gimp_param_spec_brush (const gchar *name, } - /* - * GIMP_TYPE_PARAM_FONT + * GIMP_TYPE_PARAM_PATTERN */ -static void gimp_param_font_class_init (GParamSpecClass *klass); -static void gimp_param_font_init (GParamSpec *pspec); +static void gimp_param_pattern_class_init (GParamSpecClass *klass); +static void gimp_param_pattern_init (GParamSpec *pspec); GType -gimp_param_font_get_type (void) +gimp_param_pattern_get_type (void) { static GType type = 0; @@ -1117,58 +1114,58 @@ gimp_param_font_get_type (void) { sizeof (GParamSpecClass), NULL, NULL, - (GClassInitFunc) gimp_param_font_class_init, + (GClassInitFunc) gimp_param_pattern_class_init, NULL, NULL, - sizeof (GimpParamSpecFont), + sizeof (GimpParamSpecPattern), 0, - (GInstanceInitFunc) gimp_param_font_init + (GInstanceInitFunc) gimp_param_pattern_init }; type = g_type_register_static (GIMP_TYPE_PARAM_RESOURCE, - "GimpParamFont", &info, 0); + "GimpParamPattern", &info, 0); } return type; } static void -gimp_param_font_class_init (GParamSpecClass *klass) +gimp_param_pattern_class_init (GParamSpecClass *klass) { - klass->value_type = GIMP_TYPE_FONT; + klass->value_type = GIMP_TYPE_PATTERN; } static void -gimp_param_font_init (GParamSpec *pspec) +gimp_param_pattern_init (GParamSpec *pspec) { } /** - * gimp_param_spec_font: + * gimp_param_spec_pattern: * @name: Canonical name of the property specified. * @nick: Nick name of the property specified. * @blurb: Description of the property specified. * @none_ok: Whether no is a valid value. * @flags: Flags for the property specified. * - * Creates a new #GimpParamSpecFont specifying a - * #GIMP_TYPE_FONT property. + * Creates a new #GimpParamSpecPattern specifying a + * #GIMP_TYPE_PATTERN property. * * See g_param_spec_internal() for details on property names. * - * Returns: (transfer full): The newly created #GimpParamSpecFont. + * Returns: (transfer full): The newly created #GimpParamSpecPattern. * * Since: 3.0 **/ GParamSpec * -gimp_param_spec_font (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags) +gimp_param_spec_pattern (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags) { GimpParamSpecResource *rspec; - rspec = g_param_spec_internal (GIMP_TYPE_PARAM_FONT, + rspec = g_param_spec_internal (GIMP_TYPE_PARAM_PATTERN, name, nick, blurb, flags); g_return_val_if_fail (rspec, NULL); @@ -1179,7 +1176,6 @@ gimp_param_spec_font (const gchar *name, } - /* * GIMP_TYPE_PARAM_GRADIENT */ @@ -1341,14 +1337,14 @@ gimp_param_spec_palette (const gchar *name, /* - * GIMP_TYPE_PARAM_PATTERN + * GIMP_TYPE_PARAM_FONT */ -static void gimp_param_pattern_class_init (GParamSpecClass *klass); -static void gimp_param_pattern_init (GParamSpec *pspec); +static void gimp_param_font_class_init (GParamSpecClass *klass); +static void gimp_param_font_init (GParamSpec *pspec); GType -gimp_param_pattern_get_type (void) +gimp_param_font_get_type (void) { static GType type = 0; @@ -1358,58 +1354,58 @@ gimp_param_pattern_get_type (void) { sizeof (GParamSpecClass), NULL, NULL, - (GClassInitFunc) gimp_param_pattern_class_init, + (GClassInitFunc) gimp_param_font_class_init, NULL, NULL, - sizeof (GimpParamSpecPattern), + sizeof (GimpParamSpecFont), 0, - (GInstanceInitFunc) gimp_param_pattern_init + (GInstanceInitFunc) gimp_param_font_init }; type = g_type_register_static (GIMP_TYPE_PARAM_RESOURCE, - "GimpParamPattern", &info, 0); + "GimpParamFont", &info, 0); } return type; } static void -gimp_param_pattern_class_init (GParamSpecClass *klass) +gimp_param_font_class_init (GParamSpecClass *klass) { - klass->value_type = GIMP_TYPE_PATTERN; + klass->value_type = GIMP_TYPE_FONT; } static void -gimp_param_pattern_init (GParamSpec *pspec) +gimp_param_font_init (GParamSpec *pspec) { } /** - * gimp_param_spec_pattern: + * gimp_param_spec_font: * @name: Canonical name of the property specified. * @nick: Nick name of the property specified. * @blurb: Description of the property specified. * @none_ok: Whether no is a valid value. * @flags: Flags for the property specified. * - * Creates a new #GimpParamSpecPattern specifying a - * #GIMP_TYPE_PATTERN property. + * Creates a new #GimpParamSpecFont specifying a + * #GIMP_TYPE_FONT property. * * See g_param_spec_internal() for details on property names. * - * Returns: (transfer full): The newly created #GimpParamSpecPattern. + * Returns: (transfer full): The newly created #GimpParamSpecFont. * * Since: 3.0 **/ GParamSpec * -gimp_param_spec_pattern (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags) +gimp_param_spec_font (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags) { GimpParamSpecResource *rspec; - rspec = g_param_spec_internal (GIMP_TYPE_PARAM_PATTERN, + rspec = g_param_spec_internal (GIMP_TYPE_PARAM_FONT, name, nick, blurb, flags); g_return_val_if_fail (rspec, NULL); diff --git a/libgimp/gimpparamspecs-resource.h b/libgimp/gimpparamspecs-resource.h deleted file mode 100644 index c84cbe1633..0000000000 --- a/libgimp/gimpparamspecs-resource.h +++ /dev/null @@ -1,197 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * This library is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __LIBGIMP_GIMP_PARAM_SPECS_RESOURCE_H__ -#define __LIBGIMP_GIMP_PARAM_SPECS_RESOURCE_H__ - -G_BEGIN_DECLS - -/* - * GIMP_TYPE_PARAM_RESOURCE - */ - -#define GIMP_VALUE_HOLDS_RESOURCE(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_RESOURCE)) - -#define GIMP_TYPE_PARAM_RESOURCE (gimp_param_resource_get_type ()) -#define GIMP_PARAM_SPEC_RESOURCE(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_RESOURCE, GimpParamSpecResource)) -#define GIMP_IS_PARAM_SPEC_RESOURCE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_RESOURCE)) - -typedef struct _GimpParamSpecResource GimpParamSpecResource; - -struct _GimpParamSpecResource -{ - GParamSpecObject parent_instance; - - gboolean none_ok; -}; - -GType gimp_param_resource_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_resource (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_BRUSH - */ - -#define GIMP_VALUE_HOLDS_BRUSH(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_BRUSH)) - -#define GIMP_TYPE_PARAM_BRUSH (gimp_param_brush_get_type ()) -#define GIMP_PARAM_SPEC_BRUSH(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_BRUSH, GimpParamSpecBrush)) -#define GIMP_IS_PARAM_SPEC_BRUSH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_BRUSH)) - -typedef struct _GimpParamSpecBrush GimpParamSpecBrush; - -struct _GimpParamSpecBrush -{ - GimpParamSpecResource parent_instance; -}; - -GType gimp_param_brush_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_brush (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - - - -/* - * GIMP_TYPE_PARAM_FONT - */ - -#define GIMP_VALUE_HOLDS_FONT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_FONT)) - -#define GIMP_TYPE_PARAM_FONT (gimp_param_font_get_type ()) -#define GIMP_PARAM_SPEC_FONT(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_FONT, GimpParamSpecFont)) -#define GIMP_IS_PARAM_SPEC_FONT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_FONT)) - -typedef struct _GimpParamSpecFont GimpParamSpecFont; - -struct _GimpParamSpecFont -{ - GimpParamSpecResource parent_instance; -}; - -GType gimp_param_font_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_font (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - - - -/* - * GIMP_TYPE_PARAM_GRADIENT - */ - -#define GIMP_VALUE_HOLDS_GRADIENT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_GRADIENT)) - -#define GIMP_TYPE_PARAM_GRADIENT (gimp_param_gradient_get_type ()) -#define GIMP_PARAM_SPEC_GRADIENT(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_GRADIENT, GimpParamSpecGradient)) -#define GIMP_IS_PARAM_SPEC_GRADIENT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_GRADIENT)) - -typedef struct _GimpParamSpecGradient GimpParamSpecGradient; - -struct _GimpParamSpecGradient -{ - GimpParamSpecResource parent_instance; -}; - -GType gimp_param_gradient_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_gradient (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - - - -/* - * GIMP_TYPE_PARAM_PALETTE - */ - -#define GIMP_VALUE_HOLDS_PALETTE(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_PALETTE)) - -#define GIMP_TYPE_PARAM_PALETTE (gimp_param_palette_get_type ()) -#define GIMP_PARAM_SPEC_PALETTE(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PALETTE, GimpParamSpecPalette)) -#define GIMP_IS_PARAM_SPEC_PALETTE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PALETTE)) - -typedef struct _GimpParamSpecPalette GimpParamSpecPalette; - -struct _GimpParamSpecPalette -{ - GimpParamSpecResource parent_instance; -}; - -GType gimp_param_palette_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_palette (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - - - -/* - * GIMP_TYPE_PARAM_PATTERN - */ - -#define GIMP_VALUE_HOLDS_PATTERN(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ - GIMP_TYPE_PATTERN)) - -#define GIMP_TYPE_PARAM_PATTERN (gimp_param_pattern_get_type ()) -#define GIMP_PARAM_SPEC_PATTERN(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PATTERN, GimpParamSpecPattern)) -#define GIMP_IS_PARAM_SPEC_PATTERN(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATTERN)) - -typedef struct _GimpParamSpecPattern GimpParamSpecPattern; - -struct _GimpParamSpecPattern -{ - GimpParamSpecResource parent_instance; -}; - -GType gimp_param_pattern_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_pattern (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean none_ok, - GParamFlags flags); - -G_END_DECLS - -#endif /* __LIBGIMP_GIMP_PARAM_SPECS_RESOURCE_H__ */ diff --git a/libgimp/gimpparamspecs.h b/libgimp/gimpparamspecs.h index e87314034d..bda8ef3dee 100644 --- a/libgimp/gimpparamspecs.h +++ b/libgimp/gimpparamspecs.h @@ -305,6 +305,170 @@ GParamSpec * gimp_param_spec_display (const gchar *name, GParamFlags flags); +/* + * GIMP_TYPE_PARAM_RESOURCE + */ + +#define GIMP_VALUE_HOLDS_RESOURCE(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_RESOURCE)) + +#define GIMP_TYPE_PARAM_RESOURCE (gimp_param_resource_get_type ()) +#define GIMP_PARAM_SPEC_RESOURCE(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_RESOURCE, GimpParamSpecResource)) +#define GIMP_IS_PARAM_SPEC_RESOURCE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_RESOURCE)) + +typedef struct _GimpParamSpecResource GimpParamSpecResource; + +struct _GimpParamSpecResource +{ + GParamSpecObject parent_instance; + + gboolean none_ok; +}; + +GType gimp_param_resource_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_resource (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + +/* + * GIMP_TYPE_PARAM_BRUSH + */ + +#define GIMP_VALUE_HOLDS_BRUSH(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_BRUSH)) + +#define GIMP_TYPE_PARAM_BRUSH (gimp_param_brush_get_type ()) +#define GIMP_PARAM_SPEC_BRUSH(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_BRUSH, GimpParamSpecBrush)) +#define GIMP_IS_PARAM_SPEC_BRUSH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_BRUSH)) + +typedef struct _GimpParamSpecBrush GimpParamSpecBrush; + +struct _GimpParamSpecBrush +{ + GimpParamSpecResource parent_instance; +}; + +GType gimp_param_brush_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_brush (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + +/* + * GIMP_TYPE_PARAM_PATTERN + */ + +#define GIMP_VALUE_HOLDS_PATTERN(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_PATTERN)) + +#define GIMP_TYPE_PARAM_PATTERN (gimp_param_pattern_get_type ()) +#define GIMP_PARAM_SPEC_PATTERN(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PATTERN, GimpParamSpecPattern)) +#define GIMP_IS_PARAM_SPEC_PATTERN(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATTERN)) + +typedef struct _GimpParamSpecPattern GimpParamSpecPattern; + +struct _GimpParamSpecPattern +{ + GimpParamSpecResource parent_instance; +}; + +GType gimp_param_pattern_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_pattern (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + +/* + * GIMP_TYPE_PARAM_GRADIENT + */ + +#define GIMP_VALUE_HOLDS_GRADIENT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_GRADIENT)) + +#define GIMP_TYPE_PARAM_GRADIENT (gimp_param_gradient_get_type ()) +#define GIMP_PARAM_SPEC_GRADIENT(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_GRADIENT, GimpParamSpecGradient)) +#define GIMP_IS_PARAM_SPEC_GRADIENT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_GRADIENT)) + +typedef struct _GimpParamSpecGradient GimpParamSpecGradient; + +struct _GimpParamSpecGradient +{ + GimpParamSpecResource parent_instance; +}; + +GType gimp_param_gradient_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_gradient (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + +/* + * GIMP_TYPE_PARAM_PALETTE + */ + +#define GIMP_VALUE_HOLDS_PALETTE(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_PALETTE)) + +#define GIMP_TYPE_PARAM_PALETTE (gimp_param_palette_get_type ()) +#define GIMP_PARAM_SPEC_PALETTE(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PALETTE, GimpParamSpecPalette)) +#define GIMP_IS_PARAM_SPEC_PALETTE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PALETTE)) + +typedef struct _GimpParamSpecPalette GimpParamSpecPalette; + +struct _GimpParamSpecPalette +{ + GimpParamSpecResource parent_instance; +}; + +GType gimp_param_palette_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_palette (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + +/* + * GIMP_TYPE_PARAM_FONT + */ + +#define GIMP_VALUE_HOLDS_FONT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), \ + GIMP_TYPE_FONT)) + +#define GIMP_TYPE_PARAM_FONT (gimp_param_font_get_type ()) +#define GIMP_PARAM_SPEC_FONT(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_FONT, GimpParamSpecFont)) +#define GIMP_IS_PARAM_SPEC_FONT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_FONT)) + +typedef struct _GimpParamSpecFont GimpParamSpecFont; + +struct _GimpParamSpecFont +{ + GimpParamSpecResource parent_instance; +}; + +GType gimp_param_font_get_type (void) G_GNUC_CONST; + +GParamSpec * gimp_param_spec_font (const gchar *name, + const gchar *nick, + const gchar *blurb, + gboolean none_ok, + GParamFlags flags); + + G_END_DECLS #endif /* __LIBGIMP_GIMP_PARAM_SPECS_H__ */ diff --git a/libgimp/meson.build b/libgimp/meson.build index b53a83b048..8cd511ad50 100644 --- a/libgimp/meson.build +++ b/libgimp/meson.build @@ -236,7 +236,6 @@ libgimp_headers_introspectable = [ 'gimplayermask.h', 'gimploadprocedure.h', 'gimpparamspecs.h', - 'gimpparamspecs-resource.h', 'gimppdb.h', 'gimpplugin.h', 'gimpprocedure.h',