[gegl] gegl: s/GEGL_HANDLER/GEGL_TILE_HANDLER/g



commit 1cab546afa1bad347fa39095a7b7aa694f2a7e6e
Author: Martin Nordholts <martinn src gnome org>
Date:   Fri Jul 23 00:47:15 2010 +0200

    gegl: s/GEGL_HANDLER/GEGL_TILE_HANDLER/g
    
    For consistentcy, don't call the cast macro for GEGL_TYPE_TILE_HANDLER
    GEGL_HANDLER, instead call it GEGL_TILE_HANDLER.

 gegl/buffer/gegl-buffer.c             |   10 +++++-----
 gegl/buffer/gegl-tile-handler-cache.c |    4 ++--
 gegl/buffer/gegl-tile-handler-empty.c |    2 +-
 gegl/buffer/gegl-tile-handler-log.c   |    2 +-
 gegl/buffer/gegl-tile-handler.c       |    6 +++---
 gegl/buffer/gegl-tile-handler.h       |   14 +++++++-------
 gegl/buffer/gegl-tile-storage.c       |    4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer.c b/gegl/buffer/gegl-buffer.c
index 44f6daa..31664f2 100644
--- a/gegl/buffer/gegl-buffer.c
+++ b/gegl/buffer/gegl-buffer.c
@@ -363,7 +363,7 @@ static void
 gegl_buffer_dispose (GObject *object)
 {
   GeglBuffer  *buffer  = GEGL_BUFFER (object);
-  GeglTileHandler *handler = GEGL_HANDLER (object);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (object);
 
   gegl_buffer_sample_cleanup (buffer);
 
@@ -408,7 +408,7 @@ gegl_buffer_backend (GeglBuffer *buffer)
 
   do
     {
-      tmp = GEGL_HANDLER (tmp)->source;
+      tmp = GEGL_TILE_HANDLER (tmp)->source;
     } while (tmp &&
              /*GEGL_IS_TILE_TRAIT (tmp) &&*/
              !GEGL_IS_TILE_BACKEND (tmp));
@@ -464,7 +464,7 @@ gegl_buffer_constructor (GType                  type,
   object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
 
   buffer    = GEGL_BUFFER (object);
-  handler   = GEGL_HANDLER (object);
+  handler   = GEGL_TILE_HANDLER (object);
   source  = handler->source;
   backend   = gegl_buffer_backend (buffer);
 
@@ -682,7 +682,7 @@ gegl_buffer_get_tile (GeglTileSource *source,
                       gint        y,
                       gint        z)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (source);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (source);
   GeglTile    *tile   = NULL;
   source = handler->source;
 
@@ -737,7 +737,7 @@ gegl_buffer_command (GeglTileSource *source,
                      gint            z,
                      gpointer        data)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (source);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (source);
   switch (command)
     {
       case GEGL_TILE_GET:
diff --git a/gegl/buffer/gegl-tile-handler-cache.c b/gegl/buffer/gegl-tile-handler-cache.c
index 212c866..e0f7846 100644
--- a/gegl/buffer/gegl-tile-handler-cache.c
+++ b/gegl/buffer/gegl-tile-handler-cache.c
@@ -202,7 +202,7 @@ get_tile (GeglTileSource *tile_store,
           gint        z)
 {
   GeglTileHandlerCache *cache    = GEGL_TILE_HANDLER_CACHE (tile_store);
-  GeglTileSource       *source = GEGL_HANDLER (tile_store)->source;
+  GeglTileSource       *source = GEGL_TILE_HANDLER (tile_store)->source;
   GeglTile             *tile     = NULL;
 
   tile = gegl_tile_handler_cache_get_tile (cache, x, y, z);
@@ -234,7 +234,7 @@ gegl_tile_handler_cache_command (GeglTileSource  *tile_store,
                                  gint             z,
                                  gpointer         data)
 {
-  GeglTileHandler      *handler = GEGL_HANDLER (tile_store);
+  GeglTileHandler      *handler = GEGL_TILE_HANDLER (tile_store);
   GeglTileHandlerCache *cache   = GEGL_TILE_HANDLER_CACHE (handler);
 
   switch (command)
diff --git a/gegl/buffer/gegl-tile-handler-empty.c b/gegl/buffer/gegl-tile-handler-empty.c
index 3409db9..de3a029 100644
--- a/gegl/buffer/gegl-tile-handler-empty.c
+++ b/gegl/buffer/gegl-tile-handler-empty.c
@@ -45,7 +45,7 @@ get_tile (GeglTileSource *gegl_tile_source,
           gint            y,
           gint            z)
 {
-  GeglTileSource       *source = GEGL_HANDLER (gegl_tile_source)->source;
+  GeglTileSource       *source = GEGL_TILE_HANDLER (gegl_tile_source)->source;
   GeglTileHandlerEmpty *empty  = GEGL_TILE_HANDLER_EMPTY (gegl_tile_source);
   GeglTile             *tile   = NULL;
 
diff --git a/gegl/buffer/gegl-tile-handler-log.c b/gegl/buffer/gegl-tile-handler-log.c
index b86442a..261f6e7 100644
--- a/gegl/buffer/gegl-tile-handler-log.c
+++ b/gegl/buffer/gegl-tile-handler-log.c
@@ -49,7 +49,7 @@ gegl_tile_handler_log_command (GeglTileSource  *gegl_tile_source,
                                gint             z,
                                gpointer         data)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (gegl_tile_source);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (gegl_tile_source);
   gpointer         result = NULL;
 
   result = gegl_tile_handler_source_command (handler, command, x, y, z, data);
diff --git a/gegl/buffer/gegl-tile-handler.c b/gegl/buffer/gegl-tile-handler.c
index 175bae2..651f77f 100644
--- a/gegl/buffer/gegl-tile-handler.c
+++ b/gegl/buffer/gegl-tile-handler.c
@@ -38,7 +38,7 @@ enum
 static void
 dispose (GObject *object)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (object);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (object);
 
   if (handler->source != NULL)
     {
@@ -68,7 +68,7 @@ get_property (GObject    *gobject,
               GValue     *value,
               GParamSpec *pspec)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (gobject);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (gobject);
 
   switch (property_id)
     {
@@ -104,7 +104,7 @@ set_property (GObject      *gobject,
               const GValue *value,
               GParamSpec   *pspec)
 {
-  GeglTileHandler *handler = GEGL_HANDLER (gobject);
+  GeglTileHandler *handler = GEGL_TILE_HANDLER (gobject);
 
   switch (property_id)
     {
diff --git a/gegl/buffer/gegl-tile-handler.h b/gegl/buffer/gegl-tile-handler.h
index e248d97..9fcfaba 100644
--- a/gegl/buffer/gegl-tile-handler.h
+++ b/gegl/buffer/gegl-tile-handler.h
@@ -16,19 +16,19 @@
  * Copyright 2006,2007 �yvind Kolås <pippin gimp org>
  */
 
-#ifndef __GEGL_HANDLER_H__
-#define __GEGL_HANDLER_H__
+#ifndef __GEGL_TILE_HANDLER_H__
+#define __GEGL_TILE_HANDLER_H__
 
 #include "gegl-tile-source.h"
 
 G_BEGIN_DECLS
 
 #define GEGL_TYPE_TILE_HANDLER       (gegl_tile_handler_get_type ())
-#define GEGL_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER, GeglTileHandler))
-#define GEGL_HANDLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
-#define GEGL_IS_HANDLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER))
-#define GEGL_IS_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_TILE_HANDLER))
-#define GEGL_HANDLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
+#define GEGL_TILE_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_TILE_HANDLER, GeglTileHandler))
+#define GEGL_TILE_HANDLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
+#define GEGL_IS_TILE_HANDLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_TILE_HANDLER))
+#define GEGL_IS_TILE_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_TILE_HANDLER))
+#define GEGL_TILE_HANDLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_TILE_HANDLER, GeglTileHandlerClass))
 
 struct _GeglTileHandler
 {
diff --git a/gegl/buffer/gegl-tile-storage.c b/gegl/buffer/gegl-tile-storage.c
index af951c1..928af25 100644
--- a/gegl/buffer/gegl-tile-storage.c
+++ b/gegl/buffer/gegl-tile-storage.c
@@ -95,7 +95,7 @@ gegl_tile_storage_new (gint tile_width,
     tile_storage->path = g_strdup (path);
 
   tile_handler_chain = GEGL_TILE_HANDLER_CHAIN (tile_storage);
-  handler  = GEGL_HANDLER (tile_storage);
+  handler  = GEGL_TILE_HANDLER (tile_storage);
 
   if (tile_storage->path != NULL)
     {
@@ -135,7 +135,7 @@ gegl_tile_storage_new (gint tile_width,
       iter = iter->next;
     if (iter)
       {
-        gegl_tile_handler_set_source (GEGL_HANDLER (iter->data), handler->source);
+        gegl_tile_handler_set_source (GEGL_TILE_HANDLER (iter->data), handler->source);
       }
   }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]