gegl r2931 - in trunk: . gegl gegl/graph gegl/process

[martinn svn gnome org]

Author: martinn
Date: Sun Feb 22 09:14:25 2009
New Revision: 2931
URL: http://svn.gnome.org/viewvc/gegl?rev=2931&view=rev

Log:
Clean up gegl-types.h

Clean up gegl-types.h and remove protected internal duplicate defines

Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-types.h
   trunk/gegl/gegl-utils.h
   trunk/gegl/graph/gegl-node.h
   trunk/gegl/process/gegl-processor.h

Modified: trunk/gegl/gegl-types.h
==============================================================================
--- trunk/gegl/gegl-types.h	(original)
+++ trunk/gegl/gegl-types.h	Sun Feb 22 09:14:25 2009
@@ -22,60 +22,48 @@
 
 G_BEGIN_DECLS
 
-#ifndef GEGL_TYPE_NODE
-typedef struct _GeglNode  GeglNode;
-GType gegl_node_get_type  (void) G_GNUC_CONST;
-#define GEGL_TYPE_NODE    (gegl_node_get_type())
-#define GEGL_NODE(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_NODE, GeglNode))
-#define GEGL_IS_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_NODE))
-#endif
+#define GEGL_AUTO_ROWSTRIDE 0
 
-typedef struct _GeglRectangle GeglRectangle;
-GType gegl_rectangle_get_type (void) G_GNUC_CONST;
-#define GEGL_TYPE_RECTANGLE   (gegl_rectangle_get_type())
+typedef enum
+{
+  GEGL_PARAM_PAD_OUTPUT = 1 << G_PARAM_USER_SHIFT,
+  GEGL_PARAM_PAD_INPUT  = 1 << (G_PARAM_USER_SHIFT + 1)
+} GeglPadType;
 
-#ifndef GEGL_BLIT_FLAGS
-#define  GEGL_BLIT_FLAGS
 typedef enum
 {
   GEGL_BLIT_DEFAULT  = 0,
   GEGL_BLIT_CACHE    = 1 << 0,
   GEGL_BLIT_DIRTY    = 1 << 1
 } GeglBlitFlags;
-#endif
-
-#ifndef GEGL_AUTO_ROWSTRIDE
-#define GEGL_AUTO_ROWSTRIDE 0
-#endif
-
-typedef struct _GeglProcessor  GeglProcessor;
-GType gegl_processor_get_type  (void) G_GNUC_CONST;
-#define GEGL_TYPE_PROCESSOR    (gegl_processor_get_type())
-#define GEGL_PROCESSOR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROCESSOR, GeglProcessor))
-#define GEGL_IS_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROCESSOR))
 
 typedef struct _GeglConfig GeglConfig;
+typedef struct _GeglCurve  GeglCurve;
+typedef struct _GeglPath   GeglPath;
+typedef struct _GeglColor  GeglColor;
 
-
-struct _GeglRectangle
+typedef struct _GeglRectangle
 {
   gint x;
   gint y;
   gint width;
   gint height;
-};
+} GeglRectangle;
+GType gegl_rectangle_get_type (void) G_GNUC_CONST;
+#define GEGL_TYPE_RECTANGLE   (gegl_rectangle_get_type())
 
-#define GEGL_PAD_TYPE
+typedef struct _GeglNode  GeglNode;
+GType gegl_node_get_type  (void) G_GNUC_CONST;
+#define GEGL_TYPE_NODE    (gegl_node_get_type())
+#define GEGL_NODE(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_NODE, GeglNode))
+#define GEGL_IS_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_NODE))
 
-typedef enum
-{
-  GEGL_PARAM_PAD_OUTPUT = 1 << G_PARAM_USER_SHIFT,
-  GEGL_PARAM_PAD_INPUT  = 1 << (G_PARAM_USER_SHIFT + 1)
-} GeglPadType;
+typedef struct _GeglProcessor  GeglProcessor;
+GType gegl_processor_get_type  (void) G_GNUC_CONST;
+#define GEGL_TYPE_PROCESSOR    (gegl_processor_get_type())
+#define GEGL_PROCESSOR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROCESSOR, GeglProcessor))
+#define GEGL_IS_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROCESSOR))
 
-typedef struct _GeglCurve  GeglCurve;
-typedef struct _GeglPath   GeglPath;
-typedef struct _GeglColor  GeglColor;
 
 G_END_DECLS
 

Modified: trunk/gegl/gegl-utils.h
==============================================================================
--- trunk/gegl/gegl-utils.h	(original)
+++ trunk/gegl/gegl-utils.h	Sun Feb 22 09:14:25 2009
@@ -167,15 +167,6 @@
 void     gegl_free                    (gpointer mem);
 
 
-/***
- */
-
-GType       gegl_rectangle_get_type      (void) G_GNUC_CONST;
-
-#ifndef __GEGL_H__
-#define     GEGL_TYPE_RECTANGLE            (gegl_rectangle_get_type ())
-#endif
-
 #define GEGL_FLOAT_EPSILON            (1e-5)
 #define GEGL_FLOAT_IS_ZERO(value)     (_gegl_float_epsilon_zero ((value)))
 #define GEGL_FLOAT_EQUAL(v1, v2)      (_gegl_float_epsilon_equal ((v1), (v2)))

Modified: trunk/gegl/graph/gegl-node.h
==============================================================================
--- trunk/gegl/graph/gegl-node.h	(original)
+++ trunk/gegl/graph/gegl-node.h	Sun Feb 22 09:14:25 2009
@@ -26,14 +26,10 @@
 
 G_BEGIN_DECLS
 
-#ifndef GEGL_TYPE_NODE
-#define GEGL_TYPE_NODE            (gegl_node_get_type ())
-#define GEGL_NODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_NODE, GeglNode))
 #define GEGL_NODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_NODE, GeglNodeClass))
-#define GEGL_IS_NODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_NODE))
 #define GEGL_IS_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_NODE))
 #define GEGL_NODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_NODE, GeglNodeClass))
-#endif
+/* The rest is in gegl-types.h */
 
 
 typedef struct _GeglNodeClass   GeglNodeClass;
@@ -72,16 +68,6 @@
   GeglNodePrivate *priv;
 };
 
-#ifndef GEGL_BLIT_FLAGS
-#define GEGL_BLIT_FLAGS
-typedef enum
-{
-  GEGL_BLIT_DEFAULT  = 0,
-  GEGL_BLIT_CACHE    = 1 << 0,
-  GEGL_BLIT_DIRTY    = 1 << 1,
-} GeglBlitFlags;
-#endif
-
 struct _GeglNodeClass
 {
   GObjectClass parent_class;

Modified: trunk/gegl/process/gegl-processor.h
==============================================================================
--- trunk/gegl/process/gegl-processor.h	(original)
+++ trunk/gegl/process/gegl-processor.h	Sun Feb 22 09:14:25 2009
@@ -23,14 +23,11 @@
 
 G_BEGIN_DECLS
 
-#ifndef GEGL_TYPE_PROCESSOR
-#define GEGL_TYPE_PROCESSOR            (gegl_processor_get_type ())
-#define GEGL_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROCESSOR, GeglProcessor))
 #define GEGL_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_PROCESSOR, GeglProcessorClass))
-#define GEGL_IS_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROCESSOR))
 #define GEGL_IS_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_PROCESSOR))
 #define GEGL_PROCESSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_PROCESSOR, GeglProcessorClass))
-#endif
+/* The rest is in gegl-types.h */
+
 
 typedef struct _GeglProcessorClass GeglProcessorClass;