From 1c6ea5d1dba97913ecc541be4ecd5d0257827a79 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Wed, 19 Dec 2018 09:04:25 +0100 Subject: [PATCH] Use a consistent style for enum braces https://gitlab.gnome.org/GNOME/mutter/merge_requests/361 --- clutter/clutter/clutter-actor-private.h | 6 +- clutter/clutter/clutter-actor.c | 9 +- clutter/clutter/clutter-debug.h | 9 +- clutter/clutter/clutter-enums.h | 180 ++++++++++++------ clutter/clutter/clutter-event-translator.h | 3 +- clutter/clutter/clutter-image.h | 3 +- clutter/clutter/clutter-input-device-tool.c | 3 +- clutter/clutter/clutter-input-method.c | 6 +- clutter/clutter/clutter-main.h | 3 +- clutter/clutter/clutter-paint-node-private.h | 3 +- clutter/clutter/clutter-private.h | 3 +- clutter/clutter/clutter-script.h | 3 +- clutter/clutter/clutter-stage.c | 3 +- clutter/clutter/clutter-text-buffer.c | 6 +- clutter/clutter/clutter-texture.h | 3 +- clutter/clutter/cogl/clutter-stage-cogl.c | 3 +- .../clutter/deprecated/clutter-behaviour.c | 3 +- clutter/clutter/deprecated/clutter-shader.h | 3 +- .../evdev/clutter-input-device-evdev.c | 3 +- .../clutter/x11/clutter-device-manager-xi2.c | 6 +- clutter/clutter/x11/clutter-x11.h | 3 +- clutter/tests/interactive/test-swipe-action.c | 3 +- cogl/cogl-path/cogl-path-types.h | 3 +- cogl/cogl/cogl-bitmap.h | 3 +- cogl/cogl/cogl-boxed-value.h | 3 +- cogl/cogl/cogl-buffer-private.h | 6 +- cogl/cogl/cogl-buffer.h | 12 +- cogl/cogl/cogl-debug.h | 3 +- cogl/cogl/cogl-driver.h | 3 +- cogl/cogl/cogl-framebuffer-private.h | 3 +- cogl/cogl/cogl-framebuffer.h | 3 +- cogl/cogl/cogl-gles2-context.c | 3 +- cogl/cogl/cogl-gles2.h | 3 +- cogl/cogl/cogl-glx-renderer-private.h | 3 +- cogl/cogl/cogl-matrix-stack-private.h | 3 +- cogl/cogl/cogl-output.h | 3 +- cogl/cogl/cogl-pipeline-layer-private.h | 3 +- cogl/cogl/cogl-pipeline-layer-state.h | 6 +- cogl/cogl/cogl-pipeline-state.h | 3 +- cogl/cogl/cogl-snippet.h | 3 +- cogl/cogl/cogl-texture-private.h | 6 +- cogl/cogl/cogl-texture.h | 6 +- cogl/cogl/cogl-types.h | 39 ++-- cogl/cogl/deprecated/cogl-material-compat.h | 12 +- cogl/cogl/deprecated/cogl-shader.h | 3 +- cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 3 +- cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 3 +- cogl/cogl/winsys/cogl-winsys-private.h | 3 +- cogl/test-fixtures/test-utils.h | 3 +- src/backends/meta-barrier.c | 6 +- src/backends/meta-cursor-renderer.c | 3 +- src/backends/meta-cursor-tracker.c | 3 +- src/backends/meta-display-config-shared.h | 3 +- src/backends/meta-input-mapper.c | 9 +- src/backends/meta-input-settings.c | 3 +- src/backends/meta-monitor-manager.c | 3 +- src/backends/native/meta-barrier-native.c | 3 +- src/backends/x11/meta-input-settings-x11.c | 3 +- src/compositor/cogl-utils.h | 3 +- src/compositor/meta-background-actor.c | 6 +- src/compositor/meta-background.c | 3 +- src/compositor/meta-dnd-actor.c | 3 +- src/compositor/meta-feedback-actor.c | 3 +- src/compositor/meta-plugin-manager.h | 3 +- src/compositor/meta-shaped-texture.c | 3 +- src/compositor/meta-surface-actor.c | 3 +- src/compositor/meta-window-actor.c | 3 +- src/core/display-private.h | 9 +- src/core/display.c | 3 +- src/core/meta-close-dialog-default.c | 3 +- src/core/meta-close-dialog.c | 3 +- src/core/meta-gesture-tracker-private.h | 3 +- src/core/meta-gesture-tracker.c | 6 +- .../meta-inhibit-shortcuts-dialog-default.c | 3 +- src/core/meta-workspace-manager.c | 3 +- src/core/stack-tracker.c | 6 +- src/core/startup-notification.c | 9 +- src/core/window-private.h | 9 +- src/core/window.c | 3 +- src/core/workspace.c | 3 +- src/meta/barrier.h | 3 +- src/meta/compositor.h | 3 +- src/meta/meta-plugin.h | 3 +- src/meta/meta-window-actor.h | 3 +- src/meta/util.h | 3 +- src/meta/window.h | 3 +- src/ui/frames.c | 3 +- src/wayland/meta-wayland-outputs.c | 3 +- src/wayland/meta-wayland-pointer.c | 3 +- src/wayland/meta-wayland-surface.c | 6 +- src/wayland/meta-xwayland-selection.c | 3 +- src/wayland/meta-xwayland.c | 3 +- src/x11/meta-startup-notification-x11.c | 3 +- src/x11/window-props.c | 3 +- 94 files changed, 392 insertions(+), 196 deletions(-) diff --git a/clutter/clutter/clutter-actor-private.h b/clutter/clutter/clutter-actor-private.h index 33ee89563..7806894bc 100644 --- a/clutter/clutter/clutter-actor-private.h +++ b/clutter/clutter/clutter-actor-private.h @@ -53,7 +53,8 @@ typedef enum * Controls some options for how clutter_actor_traverse() iterates * through the graph. */ -typedef enum { +typedef enum +{ CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST = 1L<<0, CLUTTER_ACTOR_TRAVERSE_BREADTH_FIRST = 1L<<1 } ClutterActorTraverseFlags; @@ -74,7 +75,8 @@ typedef enum { * the continuing traversal. It may stop traversal completely, just * skip over children for the current actor or continue as normal. */ -typedef enum { +typedef enum +{ CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE = 1L<<0, CLUTTER_ACTOR_TRAVERSE_VISIT_SKIP_CHILDREN = 1L<<1, CLUTTER_ACTOR_TRAVERSE_VISIT_BREAK = 1L<<2 diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index 67766eb15..43d58cd14 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -656,7 +656,8 @@ * which indicates when to do something other than just enforce * invariants. */ -typedef enum { +typedef enum +{ MAP_STATE_CHECK, /* just enforce invariants. */ MAP_STATE_MAKE_UNREALIZED, /* force unrealize, ignoring invariants, * used when about to unparent. @@ -4201,7 +4202,8 @@ remove_child (ClutterActor *self, child->priv->next_sibling = NULL; } -typedef enum { +typedef enum +{ REMOVE_CHILD_DESTROY_META = 1 << 0, REMOVE_CHILD_EMIT_PARENT_SET = 1 << 1, REMOVE_CHILD_EMIT_ACTOR_REMOVED = 1 << 2, @@ -12756,7 +12758,8 @@ typedef void (* ClutterActorAddChildFunc) (ClutterActor *parent, ClutterActor *child, gpointer data); -typedef enum { +typedef enum +{ ADD_CHILD_CREATE_META = 1 << 0, ADD_CHILD_EMIT_PARENT_SET = 1 << 1, ADD_CHILD_EMIT_ACTOR_ADDED = 1 << 2, diff --git a/clutter/clutter/clutter-debug.h b/clutter/clutter/clutter-debug.h index 538f4a12e..2462385f6 100644 --- a/clutter/clutter/clutter-debug.h +++ b/clutter/clutter/clutter-debug.h @@ -6,7 +6,8 @@ G_BEGIN_DECLS -typedef enum { +typedef enum +{ CLUTTER_DEBUG_MISC = 1 << 0, CLUTTER_DEBUG_ACTOR = 1 << 1, CLUTTER_DEBUG_TEXTURE = 1 << 2, @@ -26,12 +27,14 @@ typedef enum { CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 16 } ClutterDebugFlag; -typedef enum { +typedef enum +{ CLUTTER_DEBUG_NOP_PICKING = 1 << 0, CLUTTER_DEBUG_DUMP_PICK_BUFFERS = 1 << 1 } ClutterPickDebugFlag; -typedef enum { +typedef enum +{ CLUTTER_DEBUG_DISABLE_SWAP_EVENTS = 1 << 0, CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS = 1 << 1, CLUTTER_DEBUG_REDRAWS = 1 << 2, diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index 615ed82f2..9cb296788 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -51,7 +51,8 @@ G_BEGIN_DECLS * * Deprecated: 1.22: Use the normalized #ClutterActor pivot point instead */ -typedef enum { /*< prefix=CLUTTER_GRAVITY >*/ +typedef enum /*< prefix=CLUTTER_GRAVITY >*/ +{ CLUTTER_GRAVITY_NONE = 0, CLUTTER_GRAVITY_NORTH, CLUTTER_GRAVITY_NORTH_EAST, @@ -74,7 +75,8 @@ typedef enum { /*< prefix=CLUTTER_GRAVITY >*/ * * Since: 0.4 */ -typedef enum { /*< prefix=CLUTTER >*/ +typedef enum /*< prefix=CLUTTER >*/ +{ CLUTTER_X_AXIS, CLUTTER_Y_AXIS, CLUTTER_Z_AXIS @@ -91,7 +93,8 @@ typedef enum { /*< prefix=CLUTTER >*/ * * Deprecated: 1.22 */ -typedef enum { /*< prefix=CLUTTER_ROTATE >*/ +typedef enum /*< prefix=CLUTTER_ROTATE >*/ +{ CLUTTER_ROTATE_CW, CLUTTER_ROTATE_CCW } ClutterRotateDirection; @@ -107,7 +110,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/ * * Since: 0.8 */ -typedef enum { /*< prefix=CLUTTER_REQUEST >*/ +typedef enum /*< prefix=CLUTTER_REQUEST >*/ +{ CLUTTER_REQUEST_HEIGHT_FOR_WIDTH, CLUTTER_REQUEST_WIDTH_FOR_HEIGHT, CLUTTER_REQUEST_CONTENT_SIZE @@ -200,7 +204,8 @@ typedef enum { /*< prefix=CLUTTER_REQUEST >*/ * * Since: 1.0 */ -typedef enum { +typedef enum +{ CLUTTER_CUSTOM_MODE = 0, /* linear */ @@ -284,7 +289,8 @@ typedef enum { * * Deprecated: 1.22: Use #cairo_font_options_t instead */ -typedef enum { /*< prefix=CLUTTER_FONT >*/ +typedef enum /*< prefix=CLUTTER_FONT >*/ +{ CLUTTER_FONT_MIPMAPPING = (1 << 0), CLUTTER_FONT_HINTING = (1 << 1) } ClutterFontFlags; @@ -300,7 +306,8 @@ typedef enum { /*< prefix=CLUTTER_FONT >*/ * * Since: 1.2 */ -typedef enum { +typedef enum +{ CLUTTER_TEXT_DIRECTION_DEFAULT, CLUTTER_TEXT_DIRECTION_LTR, CLUTTER_TEXT_DIRECTION_RTL @@ -315,7 +322,8 @@ typedef enum { * * Since: 1.4 */ -typedef enum { +typedef enum +{ CLUTTER_VERTEX_SHADER, CLUTTER_FRAGMENT_SHADER } ClutterShaderType; @@ -350,7 +358,8 @@ typedef enum { * * Since: 0.4 */ -typedef enum { +typedef enum +{ CLUTTER_SHIFT_MASK = 1 << 0, CLUTTER_LOCK_MASK = 1 << 1, CLUTTER_CONTROL_MASK = 1 << 2, @@ -416,7 +425,8 @@ typedef enum { * Keyboard accessibility features applied to a ClutterInputDevice keyboard. * */ -typedef enum { +typedef enum +{ CLUTTER_A11Y_KEYBOARD_ENABLED = 1 << 0, CLUTTER_A11Y_TIMEOUT_ENABLED = 1 << 1, CLUTTER_A11Y_MOUSE_KEYS_ENABLED = 1 << 2, @@ -448,7 +458,8 @@ typedef enum { * * Flags used to signal the state of an actor. */ -typedef enum { /*< prefix=CLUTTER_ACTOR >*/ +typedef enum /*< prefix=CLUTTER_ACTOR >*/ +{ CLUTTER_ACTOR_MAPPED = 1 << 1, CLUTTER_ACTOR_REALIZED = 1 << 2, CLUTTER_ACTOR_REACTIVE = 1 << 3, @@ -468,7 +479,8 @@ typedef enum { /*< prefix=CLUTTER_ACTOR >*/ * * Since: 1.8 */ -typedef enum { /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/ +typedef enum /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/ +{ CLUTTER_OFFSCREEN_REDIRECT_AUTOMATIC_FOR_OPACITY = 1<<0, CLUTTER_OFFSCREEN_REDIRECT_ALWAYS = 1<<1 } ClutterOffscreenRedirect; @@ -492,7 +504,8 @@ typedef enum { /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/ * * Since: 1.0 */ -typedef enum { +typedef enum +{ CLUTTER_ALLOCATION_NONE = 0, CLUTTER_ABSOLUTE_ORIGIN_CHANGED = 1 << 1, CLUTTER_DELEGATE_LAYOUT = 1 << 2 @@ -509,7 +522,8 @@ typedef enum { * * Since: 1.4 */ -typedef enum { /*< prefix=CLUTTER_ALIGN >*/ +typedef enum /*< prefix=CLUTTER_ALIGN >*/ +{ CLUTTER_ALIGN_X_AXIS, CLUTTER_ALIGN_Y_AXIS, CLUTTER_ALIGN_BOTH @@ -526,7 +540,8 @@ typedef enum { /*< prefix=CLUTTER_ALIGN >*/ * * Deprecated: 1.22 */ -typedef enum { +typedef enum +{ CLUTTER_INTERPOLATION_LINEAR, CLUTTER_INTERPOLATION_CUBIC } ClutterInterpolation; @@ -551,7 +566,8 @@ typedef enum { * Deprecated: 1.12: Use #ClutterActorAlign and the #ClutterActor * API instead */ -typedef enum { +typedef enum +{ CLUTTER_BIN_ALIGNMENT_FIXED, CLUTTER_BIN_ALIGNMENT_FILL, CLUTTER_BIN_ALIGNMENT_START, @@ -576,7 +592,8 @@ typedef enum { * * Since: 1.4 */ -typedef enum { /*< prefix=CLUTTER_BIND >*/ +typedef enum /*< prefix=CLUTTER_BIND >*/ +{ CLUTTER_BIND_X, CLUTTER_BIND_Y, CLUTTER_BIND_WIDTH, @@ -595,7 +612,8 @@ typedef enum { /*< prefix=CLUTTER_BIND >*/ * * Flags passed to the ‘paint’ or ‘pick’ method of #ClutterEffect. */ -typedef enum { /*< prefix=CLUTTER_EFFECT_PAINT >*/ +typedef enum /*< prefix=CLUTTER_EFFECT_PAINT >*/ +{ CLUTTER_EFFECT_PAINT_ACTOR_DIRTY = (1 << 0) } ClutterEffectPaintFlags; @@ -611,7 +629,8 @@ typedef enum { /*< prefix=CLUTTER_EFFECT_PAINT >*/ * * Since: 1.2 */ -typedef enum { +typedef enum +{ CLUTTER_BOX_ALIGNMENT_START, CLUTTER_BOX_ALIGNMENT_END, CLUTTER_BOX_ALIGNMENT_CENTER @@ -628,7 +647,8 @@ typedef enum { * * Since: 1.8 */ -typedef enum { /*< prefix=CLUTTER_LONG_PRESS >*/ +typedef enum /*< prefix=CLUTTER_LONG_PRESS >*/ +{ CLUTTER_LONG_PRESS_QUERY, CLUTTER_LONG_PRESS_ACTIVATE, CLUTTER_LONG_PRESS_CANCEL @@ -686,7 +706,8 @@ typedef enum { /*< prefix=CLUTTER_LONG_PRESS >*/ * * Since: 1.6 */ -typedef enum { /*< prefix=CLUTTER_COLOR >*/ +typedef enum /*< prefix=CLUTTER_COLOR >*/ +{ /* CGA/EGA-like palette */ CLUTTER_COLOR_WHITE = 0, CLUTTER_COLOR_BLACK, @@ -750,7 +771,8 @@ typedef enum { /*< prefix=CLUTTER_COLOR >*/ * * Since: 1.4 */ -typedef enum { /*< prefix=CLUTTER_DRAG >*/ +typedef enum /*< prefix=CLUTTER_DRAG >*/ +{ CLUTTER_DRAG_AXIS_NONE = 0, CLUTTER_DRAG_X_AXIS, @@ -767,7 +789,8 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/ * * Since: 0.6 */ -typedef enum { /*< flags prefix=CLUTTER_EVENT >*/ +typedef enum /*< flags prefix=CLUTTER_EVENT >*/ +{ CLUTTER_EVENT_NONE = 0, CLUTTER_EVENT_FLAG_SYNTHETIC = 1 << 0, CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1, @@ -812,7 +835,8 @@ typedef enum { /*< flags prefix=CLUTTER_EVENT >*/ * * Since: 0.4 */ -typedef enum { /*< prefix=CLUTTER >*/ +typedef enum /*< prefix=CLUTTER >*/ +{ CLUTTER_NOTHING = 0, CLUTTER_KEY_PRESS, CLUTTER_KEY_RELEASE, @@ -857,7 +881,8 @@ typedef enum { /*< prefix=CLUTTER >*/ * * Since: 0.4 */ -typedef enum { /*< prefix=CLUTTER_SCROLL >*/ +typedef enum /*< prefix=CLUTTER_SCROLL >*/ +{ CLUTTER_SCROLL_UP, CLUTTER_SCROLL_DOWN, CLUTTER_SCROLL_LEFT, @@ -875,7 +900,8 @@ typedef enum { /*< prefix=CLUTTER_SCROLL >*/ * * Since: 0.4 */ -typedef enum { +typedef enum +{ CLUTTER_STAGE_STATE_FULLSCREEN = (1 << 1), CLUTTER_STAGE_STATE_OFFSCREEN = (1 << 2), CLUTTER_STAGE_STATE_ACTIVATED = (1 << 3) @@ -927,7 +953,8 @@ typedef enum * * Since: 1.2 */ -typedef enum { /*< prefix=CLUTTER_FLOW >*/ +typedef enum /*< prefix=CLUTTER_FLOW >*/ +{ CLUTTER_FLOW_HORIZONTAL, CLUTTER_FLOW_VERTICAL } ClutterFlowOrientation; @@ -954,7 +981,8 @@ typedef enum { /*< prefix=CLUTTER_FLOW >*/ * * Since: 1.0 */ -typedef enum { +typedef enum +{ CLUTTER_POINTER_DEVICE, CLUTTER_KEYBOARD_DEVICE, CLUTTER_EXTENSION_DEVICE, @@ -982,7 +1010,8 @@ typedef enum { * * Since: 1.6 */ -typedef enum { +typedef enum +{ CLUTTER_INPUT_MODE_MASTER, CLUTTER_INPUT_MODE_SLAVE, CLUTTER_INPUT_MODE_FLOATING @@ -1007,7 +1036,8 @@ typedef enum { * * Since: 1.6 */ -typedef enum { +typedef enum +{ CLUTTER_INPUT_AXIS_IGNORE, CLUTTER_INPUT_AXIS_X, @@ -1034,7 +1064,8 @@ typedef enum { * * Since: 1.6 */ -typedef enum { +typedef enum +{ CLUTTER_SNAP_EDGE_TOP, CLUTTER_SNAP_EDGE_RIGHT, CLUTTER_SNAP_EDGE_BOTTOM, @@ -1051,7 +1082,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { +typedef enum +{ CLUTTER_PICK_NONE = 0, CLUTTER_PICK_REACTIVE, CLUTTER_PICK_ALL @@ -1068,7 +1100,8 @@ typedef enum { * * Since: 1.8 */ -typedef enum { /*< prefix=CLUTTER_SWIPE_DIRECTION >*/ +typedef enum /*< prefix=CLUTTER_SWIPE_DIRECTION >*/ +{ CLUTTER_SWIPE_DIRECTION_UP = 1 << 0, CLUTTER_SWIPE_DIRECTION_DOWN = 1 << 1, CLUTTER_SWIPE_DIRECTION_LEFT = 1 << 2, @@ -1088,7 +1121,8 @@ typedef enum { /*< prefix=CLUTTER_SWIPE_DIRECTION >*/ * * Since: 1.12 */ -typedef enum { /*< prefix=CLUTTER_PAN >*/ +typedef enum /*< prefix=CLUTTER_PAN >*/ +{ CLUTTER_PAN_AXIS_NONE = 0, CLUTTER_PAN_X_AXIS, @@ -1113,7 +1147,8 @@ typedef enum { /*< prefix=CLUTTER_PAN >*/ * * Deprecated: 1.22: Use the alignment properties of #ClutterActor */ -typedef enum { +typedef enum +{ CLUTTER_TABLE_ALIGNMENT_START, CLUTTER_TABLE_ALIGNMENT_CENTER, CLUTTER_TABLE_ALIGNMENT_END @@ -1134,7 +1169,8 @@ typedef enum { * Deprecated: 1.22: The #ClutterTexture class was the only user of * this API */ -typedef enum { /*< prefix=CLUTTER_TEXTURE >*/ +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 */ @@ -1158,7 +1194,8 @@ typedef enum { /*< prefix=CLUTTER_TEXTURE >*/ * this API; use #ClutterImage and clutter_actor_set_content_scaling_filters() * instead. */ -typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/ +typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/ +{ CLUTTER_TEXTURE_QUALITY_LOW, CLUTTER_TEXTURE_QUALITY_MEDIUM, CLUTTER_TEXTURE_QUALITY_HIGH @@ -1173,7 +1210,8 @@ typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/ * * Since: 0.6 */ -typedef enum { +typedef enum +{ CLUTTER_TIMELINE_FORWARD, CLUTTER_TIMELINE_BACKWARD } ClutterTimelineDirection; @@ -1192,7 +1230,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { /*< prefix=CLUTTER_UNIT >*/ +typedef enum /*< prefix=CLUTTER_UNIT >*/ +{ CLUTTER_UNIT_PIXEL, CLUTTER_UNIT_EM, CLUTTER_UNIT_MM, @@ -1222,7 +1261,8 @@ typedef enum { /*< prefix=CLUTTER_UNIT >*/ * * Since: 1.0 */ -typedef enum { +typedef enum +{ CLUTTER_PATH_MOVE_TO = 0, CLUTTER_PATH_LINE_TO = 1, CLUTTER_PATH_CURVE_TO = 2, @@ -1253,7 +1293,8 @@ typedef enum { * * Since: 1.10 */ -typedef enum { +typedef enum +{ CLUTTER_ACTOR_ALIGN_FILL, CLUTTER_ACTOR_ALIGN_START, CLUTTER_ACTOR_ALIGN_CENTER, @@ -1273,7 +1314,8 @@ typedef enum { * * Since: 1.10 */ -typedef enum { +typedef enum +{ CLUTTER_REPAINT_FLAGS_PRE_PAINT = 1 << 0, CLUTTER_REPAINT_FLAGS_POST_PAINT = 1 << 1, CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD = 1 << 2 @@ -1298,7 +1340,8 @@ typedef enum { * * Since: 1.10 */ -typedef enum { +typedef enum +{ CLUTTER_CONTENT_GRAVITY_TOP_LEFT, CLUTTER_CONTENT_GRAVITY_TOP, CLUTTER_CONTENT_GRAVITY_TOP_RIGHT, @@ -1328,7 +1371,8 @@ typedef enum { * * Since: 1.10 */ -typedef enum { +typedef enum +{ CLUTTER_SCALING_FILTER_LINEAR, CLUTTER_SCALING_FILTER_NEAREST, CLUTTER_SCALING_FILTER_TRILINEAR @@ -1343,7 +1387,8 @@ typedef enum { * * Since: 1.12 */ -typedef enum { +typedef enum +{ CLUTTER_ORIENTATION_HORIZONTAL, CLUTTER_ORIENTATION_VERTICAL } ClutterOrientation; @@ -1359,7 +1404,8 @@ typedef enum { * * Since: 1.12 */ -typedef enum { /*< prefix=CLUTTER_SCROLL >*/ +typedef enum /*< prefix=CLUTTER_SCROLL >*/ +{ CLUTTER_SCROLL_NONE = 0, CLUTTER_SCROLL_HORIZONTALLY = 1 << 0, @@ -1379,7 +1425,8 @@ typedef enum { /*< prefix=CLUTTER_SCROLL >*/ * * Since: 1.12 */ -typedef enum { +typedef enum +{ CLUTTER_GRID_POSITION_LEFT, CLUTTER_GRID_POSITION_RIGHT, CLUTTER_GRID_POSITION_TOP, @@ -1397,7 +1444,8 @@ typedef enum { * * Since: 1.12 */ -typedef enum { +typedef enum +{ CLUTTER_REPEAT_NONE = 0, CLUTTER_REPEAT_X_AXIS = 1 << 0, CLUTTER_REPEAT_Y_AXIS = 1 << 1, @@ -1419,7 +1467,8 @@ typedef enum { * * Since: 1.12 */ -typedef enum { +typedef enum +{ CLUTTER_STEP_MODE_START, CLUTTER_STEP_MODE_END } ClutterStepMode; @@ -1435,7 +1484,8 @@ typedef enum { * * Since: 1.12 */ -typedef enum { /*< prefix=CLUTTER_ZOOM >*/ +typedef enum /*< prefix=CLUTTER_ZOOM >*/ +{ CLUTTER_ZOOM_X_AXIS, CLUTTER_ZOOM_Y_AXIS, CLUTTER_ZOOM_BOTH @@ -1458,7 +1508,8 @@ typedef enum { /*< prefix=CLUTTER_ZOOM >*/ * * Since: 1.18 */ -typedef enum { +typedef enum +{ CLUTTER_GESTURE_TRIGGER_EDGE_NONE = 0, CLUTTER_GESTURE_TRIGGER_EDGE_AFTER, CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE @@ -1494,7 +1545,8 @@ typedef enum { * * Since: 1.24 */ -typedef enum { +typedef enum +{ CLUTTER_TOUCHPAD_GESTURE_PHASE_BEGIN, CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE, CLUTTER_TOUCHPAD_GESTURE_PHASE_END, @@ -1516,7 +1568,8 @@ typedef enum { * * Since: 1.26 */ -typedef enum { +typedef enum +{ CLUTTER_SCROLL_SOURCE_UNKNOWN, CLUTTER_SCROLL_SOURCE_WHEEL, CLUTTER_SCROLL_SOURCE_FINGER, @@ -1534,7 +1587,8 @@ typedef enum { * * Since: 1.26 */ -typedef enum { +typedef enum +{ CLUTTER_SCROLL_FINISHED_NONE = 0, CLUTTER_SCROLL_FINISHED_HORIZONTAL = 1 << 0, CLUTTER_SCROLL_FINISHED_VERTICAL = 1 << 1 @@ -1555,7 +1609,8 @@ typedef enum { * * Since: 1.28 */ -typedef enum { +typedef enum +{ CLUTTER_INPUT_DEVICE_TOOL_NONE, CLUTTER_INPUT_DEVICE_TOOL_PEN, CLUTTER_INPUT_DEVICE_TOOL_ERASER, @@ -1566,17 +1621,20 @@ typedef enum { CLUTTER_INPUT_DEVICE_TOOL_LENS } ClutterInputDeviceToolType; -typedef enum { +typedef enum +{ CLUTTER_INPUT_DEVICE_PAD_SOURCE_UNKNOWN, CLUTTER_INPUT_DEVICE_PAD_SOURCE_FINGER, } ClutterInputDevicePadSource; -typedef enum { +typedef enum +{ CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE, CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE, } ClutterInputDeviceMapping; -typedef enum { +typedef enum +{ CLUTTER_INPUT_CONTENT_HINT_COMPLETION = 1 << 0, CLUTTER_INPUT_CONTENT_HINT_SPELLCHECK = 1 << 1, CLUTTER_INPUT_CONTENT_HINT_AUTO_CAPITALIZATION = 1 << 2, @@ -1589,7 +1647,8 @@ typedef enum { CLUTTER_INPUT_CONTENT_HINT_MULTILINE = 1 << 9, } ClutterInputContentHintFlags; -typedef enum { +typedef enum +{ CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL, CLUTTER_INPUT_CONTENT_PURPOSE_ALPHA, CLUTTER_INPUT_CONTENT_PURPOSE_DIGITS, @@ -1605,7 +1664,8 @@ typedef enum { CLUTTER_INPUT_CONTENT_PURPOSE_TERMINAL, } ClutterInputContentPurpose; -typedef enum { +typedef enum +{ CLUTTER_INPUT_PANEL_STATE_OFF, CLUTTER_INPUT_PANEL_STATE_ON, CLUTTER_INPUT_PANEL_STATE_TOGGLE, diff --git a/clutter/clutter/clutter-event-translator.h b/clutter/clutter/clutter-event-translator.h index 4cea6f05c..3d3b77528 100644 --- a/clutter/clutter/clutter-event-translator.h +++ b/clutter/clutter/clutter-event-translator.h @@ -14,7 +14,8 @@ G_BEGIN_DECLS typedef struct _ClutterEventTranslator ClutterEventTranslator; typedef struct _ClutterEventTranslatorIface ClutterEventTranslatorIface; -typedef enum { +typedef enum +{ CLUTTER_TRANSLATE_CONTINUE, CLUTTER_TRANSLATE_REMOVE, CLUTTER_TRANSLATE_QUEUE diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h index 5b413e729..7f02099e6 100644 --- a/clutter/clutter/clutter-image.h +++ b/clutter/clutter/clutter-image.h @@ -63,7 +63,8 @@ typedef struct _ClutterImageClass ClutterImageClass; * * Since: 1.10 */ -typedef enum { +typedef enum +{ CLUTTER_IMAGE_ERROR_INVALID_DATA } ClutterImageError; diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c index fd5d273e0..982d94ce4 100644 --- a/clutter/clutter/clutter-input-device-tool.c +++ b/clutter/clutter/clutter-input-device-tool.c @@ -35,7 +35,8 @@ struct _ClutterInputDeviceToolPrivate guint64 id; }; -enum { +enum +{ PROP_0, PROP_TYPE, PROP_SERIAL, diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c index cb5364b21..de58d5087 100644 --- a/clutter/clutter/clutter-input-method.c +++ b/clutter/clutter/clutter-input-method.c @@ -37,7 +37,8 @@ struct _ClutterInputMethodPrivate gboolean can_show_preedit; }; -enum { +enum +{ COMMIT, DELETE_SURROUNDING, REQUEST_SURROUNDING, @@ -46,7 +47,8 @@ enum { N_SIGNALS, }; -enum { +enum +{ PROP_0, PROP_CONTENT_HINTS, PROP_CONTENT_PURPOSE, diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h index 67065223f..6bacc5410 100644 --- a/clutter/clutter/clutter-main.h +++ b/clutter/clutter/clutter-main.h @@ -53,7 +53,8 @@ G_BEGIN_DECLS * * Since: 0.2 */ -typedef enum { +typedef enum +{ CLUTTER_INIT_SUCCESS = 1, CLUTTER_INIT_ERROR_UNKNOWN = 0, CLUTTER_INIT_ERROR_THREADS = -1, diff --git a/clutter/clutter/clutter-paint-node-private.h b/clutter/clutter/clutter-paint-node-private.h index 55cf9efd2..d61b89951 100644 --- a/clutter/clutter/clutter-paint-node-private.h +++ b/clutter/clutter/clutter-paint-node-private.h @@ -74,7 +74,8 @@ struct _ClutterPaintNodeClass #define PAINT_OP_INIT { PAINT_OP_INVALID } -typedef enum { +typedef enum +{ PAINT_OP_INVALID = 0, PAINT_OP_TEX_RECT, PAINT_OP_MULTITEX_RECT, diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h index f1b795290..5c4b9651e 100644 --- a/clutter/clutter/clutter-private.h +++ b/clutter/clutter/clutter-private.h @@ -91,7 +91,8 @@ typedef struct _ClutterVertex4 ClutterVertex4; * because it will break for negative numbers. */ #define CLUTTER_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f)) -typedef enum { +typedef enum +{ CLUTTER_ACTOR_UNUSED_FLAG = 0, CLUTTER_IN_DESTRUCTION = 1 << 0, diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h index 5642e1034..a2ad3721b 100644 --- a/clutter/clutter/clutter-script.h +++ b/clutter/clutter/clutter-script.h @@ -79,7 +79,8 @@ typedef void (* ClutterScriptConnectFunc) (ClutterScript *script, * * Since: 0.6 */ -typedef enum { +typedef enum +{ CLUTTER_SCRIPT_ERROR_INVALID_TYPE_FUNCTION, CLUTTER_SCRIPT_ERROR_INVALID_PROPERTY, CLUTTER_SCRIPT_ERROR_INVALID_VALUE diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 7b3392285..a10069eb1 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -87,7 +87,8 @@ * * A series of hints that enable or disable behaviours on the stage */ -typedef enum { /*< prefix=CLUTTER_STAGE >*/ +typedef enum /*< prefix=CLUTTER_STAGE >*/ +{ CLUTTER_STAGE_HINT_NONE = 0, CLUTTER_STAGE_NO_CLEAR_ON_PAINT = 1 << 0 diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c index 724dcc888..f3a40d6fe 100644 --- a/clutter/clutter/clutter-text-buffer.c +++ b/clutter/clutter/clutter-text-buffer.c @@ -50,7 +50,8 @@ /* Initial size of buffer, in bytes */ #define MIN_SIZE 16 -enum { +enum +{ PROP_0, PROP_TEXT, PROP_LENGTH, @@ -60,7 +61,8 @@ enum { static GParamSpec *obj_props[PROP_LAST] = { NULL, }; -enum { +enum +{ INSERTED_TEXT, DELETED_TEXT, LAST_SIGNAL diff --git a/clutter/clutter/clutter-texture.h b/clutter/clutter/clutter-texture.h index 15f0759c9..8473c05e0 100644 --- a/clutter/clutter/clutter-texture.h +++ b/clutter/clutter/clutter-texture.h @@ -53,7 +53,8 @@ G_BEGIN_DECLS * * Since: 0.4 */ -typedef enum { +typedef enum +{ CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY, CLUTTER_TEXTURE_ERROR_NO_YUV, CLUTTER_TEXTURE_ERROR_BAD_FORMAT diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c index b313c9a10..7ab4b3823 100644 --- a/clutter/clutter/cogl/clutter-stage-cogl.c +++ b/clutter/clutter/cogl/clutter-stage-cogl.c @@ -69,7 +69,8 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageCogl, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW, clutter_stage_window_iface_init)); -enum { +enum +{ PROP_0, PROP_WRAPPER, PROP_BACKEND, diff --git a/clutter/clutter/deprecated/clutter-behaviour.c b/clutter/clutter/deprecated/clutter-behaviour.c index 3fd61afb1..14d1e80ad 100644 --- a/clutter/clutter/deprecated/clutter-behaviour.c +++ b/clutter/clutter/deprecated/clutter-behaviour.c @@ -101,7 +101,8 @@ enum static GParamSpec *obj_props[PROP_LAST]; -enum { +enum +{ APPLIED, REMOVED, LAST_SIGNAL diff --git a/clutter/clutter/deprecated/clutter-shader.h b/clutter/clutter/deprecated/clutter-shader.h index 122801238..209afbd2f 100644 --- a/clutter/clutter/deprecated/clutter-shader.h +++ b/clutter/clutter/deprecated/clutter-shader.h @@ -64,7 +64,8 @@ G_BEGIN_DECLS * * Deprecated: 1.8 */ -typedef enum { +typedef enum +{ CLUTTER_SHADER_ERROR_NO_ASM, CLUTTER_SHADER_ERROR_NO_GLSL, CLUTTER_SHADER_ERROR_COMPILE diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c index f49bc7a52..76bee0785 100644 --- a/clutter/clutter/evdev/clutter-input-device-evdev.c +++ b/clutter/clutter/evdev/clutter-input-device-evdev.c @@ -46,7 +46,8 @@ G_DEFINE_TYPE (ClutterInputDeviceEvdev, clutter_input_device_evdev, CLUTTER_TYPE_INPUT_DEVICE) -enum { +enum +{ PROP_0, PROP_DEVICE_MATRIX, PROP_OUTPUT_ASPECT_RATIO, diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c index 09d7522bf..87da4b050 100644 --- a/clutter/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/clutter/x11/clutter-device-manager-xi2.c @@ -76,7 +76,8 @@ static const char *wacom_type_atoms[] = { }; #define N_WACOM_TYPE_ATOMS G_N_ELEMENTS (wacom_type_atoms) -enum { +enum +{ WACOM_TYPE_STYLUS, WACOM_TYPE_CURSOR, WACOM_TYPE_ERASER, @@ -84,7 +85,8 @@ enum { WACOM_TYPE_TOUCH, }; -enum { +enum +{ PAD_AXIS_FIRST = 3, /* First axes are always x/y/pressure, ignored in pads */ PAD_AXIS_STRIP1 = PAD_AXIS_FIRST, PAD_AXIS_STRIP2, diff --git a/clutter/clutter/x11/clutter-x11.h b/clutter/clutter/x11/clutter-x11.h index dd3878c14..b0c3932bf 100644 --- a/clutter/clutter/x11/clutter-x11.h +++ b/clutter/clutter/x11/clutter-x11.h @@ -58,7 +58,8 @@ G_BEGIN_DECLS * * Since: 0.6 */ -typedef enum { +typedef enum +{ CLUTTER_X11_FILTER_CONTINUE, CLUTTER_X11_FILTER_TRANSLATE, CLUTTER_X11_FILTER_REMOVE diff --git a/clutter/tests/interactive/test-swipe-action.c b/clutter/tests/interactive/test-swipe-action.c index a33d9e41f..3d0877401 100644 --- a/clutter/tests/interactive/test-swipe-action.c +++ b/clutter/tests/interactive/test-swipe-action.c @@ -1,7 +1,8 @@ #include #include -enum { +enum +{ VERTICAL = 0, HORIZONTAL = 1, BOTH = 2 diff --git a/cogl/cogl-path/cogl-path-types.h b/cogl/cogl-path/cogl-path-types.h index 15b184c54..ee8583ad2 100644 --- a/cogl/cogl-path/cogl-path-types.h +++ b/cogl/cogl-path/cogl-path-types.h @@ -75,7 +75,8 @@ typedef struct _CoglPath CoglPath; * * Since: 1.4 */ -typedef enum { +typedef enum +{ COGL_PATH_FILL_RULE_NON_ZERO, COGL_PATH_FILL_RULE_EVEN_ODD } CoglPathFillRule; diff --git a/cogl/cogl/cogl-bitmap.h b/cogl/cogl/cogl-bitmap.h index ad03e35d3..478d1db06 100644 --- a/cogl/cogl/cogl-bitmap.h +++ b/cogl/cogl/cogl-bitmap.h @@ -289,7 +289,8 @@ cogl_is_bitmap (void *object); * * Since: 1.4 */ -typedef enum { +typedef enum +{ COGL_BITMAP_ERROR_FAILED, COGL_BITMAP_ERROR_UNKNOWN_TYPE, COGL_BITMAP_ERROR_CORRUPT_IMAGE diff --git a/cogl/cogl/cogl-boxed-value.h b/cogl/cogl/cogl-boxed-value.h index e049a976e..962c13387 100644 --- a/cogl/cogl/cogl-boxed-value.h +++ b/cogl/cogl/cogl-boxed-value.h @@ -35,7 +35,8 @@ #include "cogl-context.h" -typedef enum { +typedef enum +{ COGL_BOXED_NONE, COGL_BOXED_INT, COGL_BOXED_FLOAT, diff --git a/cogl/cogl/cogl-buffer-private.h b/cogl/cogl/cogl-buffer-private.h index f8e7844d5..2ac56659a 100644 --- a/cogl/cogl/cogl-buffer-private.h +++ b/cogl/cogl/cogl-buffer-private.h @@ -72,13 +72,15 @@ typedef enum _CoglBufferFlags COGL_BUFFER_FLAG_MAPPED_FALLBACK = 1UL << 2 } CoglBufferFlags; -typedef enum { +typedef enum +{ COGL_BUFFER_USAGE_HINT_TEXTURE, COGL_BUFFER_USAGE_HINT_ATTRIBUTE_BUFFER, COGL_BUFFER_USAGE_HINT_INDEX_BUFFER } CoglBufferUsageHint; -typedef enum { +typedef enum +{ COGL_BUFFER_BIND_TARGET_PIXEL_PACK, COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK, COGL_BUFFER_BIND_TARGET_ATTRIBUTE_BUFFER, diff --git a/cogl/cogl/cogl-buffer.h b/cogl/cogl/cogl-buffer.h index d7e2b439e..b96de3f51 100644 --- a/cogl/cogl/cogl-buffer.h +++ b/cogl/cogl/cogl-buffer.h @@ -89,7 +89,8 @@ typedef struct _CoglBuffer CoglBuffer; * * Stability: unstable */ -typedef enum { /*< prefix=COGL_BUFFER_ERROR >*/ +typedef enum /*< prefix=COGL_BUFFER_ERROR >*/ +{ COGL_BUFFER_ERROR_MAP } CoglBufferError; @@ -137,7 +138,8 @@ cogl_buffer_get_size (CoglBuffer *buffer); * Since: 1.2 * Stability: unstable */ -typedef enum { /*< prefix=COGL_BUFFER_UPDATE_HINT >*/ +typedef enum /*< prefix=COGL_BUFFER_UPDATE_HINT >*/ +{ COGL_BUFFER_UPDATE_HINT_STATIC, COGL_BUFFER_UPDATE_HINT_DYNAMIC, COGL_BUFFER_UPDATE_HINT_STREAM @@ -184,7 +186,8 @@ cogl_buffer_get_update_hint (CoglBuffer *buffer); * Since: 1.2 * Stability: unstable */ -typedef enum { /*< prefix=COGL_BUFFER_ACCESS >*/ +typedef enum /*< prefix=COGL_BUFFER_ACCESS >*/ +{ COGL_BUFFER_ACCESS_READ = 1 << 0, COGL_BUFFER_ACCESS_WRITE = 1 << 1, COGL_BUFFER_ACCESS_READ_WRITE = COGL_BUFFER_ACCESS_READ | COGL_BUFFER_ACCESS_WRITE @@ -208,7 +211,8 @@ typedef enum { /*< prefix=COGL_BUFFER_ACCESS >*/ * Since: 1.4 * Stability: unstable */ -typedef enum { /*< prefix=COGL_BUFFER_MAP_HINT >*/ +typedef enum /*< prefix=COGL_BUFFER_MAP_HINT >*/ +{ COGL_BUFFER_MAP_HINT_DISCARD = 1 << 0, COGL_BUFFER_MAP_HINT_DISCARD_RANGE = 1 << 1 } CoglBufferMapHint; diff --git a/cogl/cogl/cogl-debug.h b/cogl/cogl/cogl-debug.h index a3068b3c1..6f0eb36fc 100644 --- a/cogl/cogl/cogl-debug.h +++ b/cogl/cogl/cogl-debug.h @@ -39,7 +39,8 @@ G_BEGIN_DECLS -typedef enum { +typedef enum +{ COGL_DEBUG_SLICING, COGL_DEBUG_OFFSCREEN, COGL_DEBUG_DRAW, diff --git a/cogl/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h index 893088389..0e2d8ca79 100644 --- a/cogl/cogl/cogl-driver.h +++ b/cogl/cogl/cogl-driver.h @@ -264,7 +264,8 @@ struct _CoglDriverVtable #define COGL_DRIVER_ERROR (_cogl_driver_error_quark ()) -typedef enum { /*< prefix=COGL_DRIVER_ERROR >*/ +typedef enum /*< prefix=COGL_DRIVER_ERROR >*/ +{ COGL_DRIVER_ERROR_UNKNOWN_VERSION, COGL_DRIVER_ERROR_INVALID_VERSION, COGL_DRIVER_ERROR_NO_SUITABLE_DRIVER_FOUND, diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h index 1fa03e0e1..296788c2b 100644 --- a/cogl/cogl/cogl-framebuffer-private.h +++ b/cogl/cogl/cogl-framebuffer-private.h @@ -199,7 +199,8 @@ struct _CoglFramebuffer gboolean depth_buffer_clear_needed; }; -typedef enum { +typedef enum +{ COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL = 1L<<0, COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH = 1L<<1, COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL = 1L<<2 diff --git a/cogl/cogl/cogl-framebuffer.h b/cogl/cogl/cogl-framebuffer.h index 1f290c413..48a77e1ed 100644 --- a/cogl/cogl/cogl-framebuffer.h +++ b/cogl/cogl/cogl-framebuffer.h @@ -1827,7 +1827,8 @@ cogl_framebuffer_error_quark (void); */ #define COGL_FRAMEBUFFER_ERROR (cogl_framebuffer_error_quark ()) -typedef enum { /*< prefix=COGL_FRAMEBUFFER_ERROR >*/ +typedef enum /*< prefix=COGL_FRAMEBUFFER_ERROR >*/ +{ COGL_FRAMEBUFFER_ERROR_ALLOCATE } CoglFramebufferError; diff --git a/cogl/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c index fc78c1dc3..784c68c25 100644 --- a/cogl/cogl/cogl-gles2-context.c +++ b/cogl/cogl/cogl-gles2-context.c @@ -90,7 +90,8 @@ main_wrapper_function[] = "}\n" MAIN_WRAPPER_END; -enum { +enum +{ RESTORE_FB_NONE, RESTORE_FB_FROM_OFFSCREEN, RESTORE_FB_FROM_ONSCREEN, diff --git a/cogl/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h index 1fa7e6e7c..99bf39459 100644 --- a/cogl/cogl/cogl-gles2.h +++ b/cogl/cogl/cogl-gles2.h @@ -180,7 +180,8 @@ _cogl_gles2_context_error_quark (void); * * Error codes that relate to the cogl_gles2_context api. */ -typedef enum { /*< prefix=COGL_GLES2_CONTEXT_ERROR >*/ +typedef enum /*< prefix=COGL_GLES2_CONTEXT_ERROR >*/ +{ COGL_GLES2_CONTEXT_ERROR_UNSUPPORTED, COGL_GLES2_CONTEXT_ERROR_DRIVER } CoglGLES2ContextError; diff --git a/cogl/cogl/cogl-glx-renderer-private.h b/cogl/cogl/cogl-glx-renderer-private.h index 3ccdf849a..4a2c880ce 100644 --- a/cogl/cogl/cogl-glx-renderer-private.h +++ b/cogl/cogl/cogl-glx-renderer-private.h @@ -48,7 +48,8 @@ typedef struct _CoglGLXRenderer /* enumeration with relatioship between OML_sync_control * UST (unadjusted-system-time) and the system clock */ - enum { + enum +{ COGL_GLX_UST_IS_UNKNOWN, COGL_GLX_UST_IS_GETTIMEOFDAY, COGL_GLX_UST_IS_MONOTONIC_TIME, diff --git a/cogl/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h index bc649593d..dec789b8a 100644 --- a/cogl/cogl/cogl-matrix-stack-private.h +++ b/cogl/cogl/cogl-matrix-stack-private.h @@ -173,7 +173,8 @@ typedef struct _CoglMatrixEntryCache void _cogl_matrix_entry_identity_init (CoglMatrixEntry *entry); -typedef enum { +typedef enum +{ COGL_MATRIX_MODELVIEW, COGL_MATRIX_PROJECTION, COGL_MATRIX_TEXTURE diff --git a/cogl/cogl/cogl-output.h b/cogl/cogl/cogl-output.h index c5d3e15ea..54c76dd01 100644 --- a/cogl/cogl/cogl-output.h +++ b/cogl/cogl/cogl-output.h @@ -106,7 +106,8 @@ GType cogl_output_get_gtype (void); * Since: 1.14 * Stability: unstable */ -typedef enum { +typedef enum +{ COGL_SUBPIXEL_ORDER_UNKNOWN, COGL_SUBPIXEL_ORDER_NONE, COGL_SUBPIXEL_ORDER_HORIZONTAL_RGB, diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h index 55d25ec64..b4080c96b 100644 --- a/cogl/cogl/cogl-pipeline-layer-private.h +++ b/cogl/cogl/cogl-pipeline-layer-private.h @@ -333,7 +333,8 @@ _cogl_pipeline_get_layer_filters (CoglPipeline *pipeline, CoglPipelineFilter *min_filter, CoglPipelineFilter *mag_filter); -typedef enum { +typedef enum +{ COGL_PIPELINE_LAYER_TYPE_TEXTURE } CoglPipelineLayerType; diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h index 11fcbaaa2..a60a3ad27 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.h +++ b/cogl/cogl/cogl-pipeline-layer-state.h @@ -69,7 +69,8 @@ G_BEGIN_DECLS * possibly referring to multiple neighbouring texels and taking a weighted * average or simply using the nearest texel. */ -typedef enum { +typedef enum +{ COGL_PIPELINE_FILTER_NEAREST = 0x2600, COGL_PIPELINE_FILTER_LINEAR = 0x2601, COGL_PIPELINE_FILTER_NEAREST_MIPMAP_NEAREST = 0x2700, @@ -113,7 +114,8 @@ typedef enum { * XXX: keep the values in sync with the CoglPipelineWrapModeInternal * enum so no conversion is actually needed. */ -typedef enum { +typedef enum +{ COGL_PIPELINE_WRAP_MODE_REPEAT = 0x2901, COGL_PIPELINE_WRAP_MODE_MIRRORED_REPEAT = 0x8370, COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE = 0x812F, diff --git a/cogl/cogl/cogl-pipeline-state.h b/cogl/cogl/cogl-pipeline-state.h index d87a32cda..c8bba1549 100644 --- a/cogl/cogl/cogl-pipeline-state.h +++ b/cogl/cogl/cogl-pipeline-state.h @@ -325,7 +325,8 @@ cogl_pipeline_get_emission (CoglPipeline *pipeline, * incoming alpha value and a reference alpha value. The #CoglPipelineAlphaFunc * determines how the comparison is done. */ -typedef enum { +typedef enum +{ COGL_PIPELINE_ALPHA_FUNC_NEVER = 0x0200, COGL_PIPELINE_ALPHA_FUNC_LESS = 0x0201, COGL_PIPELINE_ALPHA_FUNC_EQUAL = 0x0202, diff --git a/cogl/cogl/cogl-snippet.h b/cogl/cogl/cogl-snippet.h index 2cf5b7ddf..19d3d6024 100644 --- a/cogl/cogl/cogl-snippet.h +++ b/cogl/cogl/cogl-snippet.h @@ -655,7 +655,8 @@ GType cogl_snippet_get_gtype (void); * Since: 1.10 * Stability: Unstable */ -typedef enum { +typedef enum +{ /* Per pipeline vertex hooks */ COGL_SNIPPET_HOOK_VERTEX = 0, COGL_SNIPPET_HOOK_VERTEX_TRANSFORM, diff --git a/cogl/cogl/cogl-texture-private.h b/cogl/cogl/cogl-texture-private.h index f90953fc8..05a0045f8 100644 --- a/cogl/cogl/cogl-texture-private.h +++ b/cogl/cogl/cogl-texture-private.h @@ -46,7 +46,8 @@ typedef struct _CoglTextureVtable CoglTextureVtable; /* Encodes three possibiloities result of transforming a quad */ -typedef enum { +typedef enum +{ /* quad doesn't cross the boundaries of a texture */ COGL_TRANSFORM_NO_REPEAT, /* quad crosses boundaries, hardware wrap mode can handle */ @@ -58,7 +59,8 @@ typedef enum { } CoglTransformResult; /* Flags given to the pre_paint method */ -typedef enum { +typedef enum +{ /* The texture is going to be used with filters that require mipmapping. This gives the texture the opportunity to automatically update the mipmap tree */ diff --git a/cogl/cogl/cogl-texture.h b/cogl/cogl/cogl-texture.h index dcbf6e19a..a19b6c2e0 100644 --- a/cogl/cogl/cogl-texture.h +++ b/cogl/cogl/cogl-texture.h @@ -99,7 +99,8 @@ GType cogl_texture_get_gtype (void); * Since: 1.8 * Stability: Unstable */ -typedef enum { +typedef enum +{ COGL_TEXTURE_ERROR_SIZE, COGL_TEXTURE_ERROR_FORMAT, COGL_TEXTURE_ERROR_BAD_PARAMETER, @@ -118,7 +119,8 @@ typedef enum { * Stability: unstable * Since: 1.10 */ -typedef enum { +typedef enum +{ COGL_TEXTURE_TYPE_2D, COGL_TEXTURE_TYPE_3D, COGL_TEXTURE_TYPE_RECTANGLE diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index 92740eb9e..690daa16a 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -269,7 +269,8 @@ typedef struct _CoglTextureVertex CoglTextureVertex; * * Since: 0.8 */ -typedef enum { /*< prefix=COGL_PIXEL_FORMAT >*/ +typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/ +{ COGL_PIXEL_FORMAT_ANY = 0, COGL_PIXEL_FORMAT_A_8 = 1 | COGL_A_BIT, @@ -467,7 +468,8 @@ COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 36); * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_TEXTURE_NONE = 0, COGL_TEXTURE_NO_AUTO_MIPMAP = 1 << 0, COGL_TEXTURE_NO_SLICING = 1 << 1, @@ -502,7 +504,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_FOG_MODE_LINEAR, COGL_FOG_MODE_EXPONENTIAL, COGL_FOG_MODE_EXPONENTIAL_SQUARED @@ -529,7 +532,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { /*< prefix=COGL_BLEND_STRING_ERROR >*/ +typedef enum /*< prefix=COGL_BLEND_STRING_ERROR >*/ +{ COGL_BLEND_STRING_ERROR_PARSE_ERROR, COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR, COGL_BLEND_STRING_ERROR_INVALID_ERROR, @@ -571,7 +575,8 @@ cogl_blend_string_error_quark (void); * Since: 1.4 * Stability: unstable */ -typedef enum { /*< prefix=COGL_ERROR >*/ +typedef enum /*< prefix=COGL_ERROR >*/ +{ COGL_SYSTEM_ERROR_UNSUPPORTED, COGL_SYSTEM_ERROR_NO_MEMORY } CoglSystemError; @@ -593,7 +598,8 @@ _cogl_system_error_quark (void); * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_ATTRIBUTE_TYPE_BYTE = 0x1400, COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE = 0x1401, COGL_ATTRIBUTE_TYPE_SHORT = 0x1402, @@ -617,7 +623,8 @@ typedef enum { * be available if the GL_OES_element_index_uint extension is * advertized. */ -typedef enum { +typedef enum +{ COGL_INDICES_TYPE_UNSIGNED_BYTE, COGL_INDICES_TYPE_UNSIGNED_SHORT, COGL_INDICES_TYPE_UNSIGNED_INT @@ -642,7 +649,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_VERTICES_MODE_POINTS = 0x0000, COGL_VERTICES_MODE_LINES = 0x0001, COGL_VERTICES_MODE_LINE_LOOP = 0x0002, @@ -684,7 +692,8 @@ typedef enum { * The test is only done when depth testing is explicitly enabled. (See * cogl_depth_state_set_test_enabled()) */ -typedef enum { +typedef enum +{ COGL_DEPTH_TEST_FUNCTION_NEVER = 0x0200, COGL_DEPTH_TEST_FUNCTION_LESS = 0x0201, COGL_DEPTH_TEST_FUNCTION_EQUAL = 0x0202, @@ -696,7 +705,8 @@ typedef enum { } CoglDepthTestFunction; /* NB: The above definitions are taken from gl.h equivalents */ -typedef enum { /*< prefix=COGL_RENDERER_ERROR >*/ +typedef enum /*< prefix=COGL_RENDERER_ERROR >*/ +{ COGL_RENDERER_ERROR_XLIB_DISPLAY_OPEN, COGL_RENDERER_ERROR_BAD_CONSTRAINT } CoglRendererError; @@ -814,7 +824,8 @@ typedef enum * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_BUFFER_BIT_COLOR = 1L<<0, COGL_BUFFER_BIT_DEPTH = 1L<<1, COGL_BUFFER_BIT_STENCIL = 1L<<2 @@ -828,7 +839,8 @@ typedef enum { * * Since: 1.0 */ -typedef enum { /*< prefix=COGL_READ_PIXELS >*/ +typedef enum /*< prefix=COGL_READ_PIXELS >*/ +{ COGL_READ_PIXELS_COLOR_BUFFER = 1L << 0 } CoglReadPixelsFlags; @@ -841,7 +853,8 @@ typedef enum { /*< prefix=COGL_READ_PIXELS >*/ * Represents how draw should affect the two buffers * of a stereo framebuffer. See cogl_framebuffer_set_stereo_mode(). */ -typedef enum { +typedef enum +{ COGL_STEREO_BOTH, COGL_STEREO_LEFT, COGL_STEREO_RIGHT diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h index 22a6dd589..45845e9a4 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.h +++ b/cogl/cogl/deprecated/cogl-material-compat.h @@ -89,7 +89,8 @@ GType cogl_material_get_type (void); * possibly referring to multiple neighbouring texels and taking a weighted * average or simply using the nearest texel. */ -typedef enum { +typedef enum +{ COGL_MATERIAL_FILTER_NEAREST = 0x2600, COGL_MATERIAL_FILTER_LINEAR = 0x2601, COGL_MATERIAL_FILTER_NEAREST_MIPMAP_NEAREST = 0x2700, @@ -133,7 +134,8 @@ typedef enum { * XXX: keep the values in sync with the CoglMaterialWrapModeInternal * enum so no conversion is actually needed. */ -typedef enum { +typedef enum +{ COGL_MATERIAL_WRAP_MODE_REPEAT = 0x2901, COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE = 0x812F, COGL_MATERIAL_WRAP_MODE_AUTOMATIC = 0x0207 @@ -517,7 +519,8 @@ cogl_material_get_emission (CoglMaterial *material, * incoming alpha value and a reference alpha value. The #CoglMaterialAlphaFunc * determines how the comparison is done. */ -typedef enum { +typedef enum +{ COGL_MATERIAL_ALPHA_FUNC_NEVER = 0x0200, COGL_MATERIAL_ALPHA_FUNC_LESS = 0x0201, COGL_MATERIAL_ALPHA_FUNC_EQUAL = 0x0202, @@ -992,7 +995,8 @@ cogl_material_get_n_layers (CoglMaterial *material); * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_MATERIAL_LAYER_TYPE_TEXTURE } CoglMaterialLayerType; diff --git a/cogl/cogl/deprecated/cogl-shader.h b/cogl/cogl/deprecated/cogl-shader.h index 91733c8f6..7f6785efb 100644 --- a/cogl/cogl/deprecated/cogl-shader.h +++ b/cogl/cogl/deprecated/cogl-shader.h @@ -234,7 +234,8 @@ G_BEGIN_DECLS * * Since: 1.0 */ -typedef enum { +typedef enum +{ COGL_SHADER_TYPE_VERTEX, COGL_SHADER_TYPE_FRAGMENT } CoglShaderType; diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index 0d8346cc1..45a323561 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -135,7 +135,8 @@ process_damage_event (CoglTexturePixmapX11 *tex_pixmap, { CoglTexture *tex = COGL_TEXTURE (tex_pixmap); Display *display; - enum { DO_NOTHING, NEEDS_SUBTRACT, NEED_BOUNDING_BOX } handle_mode; + enum +{ DO_NOTHING, NEEDS_SUBTRACT, NEED_BOUNDING_BOX } handle_mode; const CoglWinsysVtable *winsys; _COGL_GET_CONTEXT (ctxt, NO_RETVAL); diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h index 0881c8bdd..f23f5168b 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.h +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.h @@ -101,7 +101,8 @@ typedef enum * * Since: 1.10 */ -typedef enum { +typedef enum +{ COGL_TEXTURE_PIXMAP_X11_ERROR_X11, } CoglTexturePixmapX11Error; diff --git a/cogl/cogl/winsys/cogl-winsys-private.h b/cogl/cogl/winsys/cogl-winsys-private.h index 46e4df347..c6b2f3579 100644 --- a/cogl/cogl/winsys/cogl-winsys-private.h +++ b/cogl/cogl/winsys/cogl-winsys-private.h @@ -55,7 +55,8 @@ _cogl_winsys_error_quark (void); #define COGL_WINSYS_ERROR (_cogl_winsys_error_quark ()) -typedef enum { /*< prefix=COGL_WINSYS_ERROR >*/ +typedef enum /*< prefix=COGL_WINSYS_ERROR >*/ +{ COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_CREATE_CONTEXT, COGL_WINSYS_ERROR_CREATE_ONSCREEN, diff --git a/cogl/test-fixtures/test-utils.h b/cogl/test-fixtures/test-utils.h index eace0f6d5..e4929e57f 100644 --- a/cogl/test-fixtures/test-utils.h +++ b/cogl/test-fixtures/test-utils.h @@ -59,7 +59,8 @@ typedef enum _TestFlags * * Flags to pass to the test_utils_texture_new_* family of functions. */ -typedef enum { +typedef enum +{ TEST_UTILS_TEXTURE_NONE = 0, TEST_UTILS_TEXTURE_NO_AUTO_MIPMAP = 1 << 0, TEST_UTILS_TEXTURE_NO_SLICING = 1 << 1, diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c index 3b108c5e7..8946cafeb 100644 --- a/src/backends/meta-barrier.c +++ b/src/backends/meta-barrier.c @@ -26,7 +26,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrier, meta_barrier, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT) -enum { +enum +{ PROP_0, PROP_DISPLAY, @@ -42,7 +43,8 @@ enum { static GParamSpec *obj_props[PROP_LAST]; -enum { +enum +{ HIT, LEFT, diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c index 34a7f91d8..96211a4bd 100644 --- a/src/backends/meta-cursor-renderer.c +++ b/src/backends/meta-cursor-renderer.c @@ -51,7 +51,8 @@ struct _MetaCursorRendererPrivate }; typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate; -enum { +enum +{ CURSOR_PAINTED, LAST_SIGNAL }; diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c index 0d49327f4..6b7849d55 100644 --- a/src/backends/meta-cursor-tracker.c +++ b/src/backends/meta-cursor-tracker.c @@ -46,7 +46,8 @@ G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT); -enum { +enum +{ CURSOR_CHANGED, CURSOR_MOVED, LAST_SIGNAL diff --git a/src/backends/meta-display-config-shared.h b/src/backends/meta-display-config-shared.h index 36a5608b4..f037dac83 100644 --- a/src/backends/meta-display-config-shared.h +++ b/src/backends/meta-display-config-shared.h @@ -27,7 +27,8 @@ #ifndef META_DISPLAY_CONFIG_SHARED_H #define META_DISPLAY_CONFIG_SHARED_H -typedef enum { +typedef enum +{ META_POWER_SAVE_UNSUPPORTED = -1, META_POWER_SAVE_ON = 0, META_POWER_SAVE_STANDBY, diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c index 31212e078..1a3cb2c7b 100644 --- a/src/backends/meta-input-mapper.c +++ b/src/backends/meta-input-mapper.c @@ -41,7 +41,8 @@ struct _MetaInputMapper GHashTable *output_devices; /* MetaLogicalMonitor -> MetaMapperOutputInfo */ }; -typedef enum { +typedef enum +{ META_INPUT_CAP_TOUCH = 1 << 0, /* touch device, either touchscreen or tablet */ META_INPUT_CAP_STYLUS = 1 << 1, /* tablet pen */ META_INPUT_CAP_ERASER = 1 << 2, /* tablet eraser */ @@ -49,7 +50,8 @@ typedef enum { META_INPUT_CAP_CURSOR = 1 << 4 /* pointer-like device in tablets */ } MetaInputCapabilityFlags; -typedef enum { +typedef enum +{ META_MATCH_IS_BUILTIN, /* Output is builtin, applies mainly to system-integrated devices */ META_MATCH_SIZE, /* Size from input device and output match */ META_MATCH_EDID_FULL, /* Full EDID model match, eg. "Cintiq 12WX" */ @@ -87,7 +89,8 @@ struct _DeviceCandidates MetaOutputMatchType best; }; -enum { +enum +{ DEVICE_MAPPED, N_SIGNALS }; diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c index 6ba7d1e2b..27e99b574 100644 --- a/src/backends/meta-input-settings.c +++ b/src/backends/meta-input-settings.c @@ -112,7 +112,8 @@ typedef void (*ConfigUintFunc) (MetaInputSettings *input_settings, ClutterInputDevice *device, guint value); -typedef enum { +typedef enum +{ META_PAD_DIRECTION_NONE = -1, META_PAD_DIRECTION_UP = 0, META_PAD_DIRECTION_DOWN, diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index e43933f95..94202654e 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -72,7 +72,8 @@ enum static GParamSpec *obj_props[PROP_LAST]; -enum { +enum +{ MONITORS_CHANGED, MONITORS_CHANGED_INTERNAL, POWER_SAVE_MODE_CHANGED, diff --git a/src/backends/native/meta-barrier-native.c b/src/backends/native/meta-barrier-native.c index b030921f9..e336d31bf 100644 --- a/src/backends/native/meta-barrier-native.c +++ b/src/backends/native/meta-barrier-native.c @@ -46,7 +46,8 @@ struct _MetaBarrierManagerNative GHashTable *barriers; }; -typedef enum { +typedef enum +{ /* The barrier is active and responsive to pointer motion. */ META_BARRIER_STATE_ACTIVE, diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c index 5b6087df3..89f07ee1f 100644 --- a/src/backends/x11/meta-input-settings-x11.c +++ b/src/backends/x11/meta-input-settings-x11.c @@ -50,7 +50,8 @@ typedef struct _MetaInputSettingsX11Private G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettingsX11, meta_input_settings_x11, META_TYPE_INPUT_SETTINGS) -enum { +enum +{ SCROLL_METHOD_FIELD_2FG, SCROLL_METHOD_FIELD_EDGE, SCROLL_METHOD_FIELD_BUTTON, diff --git a/src/compositor/cogl-utils.h b/src/compositor/cogl-utils.h index 22b182857..ae7e85176 100644 --- a/src/compositor/cogl-utils.h +++ b/src/compositor/cogl-utils.h @@ -25,7 +25,8 @@ CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture); -typedef enum { +typedef enum +{ META_TEXTURE_FLAGS_NONE = 0, META_TEXTURE_ALLOW_SLICING = 1 << 1 } MetaTextureFlags; diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c index 267f762cc..7c0f82d1a 100644 --- a/src/compositor/meta-background-actor.c +++ b/src/compositor/meta-background-actor.c @@ -97,7 +97,8 @@ enum PROP_VIGNETTE_BRIGHTNESS }; -typedef enum { +typedef enum +{ CHANGED_BACKGROUND = 1 << 0, CHANGED_EFFECTS = 1 << 2, CHANGED_VIGNETTE_PARAMETERS = 1 << 3, @@ -147,7 +148,8 @@ typedef enum { typedef struct _MetaBackgroundLayer MetaBackgroundLayer; -typedef enum { +typedef enum +{ PIPELINE_VIGNETTE = (1 << 0), PIPELINE_BLEND = (1 << 1), PIPELINE_GRADIENT = (1 << 2), diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 0cdc7cb00..f06d54245 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -588,7 +588,8 @@ ensure_color_texture (MetaBackground *self) } } -typedef enum { +typedef enum +{ PIPELINE_REPLACE, PIPELINE_ADD, PIPELINE_OVER_REVERSE, diff --git a/src/compositor/meta-dnd-actor.c b/src/compositor/meta-dnd-actor.c index d1e3c60ac..14d35535f 100644 --- a/src/compositor/meta-dnd-actor.c +++ b/src/compositor/meta-dnd-actor.c @@ -33,7 +33,8 @@ #define DRAG_FAILED_DURATION 500 -enum { +enum +{ PROP_DRAG_ORIGIN = 1, PROP_DRAG_START_X, PROP_DRAG_START_Y diff --git a/src/compositor/meta-feedback-actor.c b/src/compositor/meta-feedback-actor.c index 0e98faba7..13851bc0a 100644 --- a/src/compositor/meta-feedback-actor.c +++ b/src/compositor/meta-feedback-actor.c @@ -30,7 +30,8 @@ #include "compositor/meta-feedback-actor-private.h" #include "core/display-private.h" -enum { +enum +{ PROP_ANCHOR_X = 1, PROP_ANCHOR_Y }; diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h index 09ff7ed76..81ccdc01a 100644 --- a/src/compositor/meta-plugin-manager.h +++ b/src/compositor/meta-plugin-manager.h @@ -26,7 +26,8 @@ #include "meta/meta-plugin.h" #include "meta/types.h" -typedef enum { +typedef enum +{ META_PLUGIN_NONE, META_PLUGIN_MINIMIZE, META_PLUGIN_MAP, diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index 3076e3501..d64e214e5 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -74,7 +74,8 @@ static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, Clutte static void cullable_iface_init (MetaCullableInterface *iface); -enum { +enum +{ SIZE_CHANGED, LAST_SIGNAL, diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c index fb2776000..ca4ca19a9 100644 --- a/src/compositor/meta-surface-actor.c +++ b/src/compositor/meta-surface-actor.c @@ -41,7 +41,8 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (MetaSurfaceActor, meta_surface_actor, CLUTTER_ G_ADD_PRIVATE (MetaSurfaceActor) G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init)); -enum { +enum +{ REPAINT_SCHEDULED, SIZE_CHANGED, diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index adcba898c..f850cb222 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -43,7 +43,8 @@ #include "wayland/meta-wayland-surface.h" #endif -typedef enum { +typedef enum +{ INITIALLY_FROZEN, DRAWING_FIRST_FRAME, EMITTED_FIRST_FRAME diff --git a/src/core/display-private.h b/src/core/display-private.h index d34699eb0..55e1d27d1 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -51,7 +51,8 @@ typedef struct _MetaUISlave MetaUISlave; typedef struct MetaEdgeResistanceData MetaEdgeResistanceData; -typedef enum { +typedef enum +{ META_LIST_DEFAULT = 0, /* normal windows */ META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */ META_LIST_SORTED = 1 << 1, /* sort list by mru */ @@ -70,14 +71,16 @@ typedef enum { */ #define N_IGNORED_CROSSING_SERIALS 10 -typedef enum { +typedef enum +{ META_TILE_NONE, META_TILE_LEFT, META_TILE_RIGHT, META_TILE_MAXIMIZED } MetaTileMode; -typedef enum { +typedef enum +{ /* Normal interaction where you're interacting with windows. * Events go to windows normally. */ META_EVENT_ROUTE_NORMAL, diff --git a/src/core/display.c b/src/core/display.c index 2329e706d..c1dbe8834 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -152,7 +152,8 @@ enum LAST_SIGNAL }; -enum { +enum +{ PROP_0, PROP_FOCUS_WINDOW diff --git a/src/core/meta-close-dialog-default.c b/src/core/meta-close-dialog-default.c index fa2c1cae9..5310f88a9 100644 --- a/src/core/meta-close-dialog-default.c +++ b/src/core/meta-close-dialog-default.c @@ -46,7 +46,8 @@ struct _MetaCloseDialogDefault guint child_watch_id; }; -enum { +enum +{ PROP_0, PROP_WINDOW, N_PROPS diff --git a/src/core/meta-close-dialog.c b/src/core/meta-close-dialog.c index 81f692364..6d24fa570 100644 --- a/src/core/meta-close-dialog.c +++ b/src/core/meta-close-dialog.c @@ -25,7 +25,8 @@ #include "meta/meta-close-dialog.h" #include "meta/meta-enum-types.h" -enum { +enum +{ RESPONSE, N_SIGNALS }; diff --git a/src/core/meta-gesture-tracker-private.h b/src/core/meta-gesture-tracker-private.h index 5ce20c7c3..a9db35ebc 100644 --- a/src/core/meta-gesture-tracker-private.h +++ b/src/core/meta-gesture-tracker-private.h @@ -39,7 +39,8 @@ typedef struct _MetaGestureTracker MetaGestureTracker; typedef struct _MetaGestureTrackerClass MetaGestureTrackerClass; -typedef enum { +typedef enum +{ META_SEQUENCE_NONE, META_SEQUENCE_ACCEPTED, META_SEQUENCE_REJECTED, diff --git a/src/core/meta-gesture-tracker.c b/src/core/meta-gesture-tracker.c index e27a35230..21a6b3c55 100644 --- a/src/core/meta-gesture-tracker.c +++ b/src/core/meta-gesture-tracker.c @@ -69,7 +69,8 @@ struct _MetaGestureTrackerPrivate guint autodeny_timeout; }; -enum { +enum +{ PROP_0, PROP_AUTODENY_TIMEOUT, PROP_LAST, @@ -77,7 +78,8 @@ enum { static GParamSpec *obj_props[PROP_LAST]; -enum { +enum +{ STATE_CHANGED, N_SIGNALS }; diff --git a/src/core/meta-inhibit-shortcuts-dialog-default.c b/src/core/meta-inhibit-shortcuts-dialog-default.c index 55ac82359..d90234d6a 100644 --- a/src/core/meta-inhibit-shortcuts-dialog-default.c +++ b/src/core/meta-inhibit-shortcuts-dialog-default.c @@ -33,7 +33,8 @@ struct _MetaInhibitShortcutsDialogDefault MetaWindow *window; }; -enum { +enum +{ PROP_0, PROP_WINDOW, N_PROPS diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c index 9590cc9aa..af7344709 100644 --- a/src/core/meta-workspace-manager.c +++ b/src/core/meta-workspace-manager.c @@ -46,7 +46,8 @@ enum LAST_SIGNAL }; -enum { +enum +{ PROP_0, PROP_N_WORKSPACES diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index 34e4698cd..ee8bf011f 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -81,14 +81,16 @@ typedef union _MetaStackOp MetaStackOp; -typedef enum { +typedef enum +{ STACK_OP_ADD, STACK_OP_REMOVE, STACK_OP_RAISE_ABOVE, STACK_OP_LOWER_BELOW } MetaStackOpType; -typedef enum { +typedef enum +{ APPLY_DEFAULT = 0, /* Only do restacking that we can do locally without changing * the order of X windows. After we've received any stack diff --git a/src/core/startup-notification.c b/src/core/startup-notification.c index 6319eb1ca..8bcb0f385 100644 --- a/src/core/startup-notification.c +++ b/src/core/startup-notification.c @@ -39,13 +39,15 @@ */ #define STARTUP_TIMEOUT 15000000 -enum { +enum +{ PROP_0, PROP_DISPLAY, N_PROPS }; -enum { +enum +{ PROP_SEQ_0, PROP_SEQ_ID, PROP_SEQ_TIMESTAMP, @@ -57,7 +59,8 @@ enum { N_SEQ_PROPS }; -enum { +enum +{ CHANGED, N_SIGNALS }; diff --git a/src/core/window-private.h b/src/core/window-private.h index b9f1fcea3..9fe5bc526 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -48,14 +48,16 @@ typedef struct _MetaWindowQueue MetaWindowQueue; -typedef enum { +typedef enum +{ META_CLIENT_TYPE_UNKNOWN = 0, META_CLIENT_TYPE_APPLICATION = 1, META_CLIENT_TYPE_PAGER = 2, META_CLIENT_TYPE_MAX_RECOGNIZED = 2 } MetaClientType; -typedef enum { +typedef enum +{ META_QUEUE_CALC_SHOWING = 1 << 0, META_QUEUE_MOVE_RESIZE = 1 << 1, META_QUEUE_UPDATE_ICON = 1 << 2, @@ -63,7 +65,8 @@ typedef enum { #define NUMBER_OF_QUEUES 3 -typedef enum { +typedef enum +{ _NET_WM_BYPASS_COMPOSITOR_HINT_AUTO = 0, _NET_WM_BYPASS_COMPOSITOR_HINT_ON = 1, _NET_WM_BYPASS_COMPOSITOR_HINT_OFF = 2, diff --git a/src/core/window.c b/src/core/window.c index c112c7d59..62b2df810 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -183,7 +183,8 @@ static gboolean idle_update_icon (gpointer data); G_DEFINE_ABSTRACT_TYPE (MetaWindow, meta_window, G_TYPE_OBJECT); -enum { +enum +{ PROP_0, PROP_TITLE, diff --git a/src/core/workspace.c b/src/core/workspace.c index a88c9784c..f2b2c2c48 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -57,7 +57,8 @@ static void free_this (gpointer candidate, G_DEFINE_TYPE (MetaWorkspace, meta_workspace, G_TYPE_OBJECT); -enum { +enum +{ PROP_0, PROP_N_WINDOWS, diff --git a/src/meta/barrier.h b/src/meta/barrier.h index 8035e4887..72ed33cfc 100644 --- a/src/meta/barrier.h +++ b/src/meta/barrier.h @@ -70,7 +70,8 @@ void meta_barrier_release (MetaBarrier *barrier, */ /* Keep in sync with XFixes */ -typedef enum { +typedef enum +{ META_BARRIER_DIRECTION_POSITIVE_X = 1 << 0, META_BARRIER_DIRECTION_POSITIVE_Y = 1 << 1, META_BARRIER_DIRECTION_NEGATIVE_X = 1 << 2, diff --git a/src/meta/compositor.h b/src/meta/compositor.h index ab343ee9b..31d14dda3 100644 --- a/src/meta/compositor.h +++ b/src/meta/compositor.h @@ -54,7 +54,8 @@ typedef enum META_COMP_EFFECT_NONE } MetaCompEffect; -typedef enum { +typedef enum +{ META_SIZE_CHANGE_MAXIMIZE, META_SIZE_CHANGE_UNMAXIMIZE, META_SIZE_CHANGE_FULLSCREEN, diff --git a/src/meta/meta-plugin.h b/src/meta/meta-plugin.h index f02a263eb..6665531bf 100644 --- a/src/meta/meta-plugin.h +++ b/src/meta/meta-plugin.h @@ -367,7 +367,8 @@ meta_plugin_complete_display_change (MetaPlugin *plugin, * * Options that can be provided when calling meta_plugin_begin_modal(). */ -typedef enum { +typedef enum +{ META_MODAL_POINTER_ALREADY_GRABBED = 1 << 0, META_MODAL_KEYBOARD_ALREADY_GRABBED = 1 << 1 } MetaModalOptions; diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h index ec35c257e..9ba164910 100644 --- a/src/meta/meta-window-actor.h +++ b/src/meta/meta-window-actor.h @@ -46,7 +46,8 @@ void meta_window_actor_sync_visibility (MetaWindowActor *self META_EXPORT gboolean meta_window_actor_is_destroyed (MetaWindowActor *self); -typedef enum { +typedef enum +{ META_SHADOW_MODE_AUTO, META_SHADOW_MODE_FORCED_OFF, META_SHADOW_MODE_FORCED_ON, diff --git a/src/meta/util.h b/src/meta/util.h index e0b550d62..497cea99b 100644 --- a/src/meta/util.h +++ b/src/meta/util.h @@ -198,7 +198,8 @@ GPid meta_show_dialog (const char *type, * @META_LATER_IDLE: call at a very low priority (can be blocked * by running animations or redrawing applications) **/ -typedef enum { +typedef enum +{ META_LATER_RESIZE, META_LATER_CALC_SHOWING, META_LATER_CHECK_FULLSCREEN, diff --git a/src/meta/window.h b/src/meta/window.h index f6eb75c68..6261fffbb 100644 --- a/src/meta/window.h +++ b/src/meta/window.h @@ -86,7 +86,8 @@ typedef enum * @META_WINDOW_CLIENT_TYPE_WAYLAND: A Wayland based window * @META_WINDOW_CLIENT_TYPE_X11: An X11 based window */ -typedef enum { +typedef enum +{ META_WINDOW_CLIENT_TYPE_WAYLAND, META_WINDOW_CLIENT_TYPE_X11 } MetaWindowClientType; diff --git a/src/ui/frames.c b/src/ui/frames.c index dce5a4f73..33dfaa071 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -71,7 +71,8 @@ static MetaFrameControl get_control (MetaUIFrame *frame, G_DEFINE_TYPE (MetaFrames, meta_frames, GTK_TYPE_WINDOW); -enum { +enum +{ META_ACTION_CLICK, META_ACTION_RIGHT_CLICK, META_ACTION_MIDDLE_CLICK, diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c index 04f43fc17..7695d86af 100644 --- a/src/wayland/meta-wayland-outputs.c +++ b/src/wayland/meta-wayland-outputs.c @@ -36,7 +36,8 @@ #include "xdg-output-unstable-v1-server-protocol.h" -enum { +enum +{ OUTPUT_DESTROYED, LAST_SIGNAL diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 27b8f38cd..3ace7b3e4 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -74,7 +74,8 @@ #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int (10) -enum { +enum +{ FOCUS_SURFACE_CHANGED, LAST_SIGNAL diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 893227771..da0acfcbb 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -57,7 +57,8 @@ #include "wayland/meta-xwayland-private.h" #include "wayland/meta-xwayland-private.h" -enum { +enum +{ PENDING_STATE_SIGNAL_APPLIED, PENDING_STATE_SIGNAL_LAST_SIGNAL @@ -87,7 +88,8 @@ G_DEFINE_TYPE (MetaWaylandPendingState, meta_wayland_pending_state, G_TYPE_OBJECT); -enum { +enum +{ SURFACE_DESTROY, SURFACE_UNMAPPED, SURFACE_CONFIGURE, diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c index 8502e2254..808f91333 100644 --- a/src/wayland/meta-xwayland-selection.c +++ b/src/wayland/meta-xwayland-selection.c @@ -98,7 +98,8 @@ struct _MetaXWaylandSelection { MetaDndBridge dnd; }; -enum { +enum +{ ATOM_DND_SELECTION, ATOM_DND_AWARE, ATOM_DND_STATUS, diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index f21b16de6..15c85df69 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -36,7 +36,8 @@ #include "meta/main.h" #include "wayland/meta-wayland-actor-surface.h" -enum { +enum +{ XWAYLAND_SURFACE_WINDOW_ASSOCIATED, XWAYLAND_SURFACE_LAST_SIGNAL diff --git a/src/x11/meta-startup-notification-x11.c b/src/x11/meta-startup-notification-x11.c index 75dd4aa3c..d6814926a 100644 --- a/src/x11/meta-startup-notification-x11.c +++ b/src/x11/meta-startup-notification-x11.c @@ -28,7 +28,8 @@ #ifdef HAVE_STARTUP_NOTIFICATION -enum { +enum +{ PROP_SEQ_X11_0, PROP_SEQ_X11_SEQ, N_SEQ_X11_PROPS diff --git a/src/x11/window-props.c b/src/x11/window-props.c index 45fe6f600..adaab0eba 100644 --- a/src/x11/window-props.c +++ b/src/x11/window-props.c @@ -63,7 +63,8 @@ typedef void (* ReloadValueFunc) (MetaWindow *window, MetaPropValue *value, gboolean initial); -typedef enum { +typedef enum +{ NONE = 0, LOAD_INIT = (1 << 0), INCLUDE_OR = (1 << 1),