gegl r1970 - in trunk: . gegl
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r1970 - in trunk: . gegl
- Date: Tue, 5 Feb 2008 20:09:07 +0000 (GMT)
Author: neo
Date: Tue Feb 5 20:09:06 2008
New Revision: 1970
URL: http://svn.gnome.org/viewvc/gegl?rev=1970&view=rev
Log:
2008-02-05 Sven Neumann <sven gimp org>
* gegl/gegl-utils.[ch]: removed gegl_canonicalize_identifier()
again.
* gegl/gegl-chant.h: removed name and nick canonicalization
again.
Modified:
trunk/ChangeLog
trunk/gegl/gegl-chant.h
trunk/gegl/gegl-utils.c
trunk/gegl/gegl-utils.h
Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h (original)
+++ trunk/gegl/gegl-chant.h Tue Feb 5 20:09:06 2008
@@ -592,126 +592,102 @@
gegl_chant_class_init (gpointer klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- gchar *canon;
object_class->set_property = set_property;
object_class->get_property = get_property;
object_class->constructor = gegl_chant_constructor;
- canon = NULL;
-
/* g_type_class_add_private (klass, sizeof (GeglChantO));*/
#define gegl_chant_int(name, min, max, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_int (canon, canon, blurb, \
+ g_param_spec_int (#name, #name, blurb, \
min, max, def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_double(name, min, max, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_double (canon, canon, blurb, \
+ g_param_spec_double (#name, #name, blurb, \
min, max, def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_boolean(name, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_boolean (canon, canon, blurb,\
+ g_param_spec_boolean (#name, #name, blurb,\
def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_string(name, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_string (canon, canon, blurb, \
+ g_param_spec_string (#name, #name, blurb, \
def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_path(name, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- gegl_param_spec_path (canon, canon, blurb,\
+ gegl_param_spec_path (#name, #name, blurb,\
FALSE, FALSE, \
def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_multiline(name, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- gegl_param_spec_multiline (canon, canon, blurb, \
+ gegl_param_spec_multiline (#name, #name, blurb, \
def, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_object(name, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_object (canon, canon, blurb, \
+ g_param_spec_object (#name, #name, blurb, \
G_TYPE_OBJECT, \
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_pointer(name, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- g_param_spec_pointer (canon, canon, blurb,\
+ g_param_spec_pointer (#name, #name, blurb,\
(GParamFlags) ( \
G_PARAM_READWRITE | \
G_PARAM_CONSTRUCT | \
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_color(name, def, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- gegl_param_spec_color_from_string (canon, canon, blurb,\
+ gegl_param_spec_color_from_string (#name, #name, blurb,\
def, \
(GParamFlags) ( \
G_PARAM_READWRITE |\
G_PARAM_CONSTRUCT |\
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_curve(name, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- gegl_param_spec_curve (canon, canon, blurb,\
+ gegl_param_spec_curve (#name, #name, blurb,\
gegl_curve_default_curve(),\
(GParamFlags) ( \
G_PARAM_READWRITE |\
G_PARAM_CONSTRUCT |\
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
#define gegl_chant_vector(name, blurb) \
- canon = gegl_canonicalize_identifier (#name); \
g_object_class_install_property (object_class, PROP_##name, \
- gegl_param_spec_vector (canon, canon, blurb,\
+ gegl_param_spec_vector (#name, #name, blurb,\
NULL, \
(GParamFlags) ( \
G_PARAM_READWRITE |\
G_PARAM_CONSTRUCT |\
- GEGL_PARAM_PAD_INPUT)));\
- g_free (canon);
+ GEGL_PARAM_PAD_INPUT)));
+
#include GEGL_CHANT_C_FILE
Modified: trunk/gegl/gegl-utils.c
==============================================================================
--- trunk/gegl/gegl-utils.c (original)
+++ trunk/gegl/gegl-utils.c Tue Feb 5 20:09:06 2008
@@ -269,33 +269,6 @@
}
-gchar *
-gegl_canonicalize_identifier (const gchar *identifier)
-{
- gchar *canonicalized = NULL;
-
- if (identifier)
- {
- gchar *p;
-
- canonicalized = g_strdup (identifier);
-
- for (p = canonicalized; *p != 0; p++)
- {
- gchar c = *p;
-
- if (c != '-' &&
- (c < '0' || c > '9') &&
- (c < 'A' || c > 'Z') &&
- (c < 'a' || c > 'z'))
- *p = '-';
- }
- }
-
- return canonicalized;
-}
-
-
static GeglRectangle *
gegl_rectangle_dup (const GeglRectangle *rectangle)
{
Modified: trunk/gegl/gegl-utils.h
==============================================================================
--- trunk/gegl/gegl-utils.h (original)
+++ trunk/gegl/gegl-utils.h Tue Feb 5 20:09:06 2008
@@ -44,8 +44,6 @@
gboolean gegl_rectangle_contains (const GeglRectangle *r,
const GeglRectangle *s);
-gchar * gegl_canonicalize_identifier (const gchar *identifier);
-
void gegl_log_debug (const gchar *file,
gint line,
const gchar *function,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
