[gimp/goat-invasion: 480/526] app: remove as much as possible from base-types.h

[Michael Natterer <mitch src gnome org>]

commit 9378ce68e16be1e2577f74868bc29b82cecff14b
Author: Michael Natterer <mitch gimp org>
Date:   Tue Apr 10 22:01:51 2012 +0200

    app: remove as much as possible from base-types.h
    
    Wanted to remove it completely, but that's currently not nicely
    doable.

 app/base/base-types.h       |   14 --------------
 app/base/pixel-processor.h  |    1 +
 app/base/pixel-region.h     |    4 ++++
 app/base/tile-manager.h     |    5 +++++
 app/config/gimpbaseconfig.c |    1 -
 app/core/core-types.h       |    4 +++-
 6 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/app/base/base-types.h b/app/base/base-types.h
index 2a75bcc..ed033e0 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -19,10 +19,6 @@
 #define __BASE_TYPES_H__
 
 
-#include "libgimpbase/gimpbasetypes.h"
-#include "libgimpmath/gimpmathtypes.h"
-#include "libgimpcolor/gimpcolortypes.h"
-
 #include "paint-funcs/paint-funcs-types.h"
 
 #include "core/core-types.h" /* screw include policy in base/ */
@@ -45,9 +41,7 @@
 
 /* types */
 
-typedef struct _PixelRegionIterator PixelRegionIterator;
 typedef struct _PixelRegion         PixelRegion;
-typedef struct _PixelRegionHolder   PixelRegionHolder;
 
 typedef struct _SioxState           SioxState;
 
@@ -56,14 +50,6 @@ typedef struct _TileManager         TileManager;
 typedef struct _TilePyramid         TilePyramid;
 
 
-/*  functions  */
-
-typedef void (* TileValidateProc)   (TileManager *tm,
-                                     Tile        *tile,
-                                     gpointer     user_data);
-typedef void (* PixelProcessorFunc) (void);
-
-
 /*  enums  */
 
 typedef enum
diff --git a/app/base/pixel-processor.h b/app/base/pixel-processor.h
index 74622a3..0a3b775 100644
--- a/app/base/pixel-processor.h
+++ b/app/base/pixel-processor.h
@@ -24,6 +24,7 @@
 #define GIMP_MAX_NUM_THREADS  16
 
 
+typedef void (* PixelProcessorFunc)         (void);
 typedef void (* PixelProcessorProgressFunc) (gpointer  progress_data,
                                              gdouble   fraction);
 
diff --git a/app/base/pixel-region.h b/app/base/pixel-region.h
index 22ea94d..155c088 100644
--- a/app/base/pixel-region.h
+++ b/app/base/pixel-region.h
@@ -36,6 +36,8 @@ struct _PixelRegion
   gint         process_count;  /*  used internally               */
 };
 
+typedef struct _PixelRegionHolder   PixelRegionHolder;
+
 struct _PixelRegionHolder
 {
   PixelRegion *PR;
@@ -45,6 +47,8 @@ struct _PixelRegionHolder
   gint         count;
 };
 
+typedef struct _PixelRegionIterator PixelRegionIterator;
+
 struct _PixelRegionIterator
 {
   GSList *pixel_regions;
diff --git a/app/base/tile-manager.h b/app/base/tile-manager.h
index 3697d18..901d433 100644
--- a/app/base/tile-manager.h
+++ b/app/base/tile-manager.h
@@ -19,6 +19,11 @@
 #define __TILE_MANAGER_H__
 
 
+typedef void (* TileValidateProc)   (TileManager *tm,
+                                     Tile        *tile,
+                                     gpointer     user_data);
+
+
 #define GIMP_TYPE_TILE_MANAGER               (gimp_tile_manager_get_type ())
 #define GIMP_VALUE_HOLDS_TILE_MANAGER(value) (G_TYPE_CHECK_VALUE_TYPE ((value), GIMP_TYPE_TILE_MANAGER))
 
diff --git a/app/config/gimpbaseconfig.c b/app/config/gimpbaseconfig.c
index efee3c8..cac2823 100644
--- a/app/config/gimpbaseconfig.c
+++ b/app/config/gimpbaseconfig.c
@@ -31,7 +31,6 @@
 
 #include "config-types.h"
 
-#include "base/base-types.h" /* eek */
 #include "base/base-utils.h"
 #include "base/pixel-processor.h"
 
diff --git a/app/core/core-types.h b/app/core/core-types.h
index b2945b9..147553e 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -19,9 +19,11 @@
 #define __CORE_TYPES_H__
 
 
+#include "libgimpbase/gimpbasetypes.h"
+#include "libgimpmath/gimpmathtypes.h"
+#include "libgimpcolor/gimpcolortypes.h"
 #include "libgimpmodule/gimpmoduletypes.h"
 #include "libgimpthumb/gimpthumb-types.h"
-#include "libgimpmath/gimpmathtypes.h"
 
 #include "base/base-types.h"
 #include "config/config-types.h"