callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove as much as possible from base-types.h

Browse Source 
Wanted to remove it completely, but that's currently not nicely
doable.
This commit is contained in:
Michael Natterer
2012-04-10 22:01:51 +02:00
parent 685a48d59a
commit 14459cc637
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/base/base-types.h
View File

@ -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

1
app/base/pixel-processor.h
View File

@ -24,6 +24,7 @@
#define GIMP_MAX_NUM_THREADS 16
typedef void (* PixelProcessorFunc) (void);
typedef void (* PixelProcessorProgressFunc) (gpointer progress_data,
gdouble fraction);

4
app/base/pixel-region.h
View File

@ -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;

5
app/base/tile-manager.h
View File

@ -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))

1
app/config/gimpbaseconfig.c
View File

@ -31,7 +31,6 @@
#include "config-types.h"
#include "base/base-types.h" /* eek */
#include "base/base-utils.h"
#include "base/pixel-processor.h"

4
app/core/core-types.h
View File

@ -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"