From 79126b324b568335847a662274c1999e8c2d4536 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 8 Apr 2017 23:42:44 +0200 Subject: [PATCH] Remove enum collisions with libgimpbase/gimpcompatenums.h --- libgimpbase/gimpbaseenums.h | 97 --------------------------------------------- 1 file changed, 97 deletions(-) diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 745db1574d..7cd3982c4c 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -47,16 +47,6 @@ typedef enum GIMP_ADD_MASK_SELECTION, /*< desc="_Selection" >*/ GIMP_ADD_MASK_COPY, /*< desc="_Grayscale copy of layer" >*/ GIMP_ADD_MASK_CHANNEL, /*< desc="C_hannel" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_ADD_WHITE_MASK = GIMP_ADD_MASK_WHITE, /*< skip, pdb-skip >*/ - GIMP_ADD_BLACK_MASK = GIMP_ADD_MASK_BLACK, /*< skip, pdb-skip >*/ - GIMP_ADD_ALPHA_MASK = GIMP_ADD_MASK_ALPHA, /*< skip, pdb-skip >*/ - GIMP_ADD_ALPHA_TRANSFER_MASK = GIMP_ADD_MASK_ALPHA_TRANSFER, /*< skip, pdb-skip >*/ - GIMP_ADD_SELECTION_MASK = GIMP_ADD_MASK_SELECTION, /*< skip, pdb-skip >*/ - GIMP_ADD_COPY_MASK = GIMP_ADD_MASK_COPY, /*< skip, pdb-skip >*/ - GIMP_ADD_CHANNEL_MASK = GIMP_ADD_MASK_CHANNEL /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpAddMaskType; @@ -70,13 +60,6 @@ typedef enum GIMP_BLEND_FG_BG_HSV, /*< desc="FG to BG (HSV)" >*/ GIMP_BLEND_FG_TRANSPARENT, /*< desc="FG to transparent" >*/ GIMP_BLEND_CUSTOM, /*< desc="Custom gradient" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_FG_BG_RGB_MODE = GIMP_BLEND_FG_BG_RGB, /*< skip, pdb-skip >*/ - GIMP_FG_BG_HSV_MODE = GIMP_BLEND_FG_BG_HSV, /*< skip, pdb-skip >*/ - GIMP_FG_TRANSPARENT_MODE = GIMP_BLEND_FG_TRANSPARENT, /*< skip, pdb-skip >*/ - GIMP_CUSTOM_MODE = GIMP_BLEND_CUSTOM /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpBlendMode; @@ -101,12 +84,6 @@ typedef enum GIMP_BUCKET_FILL_FG, /*< desc="FG color fill" >*/ GIMP_BUCKET_FILL_BG, /*< desc="BG color fill" >*/ GIMP_BUCKET_FILL_PATTERN, /*< desc="Pattern fill" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_FG_BUCKET_FILL = GIMP_BUCKET_FILL_FG, /*< skip, pdb-skip >*/ - GIMP_BG_BUCKET_FILL = GIMP_BUCKET_FILL_BG, /*< skip, pdb-skip >*/ - GIMP_PATTERN_BUCKET_FILL = GIMP_BUCKET_FILL_PATTERN /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpBucketFillMode; @@ -147,15 +124,6 @@ typedef enum GIMP_CHANNEL_GRAY, /*< desc="Gray" >*/ GIMP_CHANNEL_INDEXED, /*< desc="Indexed" >*/ GIMP_CHANNEL_ALPHA, /*< desc="Alpha" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_RED_CHANNEL = GIMP_CHANNEL_RED, /*< skip, pdb-skip >*/ - GIMP_GREEN_CHANNEL = GIMP_CHANNEL_GREEN, /*< skip, pdb-skip >*/ - GIMP_BLUE_CHANNEL = GIMP_CHANNEL_BLUE, /*< skip, pdb-skip >*/ - GIMP_GRAY_CHANNEL = GIMP_CHANNEL_GRAY, /*< skip, pdb-skip >*/ - GIMP_INDEXED_CHANNEL = GIMP_CHANNEL_INDEXED, /*< skip, pdb-skip >*/ - GIMP_ALPHA_CHANNEL = GIMP_CHANNEL_ALPHA /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpChannelType; @@ -194,11 +162,6 @@ typedef enum { GIMP_CLONE_IMAGE, /*< desc="Image" >*/ GIMP_CLONE_PATTERN, /*< desc="Pattern" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_IMAGE_CLONE = GIMP_CLONE_IMAGE, /*< skip, pdb-skip >*/ - GIMP_PATTERN_CLONE = GIMP_CLONE_PATTERN /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpCloneType; @@ -246,14 +209,6 @@ typedef enum GIMP_CONVERT_PALETTE_WEB, /*< desc="Use web-optimized palette" >*/ GIMP_CONVERT_PALETTE_MONO, /*< desc="Use black and white (1-bit) palette" >*/ GIMP_CONVERT_PALETTE_CUSTOM, /*< desc="Use custom palette" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_MAKE_PALETTE = GIMP_CONVERT_PALETTE_GENERATE, /*< skip, pdb-skip >*/ - GIMP_REUSE_PALETTE = GIMP_CONVERT_PALETTE_REUSE, /*< skip, pdb-skip >*/ - GIMP_WEB_PALETTE = GIMP_CONVERT_PALETTE_WEB, /*< skip, pdb-skip >*/ - GIMP_MONO_PALETTE = GIMP_CONVERT_PALETTE_MONO, /*< skip, pdb-skip >*/ - GIMP_CUSTOM_PALETTE = GIMP_CONVERT_PALETTE_CUSTOM /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpConvertPaletteType; @@ -265,11 +220,6 @@ typedef enum { GIMP_CONVOLVE_BLUR, /*< desc="Blur" >*/ GIMP_CONVOLVE_SHARPEN, /*< desc="Sharpen" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_BLUR_CONVOLVE = GIMP_CONVOLVE_BLUR, /*< skip, pdb-skip >*/ - GIMP_SHARPEN_CONVOLVE = GIMP_CONVOLVE_SHARPEN /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpConvolveType; @@ -284,10 +234,6 @@ typedef enum GIMP_DESATURATE_AVERAGE, /*< desc="Average (HSI Intensity)" >*/ GIMP_DESATURATE_LUMINANCE, /*< desc="Luminance" >*/ GIMP_DESATURATE_VALUE, /*< desc="Value (HSV)" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_DESATURATE_LUMINOSITY = GIMP_DESATURATE_LUMA /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpDesaturateMode; @@ -299,11 +245,6 @@ typedef enum { GIMP_DODGE_BURN_TYPE_DODGE, /*< desc="Dodge" >*/ GIMP_DODGE_BURN_TYPE_BURN, /*< desc="Burn" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_DODGE = GIMP_DODGE_BURN_TYPE_DODGE, /*< skip, pdb-skip >*/ - GIMP_BURN = GIMP_DODGE_BURN_TYPE_BURN /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpDodgeBurnType; @@ -318,14 +259,6 @@ typedef enum GIMP_FILL_WHITE, /*< desc="White" >*/ GIMP_FILL_TRANSPARENT, /*< desc="Transparency" >*/ GIMP_FILL_PATTERN, /*< desc="Pattern" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_FOREGROUND_FILL = GIMP_FILL_FOREGROUND, /*< skip, pdb-skip >*/ - GIMP_BACKGROUND_FILL = GIMP_FILL_BACKGROUND, /*< skip, pdb-skip >*/ - GIMP_WHITE_FILL = GIMP_FILL_WHITE, /*< skip, pdb-skip >*/ - GIMP_TRANSPARENT_FILL = GIMP_FILL_TRANSPARENT, /*< skip, pdb-skip >*/ - GIMP_PATTERN_FILL = GIMP_FILL_PATTERN /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpFillType; @@ -413,16 +346,6 @@ typedef enum GIMP_HUE_RANGE_CYAN, GIMP_HUE_RANGE_BLUE, GIMP_HUE_RANGE_MAGENTA, - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_ALL_HUES = GIMP_HUE_RANGE_ALL, /*< skip, pdb-skip >*/ - GIMP_RED_HUES = GIMP_HUE_RANGE_RED, /*< skip, pdb-skip >*/ - GIMP_YELLOW_HUES = GIMP_HUE_RANGE_YELLOW, /*< skip, pdb-skip >*/ - GIMP_GREEN_HUES = GIMP_HUE_RANGE_GREEN, /*< skip, pdb-skip >*/ - GIMP_CYAN_HUES = GIMP_HUE_RANGE_CYAN, /*< skip, pdb-skip >*/ - GIMP_BLUE_HUES = GIMP_HUE_RANGE_BLUE, /*< skip, pdb-skip >*/ - GIMP_MAGENTA_HUES = GIMP_HUE_RANGE_MAGENTA /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpHueRange; @@ -435,10 +358,6 @@ typedef enum GIMP_ICON_TYPE_ICON_NAME, /*< desc="Icon name" >*/ GIMP_ICON_TYPE_INLINE_PIXBUF, /*< desc="Inline pixbuf" >*/ GIMP_ICON_TYPE_IMAGE_FILE, /*< desc="Image file" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_ICON_TYPE_STOCK_ID = GIMP_ICON_TYPE_ICON_NAME /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpIconType; @@ -492,10 +411,6 @@ typedef enum GIMP_INTERPOLATION_CUBIC, /*< desc="Cubic" >*/ GIMP_INTERPOLATION_NOHALO, /*< desc="NoHalo" >*/ GIMP_INTERPOLATION_LOHALO, /*< desc="LoHalo" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_INTERPOLATION_LANCZOS = GIMP_INTERPOLATION_NOHALO /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpInterpolationType; @@ -610,12 +525,6 @@ typedef enum GIMP_PDB_PARASITE, GIMP_PDB_STATUS, GIMP_PDB_END, - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_PDB_PATH = GIMP_PDB_VECTORS, /*< skip >*/ - GIMP_PDB_BOUNDARY = GIMP_PDB_COLORARRAY, /*< skip >*/ - GIMP_PDB_REGION = GIMP_PDB_ITEM /*< skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpPDBArgType; @@ -827,12 +736,6 @@ typedef enum GIMP_TRANSFER_SHADOWS, /*< desc="Shadows" >*/ GIMP_TRANSFER_MIDTONES, /*< desc="Midtones" >*/ GIMP_TRANSFER_HIGHLIGHTS, /*< desc="Highlights" >*/ - -#ifndef GIMP_DISABLE_DEPRECATED - GIMP_SHADOWS = GIMP_TRANSFER_SHADOWS, /*< skip, pdb-skip >*/ - GIMP_MIDTONES = GIMP_TRANSFER_MIDTONES, /*< skip, pdb-skip >*/ - GIMP_HIGHLIGHTS = GIMP_TRANSFER_HIGHLIGHTS /*< skip, pdb-skip >*/ -#endif /* GIMP_DISABLE_DEPRECATED */ } GimpTransferMode; -- 2.12.2