diff --git a/ChangeLog b/ChangeLog index 59eee8d719..13f0d7fc6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +2005-01-21 Bill Skaggs + + * app/config/gimpconfig-types.c + * app/config/gimpconfig-types.h: removed... + + * libgimpbase/gimpbasetypes.c + * libgimpbase/gimpbasetypes.h: and contents merged + into here. + + * app/config/gimpconfig-params.c: removed... + + * libgimpbase/gimpbaseparams.c + * libgimpcolor/gimprgb.c + * libgimpmath/gimpmatrix.c: and contents merged + into here. + + * app/config/gimpconfig-params.h: part removed... + + * libgimpbase/gimpbaseparams.h + * libgimpcolor/gimprgb.h + * libgimpmath/gimpmatrix.h: and merged into here + + * libgimpbase/Makefile.am + * libgimpbase/gimpbase.h + * libgimpcolor/gimpbilinear.c + * libgimpcolor/gimpcmyk.c + * libgimpmath/gimpvector.c + * app/config/Makefile.am + * app/config/gimpconfig-deserialize.c + * app/config/gimpconfig-dump.c + * app/config/gimpconfig-serialize.c + * app/config/gimpcoreconfig.c + * app/config/gimpguiconfig.c + * app/config/gimppluginconfig.c + * app/core/gimp-utils.c + * app/core/gimpcontext.c + * app/tools/tools-utils.c + * app/widgets/gimpaction.c + * plug-ins/gimpressionist/utils.c: dependencies changed + accordingly. + + First step in config migration out of core. Need to fix + devel-docs to reflect these changes. + 2005-01-22 Sven Neumann * libgimpbase/gimputils.c (gimp_enum_value_get_desc): no point in diff --git a/app/config/Makefile.am b/app/config/Makefile.am index aff645f8a0..fc313c19f4 100644 --- a/app/config/Makefile.am +++ b/app/config/Makefile.am @@ -16,15 +16,12 @@ libappconfig_a_SOURCES = \ gimpconfig-dump.h \ gimpconfig-error.c \ gimpconfig-error.h \ - gimpconfig-params.c \ gimpconfig-params.h \ gimpconfig-path.c \ gimpconfig-path.h \ gimpconfig-serialize.c \ gimpconfig-serialize.h \ gimpconfig-serialize.h \ - gimpconfig-types.c \ - gimpconfig-types.h \ gimpconfig-utils.c \ gimpconfig-utils.h \ gimpconfigwriter.c \ diff --git a/app/config/gimpconfig-deserialize.c b/app/config/gimpconfig-deserialize.c index 4625174b86..57399781a5 100644 --- a/app/config/gimpconfig-deserialize.c +++ b/app/config/gimpconfig-deserialize.c @@ -33,7 +33,6 @@ #include "gimpconfig-deserialize.h" #include "gimpconfig-params.h" #include "gimpconfig-path.h" -#include "gimpconfig-types.h" #include "gimpscanner.h" #include "gimp-intl.h" diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c index 0fc6fb665a..eff3382cd5 100644 --- a/app/config/gimpconfig-dump.c +++ b/app/config/gimpconfig-dump.c @@ -42,7 +42,6 @@ #include "gimpconfig-dump.h" #include "gimpconfig-params.h" #include "gimpconfig-serialize.h" -#include "gimpconfig-types.h" #include "gimpconfigwriter.h" #include "gimprc.h" diff --git a/app/config/gimpconfig-params.c b/app/config/gimpconfig-params.c deleted file mode 100644 index 4da888c2bd..0000000000 --- a/app/config/gimpconfig-params.c +++ /dev/null @@ -1,549 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * ParamSpecs for config objects - * Copyright (C) 2001-2003 Sven Neumann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "libgimpbase/gimpbase.h" -#include "libgimpcolor/gimpcolor.h" -#include "libgimpmath/gimpmath.h" - -#include "config-types.h" - -#include "gimpconfig-params.h" -#include "gimpconfig-types.h" - - -/* - * GIMP_TYPE_PARAM_RGB - */ - -#define GIMP_PARAM_SPEC_RGB(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_RGB, GimpParamSpecRGB)) - -static void gimp_param_rgb_class_init (GParamSpecClass *class); -static void gimp_param_rgb_init (GParamSpec *pspec); -static void gimp_param_rgb_set_default (GParamSpec *pspec, - GValue *value); -static gboolean gimp_param_rgb_validate (GParamSpec *pspec, - GValue *value); -static gint gimp_param_rgb_values_cmp (GParamSpec *pspec, - const GValue *value1, - const GValue *value2); - -typedef struct _GimpParamSpecRGB GimpParamSpecRGB; - -struct _GimpParamSpecRGB -{ - GParamSpecBoxed parent_instance; - - GimpRGB default_value; -}; - -GType -gimp_param_rgb_get_type (void) -{ - static GType spec_type = 0; - - if (!spec_type) - { - static const GTypeInfo type_info = - { - sizeof (GParamSpecClass), - NULL, NULL, - (GClassInitFunc) gimp_param_rgb_class_init, - NULL, NULL, - sizeof (GimpParamSpecRGB), - 0, - (GInstanceInitFunc) gimp_param_rgb_init - }; - - spec_type = g_type_register_static (G_TYPE_PARAM_BOXED, - "GimpParamRGB", - &type_info, 0); - } - - return spec_type; -} - -static void -gimp_param_rgb_class_init (GParamSpecClass *class) -{ - class->value_type = GIMP_TYPE_RGB; - class->value_set_default = gimp_param_rgb_set_default; - class->value_validate = gimp_param_rgb_validate; - class->values_cmp = gimp_param_rgb_values_cmp; -} - -static void -gimp_param_rgb_init (GParamSpec *pspec) -{ - GimpParamSpecRGB *cspec = GIMP_PARAM_SPEC_RGB (pspec); - - gimp_rgba_set (&cspec->default_value, 0.0, 0.0, 0.0, 0.0); -} - -static void -gimp_param_rgb_set_default (GParamSpec *pspec, - GValue *value) -{ - GimpParamSpecRGB *cspec = GIMP_PARAM_SPEC_RGB (pspec); - - g_value_set_static_boxed (value, &cspec->default_value); -} - -static gboolean -gimp_param_rgb_validate (GParamSpec *pspec, - GValue *value) -{ - GimpRGB *rgb; - - rgb = value->data[0].v_pointer; - - if (rgb) - { - GimpRGB oval; - - oval = *rgb; - - gimp_rgb_clamp (rgb); - - return (oval.r != rgb->r || - oval.g != rgb->g || - oval.b != rgb->b || - oval.a != rgb->a); - } - - return FALSE; -} - -static gint -gimp_param_rgb_values_cmp (GParamSpec *pspec, - const GValue *value1, - const GValue *value2) -{ - GimpRGB *rgb1; - GimpRGB *rgb2; - - rgb1 = value1->data[0].v_pointer; - rgb2 = value2->data[0].v_pointer; - - /* try to return at least *something*, it's useless anyway... */ - - if (! rgb1) - return rgb2 != NULL ? -1 : 0; - else if (! rgb2) - return rgb1 != NULL; - else - { - guint32 int1, int2; - - gimp_rgba_get_uchar (rgb1, - ((guchar *) &int1) + 0, - ((guchar *) &int1) + 1, - ((guchar *) &int1) + 2, - ((guchar *) &int1) + 3); - gimp_rgba_get_uchar (rgb2, - ((guchar *) &int2) + 0, - ((guchar *) &int2) + 1, - ((guchar *) &int2) + 2, - ((guchar *) &int2) + 3); - - return int1 - int2; - } -} - -GParamSpec * -gimp_param_spec_rgb (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpRGB *default_value, - GParamFlags flags) -{ - GimpParamSpecRGB *cspec; - - g_return_val_if_fail (default_value != NULL, NULL); - - cspec = g_param_spec_internal (GIMP_TYPE_PARAM_RGB, - name, nick, blurb, flags); - - cspec->default_value = *default_value; - - return G_PARAM_SPEC (cspec); -} - - -/* - * GIMP_TYPE_PARAM_MATRIX2 - */ - -#define GIMP_PARAM_SPEC_MATRIX2(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_MATRIX2, GimpParamSpecMatrix2)) - -static void gimp_param_matrix2_class_init (GParamSpecClass *class); -static void gimp_param_matrix2_init (GParamSpec *pspec); -static void gimp_param_matrix2_set_default (GParamSpec *pspec, - GValue *value); -static gint gimp_param_matrix2_values_cmp (GParamSpec *pspec, - const GValue *value1, - const GValue *value2); - -typedef struct _GimpParamSpecMatrix2 GimpParamSpecMatrix2; - -struct _GimpParamSpecMatrix2 -{ - GParamSpecBoxed parent_instance; - - GimpMatrix2 default_value; -}; - -GType -gimp_param_matrix2_get_type (void) -{ - static GType spec_type = 0; - - if (!spec_type) - { - static const GTypeInfo type_info = - { - sizeof (GParamSpecClass), - NULL, NULL, - (GClassInitFunc) gimp_param_matrix2_class_init, - NULL, NULL, - sizeof (GimpParamSpecMatrix2), - 0, - (GInstanceInitFunc) gimp_param_matrix2_init - }; - - spec_type = g_type_register_static (G_TYPE_PARAM_BOXED, - "GimpParamMatrix2", - &type_info, 0); - } - - return spec_type; -} - -static void -gimp_param_matrix2_class_init (GParamSpecClass *class) -{ - class->value_type = GIMP_TYPE_MATRIX2; - class->value_set_default = gimp_param_matrix2_set_default; - class->values_cmp = gimp_param_matrix2_values_cmp; -} - -static void -gimp_param_matrix2_init (GParamSpec *pspec) -{ - GimpParamSpecMatrix2 *cspec = GIMP_PARAM_SPEC_MATRIX2 (pspec); - - gimp_matrix2_identity (&cspec->default_value); -} - -static void -gimp_param_matrix2_set_default (GParamSpec *pspec, - GValue *value) -{ - GimpParamSpecMatrix2 *cspec = GIMP_PARAM_SPEC_MATRIX2 (pspec); - - g_value_set_static_boxed (value, &cspec->default_value); -} - -static gint -gimp_param_matrix2_values_cmp (GParamSpec *pspec, - const GValue *value1, - const GValue *value2) -{ - GimpMatrix2 *matrix1; - GimpMatrix2 *matrix2; - gint i, j; - - matrix1 = value1->data[0].v_pointer; - matrix2 = value2->data[0].v_pointer; - - /* try to return at least *something*, it's useless anyway... */ - - if (! matrix1) - return matrix2 != NULL ? -1 : 0; - else if (! matrix2) - return matrix1 != NULL; - - for (i = 0; i < 2; i++) - for (j = 0; j < 2; j++) - if (matrix1->coeff[i][j] != matrix2->coeff[i][j]) - return 1; - - return 0; -} - -GParamSpec * -gimp_param_spec_matrix2 (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpMatrix2 *default_value, - GParamFlags flags) -{ - GimpParamSpecMatrix2 *cspec; - - g_return_val_if_fail (default_value != NULL, NULL); - - cspec = g_param_spec_internal (GIMP_TYPE_PARAM_MATRIX2, - name, nick, blurb, flags); - - cspec->default_value = *default_value; - - return G_PARAM_SPEC (cspec); -} - - -/* - * GIMP_TYPE_PARAM_MEMSIZE - */ - -static void gimp_param_memsize_class_init (GParamSpecClass *class); - -GType -gimp_param_memsize_get_type (void) -{ - static GType spec_type = 0; - - if (!spec_type) - { - static const GTypeInfo type_info = - { - sizeof (GParamSpecClass), - NULL, NULL, - (GClassInitFunc) gimp_param_memsize_class_init, - NULL, NULL, - sizeof (GParamSpecUInt64), - 0, NULL, NULL - }; - - spec_type = g_type_register_static (G_TYPE_PARAM_UINT64, - "GimpParamMemsize", - &type_info, 0); - } - - return spec_type; -} - -static void -gimp_param_memsize_class_init (GParamSpecClass *class) -{ - class->value_type = GIMP_TYPE_MEMSIZE; -} - -GParamSpec * -gimp_param_spec_memsize (const gchar *name, - const gchar *nick, - const gchar *blurb, - guint64 minimum, - guint64 maximum, - guint64 default_value, - GParamFlags flags) -{ - GParamSpecUInt64 *pspec; - - pspec = g_param_spec_internal (GIMP_TYPE_PARAM_MEMSIZE, - name, nick, blurb, flags); - - pspec->minimum = minimum; - pspec->maximum = maximum; - pspec->default_value = default_value; - - return G_PARAM_SPEC (pspec); -} - - -/* - * GIMP_TYPE_PARAM_PATH - */ - -#define GIMP_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PATH, GimpParamSpecPath)) - -typedef struct _GimpParamSpecPath GimpParamSpecPath; - -struct _GimpParamSpecPath -{ - GParamSpecString parent_instance; - - GimpParamPathType type; -}; - -static void gimp_param_path_class_init (GParamSpecClass *class); - -GType -gimp_param_path_get_type (void) -{ - static GType spec_type = 0; - - if (!spec_type) - { - static const GTypeInfo type_info = - { - sizeof (GParamSpecClass), - NULL, NULL, - (GClassInitFunc) gimp_param_path_class_init, - NULL, NULL, - sizeof (GimpParamSpecPath), - 0, NULL, NULL - }; - - spec_type = g_type_register_static (G_TYPE_PARAM_STRING, - "GimpParamPath", - &type_info, 0); - } - - return spec_type; -} - -static void -gimp_param_path_class_init (GParamSpecClass *class) -{ - class->value_type = GIMP_TYPE_PATH; -} - -GParamSpec * -gimp_param_spec_path (const gchar *name, - const gchar *nick, - const gchar *blurb, - GimpParamPathType type, - gchar *default_value, - GParamFlags flags) -{ - GParamSpecString *pspec; - - pspec = g_param_spec_internal (GIMP_TYPE_PARAM_PATH, - name, nick, blurb, flags); - - - pspec->default_value = default_value; - - GIMP_PARAM_SPEC_PATH (pspec)->type = type; - - return G_PARAM_SPEC (pspec); -} - -GimpParamPathType -gimp_param_spec_path_type (GParamSpec *pspec) -{ - g_return_val_if_fail (GIMP_IS_PARAM_SPEC_PATH (pspec), 0); - - return GIMP_PARAM_SPEC_PATH (pspec)->type; -} - - -/* - * GIMP_TYPE_PARAM_UNIT - */ - -#define GIMP_PARAM_SPEC_UNIT(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_UNIT, GimpParamSpecUnit)) - -typedef struct _GimpParamSpecUnit GimpParamSpecUnit; - -struct _GimpParamSpecUnit -{ - GParamSpecInt parent_instance; - - gboolean allow_percent; -}; - -static void gimp_param_unit_class_init (GParamSpecClass *class); -static gboolean gimp_param_unit_value_validate (GParamSpec *pspec, - GValue *value); - -GType -gimp_param_unit_get_type (void) -{ - static GType spec_type = 0; - - if (!spec_type) - { - static const GTypeInfo type_info = - { - sizeof (GParamSpecClass), - NULL, NULL, - (GClassInitFunc) gimp_param_unit_class_init, - NULL, NULL, - sizeof (GimpParamSpecUnit), - 0, NULL, NULL - }; - - spec_type = g_type_register_static (G_TYPE_PARAM_INT, - "GimpParamUnit", - &type_info, 0); - } - - return spec_type; -} - -static void -gimp_param_unit_class_init (GParamSpecClass *class) -{ - class->value_type = GIMP_TYPE_UNIT; - class->value_validate = gimp_param_unit_value_validate; -} - -static gboolean -gimp_param_unit_value_validate (GParamSpec *pspec, - GValue *value) -{ - GParamSpecInt *ispec = G_PARAM_SPEC_INT (pspec); - GimpParamSpecUnit *uspec = GIMP_PARAM_SPEC_UNIT (pspec); - gint oval = value->data[0].v_int; - - if (uspec->allow_percent && value->data[0].v_int == GIMP_UNIT_PERCENT) - { - value->data[0].v_int = value->data[0].v_int; - } - else - { - value->data[0].v_int = CLAMP (value->data[0].v_int, - ispec->minimum, - gimp_unit_get_number_of_units () - 1); - } - - return value->data[0].v_int != oval; -} - -GParamSpec * -gimp_param_spec_unit (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean allow_pixels, - gboolean allow_percent, - GimpUnit default_value, - GParamFlags flags) -{ - GimpParamSpecUnit *pspec; - GParamSpecInt *ispec; - - pspec = g_param_spec_internal (GIMP_TYPE_PARAM_UNIT, - name, nick, blurb, flags); - - ispec = G_PARAM_SPEC_INT (pspec); - - ispec->default_value = default_value; - ispec->minimum = allow_pixels ? GIMP_UNIT_PIXEL : GIMP_UNIT_INCH; - ispec->maximum = GIMP_UNIT_PERCENT - 1; - - pspec->allow_percent = allow_percent; - - return G_PARAM_SPEC (pspec); -} diff --git a/app/config/gimpconfig-params.h b/app/config/gimpconfig-params.h index 8b8db7eca5..1bdb3b8738 100644 --- a/app/config/gimpconfig-params.h +++ b/app/config/gimpconfig-params.h @@ -51,100 +51,6 @@ GIMP_PARAM_SERIALIZE) -/* - * GIMP_TYPE_PARAM_RGB - */ - -#define GIMP_TYPE_PARAM_RGB (gimp_param_rgb_get_type ()) -#define GIMP_IS_PARAM_SPEC_RGB(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_RGB)) - -GType gimp_param_rgb_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_rgb (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpRGB *default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_MATRIX2 - */ - -#define GIMP_TYPE_PARAM_MATRIX2 (gimp_param_matrix2_get_type ()) -#define GIMP_IS_PARAM_SPEC_MATRIX2(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MATRIX2)) - -GType gimp_param_matrix2_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_matrix2 (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpMatrix2 *default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_MEMSIZE - */ - -#define GIMP_TYPE_PARAM_MEMSIZE (gimp_param_memsize_get_type ()) -#define GIMP_IS_PARAM_SPEC_MEMSIZE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MEMSIZE)) - -GType gimp_param_memsize_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_memsize (const gchar *name, - const gchar *nick, - const gchar *blurb, - guint64 minimum, - guint64 maximum, - guint64 default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_PATH - */ - -typedef enum -{ - GIMP_PARAM_PATH_FILE, - GIMP_PARAM_PATH_FILE_LIST, - GIMP_PARAM_PATH_DIR, - GIMP_PARAM_PATH_DIR_LIST -} GimpParamPathType; - -#define GIMP_TYPE_PARAM_PATH (gimp_param_path_get_type ()) -#define GIMP_IS_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATH)) - -GType gimp_param_path_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_path (const gchar *name, - const gchar *nick, - const gchar *blurb, - GimpParamPathType type, - gchar *default_value, - GParamFlags flags); - -GimpParamPathType gimp_param_spec_path_type (GParamSpec *pspec); - - -/* - * GIMP_TYPE_PARAM_UNIT - */ - -#define GIMP_TYPE_PARAM_UNIT (gimp_param_unit_get_type ()) -#define GIMP_IS_PARAM_SPEC_UNIT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_UNIT)) - -GType gimp_param_unit_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_unit (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean allow_pixels, - gboolean allow_percent, - GimpUnit default_value, - GParamFlags flags); - /* some convenience macros to install object properties */ diff --git a/app/config/gimpconfig-serialize.c b/app/config/gimpconfig-serialize.c index 7303140b98..e1f5464103 100644 --- a/app/config/gimpconfig-serialize.c +++ b/app/config/gimpconfig-serialize.c @@ -32,7 +32,6 @@ #include "gimpconfig.h" #include "gimpconfig-params.h" #include "gimpconfig-serialize.h" -#include "gimpconfig-types.h" #include "gimpconfig-utils.h" #include "gimpconfigwriter.h" diff --git a/app/config/gimpconfig-types.c b/app/config/gimpconfig-types.c deleted file mode 100644 index ba3a8f7468..0000000000 --- a/app/config/gimpconfig-types.c +++ /dev/null @@ -1,70 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * ParamSpecs for config objects - * Copyright (C) 2001 Sven Neumann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "libgimpmath/gimpmath.h" - -#include "config-types.h" - -#include "gimpconfig-types.h" - - -static GimpMatrix2 * matrix2_copy (const GimpMatrix2 *matrix); - - -GType -gimp_matrix2_get_type (void) -{ - static GType matrix_type = 0; - - if (!matrix_type) - matrix_type = g_boxed_type_register_static ("GimpMatrix2", - (GBoxedCopyFunc) matrix2_copy, - (GBoxedFreeFunc) g_free); - - return matrix_type; -} - -static GimpMatrix2 * -matrix2_copy (const GimpMatrix2 *matrix) -{ - return (GimpMatrix2 *) g_memdup (matrix, sizeof (GimpMatrix2)); -} - - -GType -gimp_path_get_type (void) -{ - static GType path_type = 0; - - if (!path_type) - { - static const GTypeInfo type_info = { 0, }; - - path_type = g_type_register_static (G_TYPE_STRING, "GimpPath", - &type_info, 0); - } - - return path_type; -} diff --git a/app/config/gimpconfig-types.h b/app/config/gimpconfig-types.h deleted file mode 100644 index 25a33b31c5..0000000000 --- a/app/config/gimpconfig-types.h +++ /dev/null @@ -1,38 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * ValueTypes for config objects - * Copyright (C) 2001 Sven Neumann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __GIMP_CONFIG_TYPES_H__ -#define __GIMP_CONFIG_TYPES_H__ - - -#define GIMP_TYPE_MATRIX2 (gimp_matrix2_get_type ()) -#define GIMP_VALUE_HOLDS_MATRIX2(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_MATRIX2)) - -GType gimp_matrix2_get_type (void) G_GNUC_CONST; - - -#define GIMP_TYPE_PATH (gimp_path_get_type ()) -#define GIMP_VALUE_HOLDS_PATH(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_PATH)) - -GType gimp_path_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_CONFIG_TYPES_H__ */ diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c index 215432530f..96051eb31e 100644 --- a/app/config/gimpcoreconfig.c +++ b/app/config/gimpcoreconfig.c @@ -33,7 +33,6 @@ #include "gimpconfig.h" #include "gimpconfig-params.h" -#include "gimpconfig-types.h" #include "gimpconfig-utils.h" #include "gimprc-blurbs.h" diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index 66f9eb3ee2..e8b528a931 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -28,7 +28,6 @@ #include "config-types.h" #include "gimpconfig-params.h" -#include "gimpconfig-types.h" #include "gimpconfig-utils.h" #include "gimprc-blurbs.h" diff --git a/app/config/gimppluginconfig.c b/app/config/gimppluginconfig.c index 6a9f4903a2..cc51e1a09f 100644 --- a/app/config/gimppluginconfig.c +++ b/app/config/gimppluginconfig.c @@ -28,7 +28,6 @@ #include "config-types.h" #include "gimpconfig-params.h" -#include "gimpconfig-types.h" #include "gimpconfig-utils.h" #include "gimprc-blurbs.h" diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index 626b929386..e497c67d8d 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -25,12 +25,11 @@ #include #include +#include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" #include "core-types.h" -#include "config/gimpconfig-types.h" - #include "gimp-utils.h" diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index f3238de7ea..6c74c40edb 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -25,6 +25,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" #include "core-types.h" diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c index 4625174b86..57399781a5 100644 --- a/libgimpconfig/gimpconfig-deserialize.c +++ b/libgimpconfig/gimpconfig-deserialize.c @@ -33,7 +33,6 @@ #include "gimpconfig-deserialize.h" #include "gimpconfig-params.h" #include "gimpconfig-path.h" -#include "gimpconfig-types.h" #include "gimpscanner.h" #include "gimp-intl.h" diff --git a/libgimpconfig/gimpconfig-params.h b/libgimpconfig/gimpconfig-params.h index 8b8db7eca5..1bdb3b8738 100644 --- a/libgimpconfig/gimpconfig-params.h +++ b/libgimpconfig/gimpconfig-params.h @@ -51,100 +51,6 @@ GIMP_PARAM_SERIALIZE) -/* - * GIMP_TYPE_PARAM_RGB - */ - -#define GIMP_TYPE_PARAM_RGB (gimp_param_rgb_get_type ()) -#define GIMP_IS_PARAM_SPEC_RGB(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_RGB)) - -GType gimp_param_rgb_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_rgb (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpRGB *default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_MATRIX2 - */ - -#define GIMP_TYPE_PARAM_MATRIX2 (gimp_param_matrix2_get_type ()) -#define GIMP_IS_PARAM_SPEC_MATRIX2(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MATRIX2)) - -GType gimp_param_matrix2_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_matrix2 (const gchar *name, - const gchar *nick, - const gchar *blurb, - const GimpMatrix2 *default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_MEMSIZE - */ - -#define GIMP_TYPE_PARAM_MEMSIZE (gimp_param_memsize_get_type ()) -#define GIMP_IS_PARAM_SPEC_MEMSIZE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MEMSIZE)) - -GType gimp_param_memsize_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_memsize (const gchar *name, - const gchar *nick, - const gchar *blurb, - guint64 minimum, - guint64 maximum, - guint64 default_value, - GParamFlags flags); - - -/* - * GIMP_TYPE_PARAM_PATH - */ - -typedef enum -{ - GIMP_PARAM_PATH_FILE, - GIMP_PARAM_PATH_FILE_LIST, - GIMP_PARAM_PATH_DIR, - GIMP_PARAM_PATH_DIR_LIST -} GimpParamPathType; - -#define GIMP_TYPE_PARAM_PATH (gimp_param_path_get_type ()) -#define GIMP_IS_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATH)) - -GType gimp_param_path_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_path (const gchar *name, - const gchar *nick, - const gchar *blurb, - GimpParamPathType type, - gchar *default_value, - GParamFlags flags); - -GimpParamPathType gimp_param_spec_path_type (GParamSpec *pspec); - - -/* - * GIMP_TYPE_PARAM_UNIT - */ - -#define GIMP_TYPE_PARAM_UNIT (gimp_param_unit_get_type ()) -#define GIMP_IS_PARAM_SPEC_UNIT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_UNIT)) - -GType gimp_param_unit_get_type (void) G_GNUC_CONST; - -GParamSpec * gimp_param_spec_unit (const gchar *name, - const gchar *nick, - const gchar *blurb, - gboolean allow_pixels, - gboolean allow_percent, - GimpUnit default_value, - GParamFlags flags); - /* some convenience macros to install object properties */ diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c index 7303140b98..e1f5464103 100644 --- a/libgimpconfig/gimpconfig-serialize.c +++ b/libgimpconfig/gimpconfig-serialize.c @@ -32,7 +32,6 @@ #include "gimpconfig.h" #include "gimpconfig-params.h" #include "gimpconfig-serialize.h" -#include "gimpconfig-types.h" #include "gimpconfig-utils.h" #include "gimpconfigwriter.h"