babl r369 - in trunk: . babl

[martinn svn gnome org]

Author: martinn
Date: Sat Jan 17 13:06:48 2009
New Revision: 369
URL: http://svn.gnome.org/viewvc/babl?rev=369&view=rev

Log:
Don't redeclare functions declared with the BABL_CLASS() or
BABL_NAMED_CLASS() macros.

* babl-component.h
* babl-conversion.h
* babl-extension.h
* babl-fish.h
* babl-format.h
* babl-image.h
* babl-model.h
* babl-sampling.h
* babl-type.h


Modified:
   trunk/ChangeLog
   trunk/babl/babl-component.h
   trunk/babl/babl-conversion.h
   trunk/babl/babl-extension.h
   trunk/babl/babl-fish.h
   trunk/babl/babl-format.h
   trunk/babl/babl-image.h
   trunk/babl/babl-model.h
   trunk/babl/babl-sampling.h
   trunk/babl/babl-type.h

Modified: trunk/babl/babl-component.h
==============================================================================
--- trunk/babl/babl-component.h	(original)
+++ trunk/babl/babl-component.h	Sat Jan 17 13:06:48 2009
@@ -28,12 +28,6 @@
  * Babl * babl_component_new (const char *name,
  *                            NULL);
  */
-Babl *babl_component_id     (int id);
-void  babl_component_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_component       (const char       *name);
-Babl * babl_component_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

Modified: trunk/babl/babl-conversion.h
==============================================================================
--- trunk/babl/babl-conversion.h	(original)
+++ trunk/babl/babl-conversion.h	Sat Jan 17 13:06:48 2009
@@ -30,12 +30,6 @@
  *                             <"linear"|"planar">, BablConversionFunc conv_func,
  *                              NULL);
  */
-Babl *babl_conversion_id     (int id);
-void  babl_conversion_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_conversion       (const char       *name);
-Babl * babl_conversion_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 /* Type and Format */
 typedef long (*BablFuncLinear)    (char  *src,

Modified: trunk/babl/babl-extension.h
==============================================================================
--- trunk/babl/babl-extension.h	(original)
+++ trunk/babl/babl-extension.h	Sat Jan 17 13:06:48 2009
@@ -26,12 +26,6 @@
 /*
  * BablExtension objects are only used internally in babl.
  */
-Babl *babl_extension_id     (int id);
-void  babl_extension_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_extension       (const char       *name);
-Babl * babl_extension_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

Modified: trunk/babl/babl-fish.h
==============================================================================
--- trunk/babl/babl-fish.h	(original)
+++ trunk/babl/babl-fish.h	Sat Jan 17 13:06:48 2009
@@ -38,10 +38,6 @@
                         void *destination,
                         long  n);
 
-Babl *babl_fish_id     (int id);
-void  babl_fish_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-
 /* BablFish, common base class for various fishes.
  */
 typedef struct

Modified: trunk/babl/babl-format.h
==============================================================================
--- trunk/babl/babl-format.h	(original)
+++ trunk/babl/babl-format.h	Sat Jan 17 13:06:48 2009
@@ -40,12 +40,6 @@
  * components as well. If no name is provided a (long) descriptive
  * name is used.
  */
-Babl *babl_format_id     (int id);
-void  babl_format_each   (BablEachFunction  each_fun,
-                          void             *user_data);
-Babl * babl_format       (const char       *name);
-Babl * babl_format_new   (void             *first_arg,
-                          ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

Modified: trunk/babl/babl-image.h
==============================================================================
--- trunk/babl/babl-image.h	(original)
+++ trunk/babl/babl-image.h	Sat Jan 17 13:06:48 2009
@@ -43,9 +43,7 @@
  */
 Babl * babl_image      (void *first_component,
                         ...) BABL_ARG_NULL_TERMINATED;
-Babl *babl_image_id     (int id);
-void  babl_image_each   (BablEachFunction  each_fun,
-                        void             *user_data);
+
 typedef struct
 {
   BablInstance    instance;

Modified: trunk/babl/babl-model.h
==============================================================================
--- trunk/babl/babl-model.h	(original)
+++ trunk/babl/babl-model.h	Sat Jan 17 13:06:48 2009
@@ -33,12 +33,6 @@
  * name of all the involved components.
  *
  */
-Babl *babl_model_id     (int id);
-void  babl_model_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_model       (const char       *name);
-Babl * babl_model_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

Modified: trunk/babl/babl-sampling.h
==============================================================================
--- trunk/babl/babl-sampling.h	(original)
+++ trunk/babl/babl-sampling.h	Sat Jan 17 13:06:48 2009
@@ -26,9 +26,6 @@
 /**/
 Babl * babl_sampling       (int horizontal,
                             int vertical);
-Babl *babl_sampling_id     (int id);
-void  babl_sampling_each   (BablEachFunction  each_fun,
-                            void             *user_data);
 typedef struct
 {
   BablInstance     instance;

Modified: trunk/babl/babl-type.h
==============================================================================
--- trunk/babl/babl-type.h	(original)
+++ trunk/babl/babl-type.h	Sat Jan 17 13:06:48 2009
@@ -34,12 +34,6 @@
  *                         ["max_val", double max_val,]
  *                         NULL);
  */
-Babl *babl_type_id     (int id);
-void  babl_type_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_type       (const char       *name);
-Babl * babl_type_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {