[gimp/metadata-browser] app: remove more stuff from base-types.h

[Roman Joost <romanofski src gnome org>]

commit 20552934cff679908155b0a0c8b420cc1200c664
Author: Michael Natterer <mitch gimp org>
Date:   Mon May 21 21:56:22 2012 +0200

    app: remove more stuff from base-types.h

 app/base/base-types.h |   31 -------------------------------
 app/base/siox.h       |   20 ++++++++++++++++----
 app/core/core-types.h |   16 ++++++++++++++++
 3 files changed, 32 insertions(+), 35 deletions(-)
---
diff --git a/app/base/base-types.h b/app/base/base-types.h
index 44fb2eb..4866393 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -22,44 +22,13 @@
 #include "core/core-types.h" /* screw include policy in base/ */
 
 
-/* convenient defines */
-#define MAX_CHANNELS  4
-
-#define RED           0
-#define GREEN         1
-#define BLUE          2
-#define ALPHA         3
-
-#define GRAY          0
-#define ALPHA_G       1
-
-#define INDEXED       0
-#define ALPHA_I       1
-
-
 /* types */
 
 typedef struct _PixelRegion         PixelRegion;
 
-typedef struct _SioxState           SioxState;
-
 typedef struct _Tile                Tile;
 typedef struct _TileManager         TileManager;
 typedef struct _TilePyramid         TilePyramid;
 
 
-/*  enums  */
-
-typedef enum
-{
-  SIOX_REFINEMENT_NO_CHANGE          = 0,
-  SIOX_REFINEMENT_ADD_FOREGROUND     = (1 << 0),
-  SIOX_REFINEMENT_ADD_BACKGROUND     = (1 << 1),
-  SIOX_REFINEMENT_CHANGE_SENSITIVITY = (1 << 2),
-  SIOX_REFINEMENT_CHANGE_SMOOTHNESS  = (1 << 3),
-  SIOX_REFINEMENT_CHANGE_MULTIBLOB   = (1 << 4),
-  SIOX_REFINEMENT_RECALCULATE        = 0xFF
-} SioxRefinementType;
-
-
 #endif /* __BASE_TYPES_H__ */
diff --git a/app/base/siox.h b/app/base/siox.h
index 3d6502d..b6d8d1f 100644
--- a/app/base/siox.h
+++ b/app/base/siox.h
@@ -30,6 +30,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if 0
 
 #ifndef __SIOX_H__
 #define __SIOX_H__
@@ -41,13 +42,24 @@
 #define SIOX_DEFAULT_SENSITIVITY_A  1.28
 #define SIOX_DEFAULT_SENSITIVITY_B  2.56
 
-#if 0
-
 /*  FIXME: turn this into an enum  */
 #define SIOX_DRB_ADD                0
 #define SIOX_DRB_SUBTRACT           1
 
 
+typedef enum
+{
+  SIOX_REFINEMENT_NO_CHANGE          = 0,
+  SIOX_REFINEMENT_ADD_FOREGROUND     = (1 << 0),
+  SIOX_REFINEMENT_ADD_BACKGROUND     = (1 << 1),
+  SIOX_REFINEMENT_CHANGE_SENSITIVITY = (1 << 2),
+  SIOX_REFINEMENT_CHANGE_SMOOTHNESS  = (1 << 3),
+  SIOX_REFINEMENT_CHANGE_MULTIBLOB   = (1 << 4),
+  SIOX_REFINEMENT_RECALCULATE        = 0xFF
+} SioxRefinementType;
+
+typedef struct _SioxState           SioxState;
+
 typedef void (* SioxProgressFunc) (gpointer  progress_data,
                                    gdouble   fraction);
 
@@ -81,7 +93,7 @@ void        siox_drb                (SioxState          *state,
                                      gint                brush_mode,
                                      gfloat              threshold);
 
-#endif
-
 
 #endif /* __SIOX_H__ */
+
+#endif
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 147553e..5b79cd5 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -31,6 +31,22 @@
 #include "core/core-enums.h"
 
 
+/*  former base/ defines  */
+
+#define MAX_CHANNELS  4
+
+#define RED           0
+#define GREEN         1
+#define BLUE          2
+#define ALPHA         3
+
+#define GRAY          0
+#define ALPHA_G       1
+
+#define INDEXED       0
+#define ALPHA_I       1
+
+
 /*  defines  */
 
 #define GIMP_COORDS_MIN_PRESSURE      0.0