From 68b4cc661d8219251ed038cc80d659b25cdbae2d Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Thu, 29 Jun 2023 10:06:38 +0200 Subject: [PATCH] clutter: Remove deprecated & unnused enums Part-of: --- clutter/clutter/clutter-enums.h | 107 -------------------- src/tests/clutter/interactive/test-layout.c | 2 - 2 files changed, 109 deletions(-) diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index f69888583..d13a55124 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -30,41 +30,6 @@ G_BEGIN_DECLS -/** - * ClutterGravity: - * @CLUTTER_GRAVITY_NONE: Do not apply any gravity - * @CLUTTER_GRAVITY_NORTH: Scale from topmost downwards - * @CLUTTER_GRAVITY_NORTH_EAST: Scale from the top right corner - * @CLUTTER_GRAVITY_EAST: Scale from the right side - * @CLUTTER_GRAVITY_SOUTH_EAST: Scale from the bottom right corner - * @CLUTTER_GRAVITY_SOUTH: Scale from the bottom upwards - * @CLUTTER_GRAVITY_SOUTH_WEST: Scale from the bottom left corner - * @CLUTTER_GRAVITY_WEST: Scale from the left side - * @CLUTTER_GRAVITY_NORTH_WEST: Scale from the top left corner - * @CLUTTER_GRAVITY_CENTER: Scale from the center. - * - * Gravity of the scaling operations. - * - * When a gravity different than %CLUTTER_GRAVITY_NONE is used, - * an actor is scaled keeping the position of the specified portion - * at the same coordinates. - * - * Deprecated: 1.22: Use the normalized #ClutterActor pivot point instead - */ -typedef enum /*< prefix=CLUTTER_GRAVITY >*/ -{ - CLUTTER_GRAVITY_NONE = 0, - CLUTTER_GRAVITY_NORTH, - CLUTTER_GRAVITY_NORTH_EAST, - CLUTTER_GRAVITY_EAST, - CLUTTER_GRAVITY_SOUTH_EAST, - CLUTTER_GRAVITY_SOUTH, - CLUTTER_GRAVITY_SOUTH_WEST, - CLUTTER_GRAVITY_WEST, - CLUTTER_GRAVITY_NORTH_WEST, - CLUTTER_GRAVITY_CENTER -} ClutterGravity; - /** * ClutterRotateAxis: * @CLUTTER_X_AXIS: Rotate around the X axis @@ -80,21 +45,6 @@ typedef enum /*< prefix=CLUTTER >*/ CLUTTER_Z_AXIS } ClutterRotateAxis; -/** - * ClutterRotateDirection: - * @CLUTTER_ROTATE_CW: Clockwise rotation - * @CLUTTER_ROTATE_CCW: Counter-clockwise rotation - * - * Direction of a rotation. - * - * Deprecated: 1.22 - */ -typedef enum /*< prefix=CLUTTER_ROTATE >*/ -{ - CLUTTER_ROTATE_CW, - CLUTTER_ROTATE_CCW -} ClutterRotateDirection; - /** * ClutterRequestMode: * @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests @@ -517,21 +467,6 @@ typedef enum /*< prefix=CLUTTER_ALIGN >*/ CLUTTER_ALIGN_BOTH } ClutterAlignAxis; -/** - * ClutterInterpolation: - * @CLUTTER_INTERPOLATION_LINEAR: linear interpolation - * @CLUTTER_INTERPOLATION_CUBIC: cubic interpolation - * - * The mode of interpolation between key frames - * - * Deprecated: 1.22 - */ -typedef enum -{ - CLUTTER_INTERPOLATION_LINEAR, - CLUTTER_INTERPOLATION_CUBIC -} ClutterInterpolation; - /** * ClutterBinAlignment: * @CLUTTER_BIN_ALIGNMENT_FIXED: Fixed position alignment; the @@ -1079,48 +1014,6 @@ typedef enum /*< prefix=CLUTTER_PAN >*/ CLUTTER_PAN_AXIS_AUTO } ClutterPanAxis; -/** - * ClutterTextureFlags: - * @CLUTTER_TEXTURE_NONE: No flags - * @CLUTTER_TEXTURE_RGB_FLAG_BGR: Unused flag - * @CLUTTER_TEXTURE_RGB_FLAG_PREMULT: Unused flag - * @CLUTTER_TEXTURE_YUV_FLAG_YUV2: Unused flag - * - * Flags for clutter_texture_set_from_rgb_data(). - * - * Deprecated: 1.22: The #ClutterTexture class was the only user of - * this API - */ -typedef enum /*< prefix=CLUTTER_TEXTURE >*/ -{ - CLUTTER_TEXTURE_NONE = 0, - CLUTTER_TEXTURE_RGB_FLAG_BGR = 1 << 1, - CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */ - CLUTTER_TEXTURE_YUV_FLAG_YUV2 = 1 << 3 -} ClutterTextureFlags; - -/** - * ClutterTextureQuality: - * @CLUTTER_TEXTURE_QUALITY_LOW: fastest rendering will use nearest neighbour - * interpolation when rendering. good setting. - * @CLUTTER_TEXTURE_QUALITY_MEDIUM: higher quality rendering without using - * extra resources. - * @CLUTTER_TEXTURE_QUALITY_HIGH: render the texture with the best quality - * available using extra memory. - * - * Enumaration controlling the texture quality. - * - * Deprecated: 1.22: The #ClutterTexture class was the only user of - * this API; use #ClutterImage and clutter_actor_set_content_scaling_filters() - * instead. - */ -typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/ -{ - CLUTTER_TEXTURE_QUALITY_LOW, - CLUTTER_TEXTURE_QUALITY_MEDIUM, - CLUTTER_TEXTURE_QUALITY_HIGH -} ClutterTextureQuality; - /** * ClutterTimelineDirection: * @CLUTTER_TIMELINE_FORWARD: forward direction for a timeline diff --git a/src/tests/clutter/interactive/test-layout.c b/src/tests/clutter/interactive/test-layout.c index 091213920..b9371b2a4 100644 --- a/src/tests/clutter/interactive/test-layout.c +++ b/src/tests/clutter/interactive/test-layout.c @@ -478,7 +478,6 @@ create_item (void) main_timeline, "scale-x", 2.0, "scale-y", 2.0, - "fixed::scale-gravity", CLUTTER_GRAVITY_CENTER, NULL); return clone; @@ -628,7 +627,6 @@ test_layout_main (int argc, char *argv[]) main_timeline, "scale-x", 2.0, "scale-y", 2.0, - "fixed::scale-gravity", CLUTTER_GRAVITY_CENTER, NULL); for (i = 1; i < 33; i++)