cleanup: Make include macro usages consistent

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3157>
This commit is contained in:
Bilal Elmoussaoui 2023-08-07 15:38:12 +02:00 committed by Marge Bot
parent e0ed157e5d
commit a955f0e47c
485 changed files with 2201 additions and 2193 deletions

View File

@ -24,7 +24,7 @@
#pragma once
#include "cally-actor.h"
#include "cally/cally-actor.h"
/*
* Auxiliary define, in order to get the clutter actor from the AtkObject using

View File

@ -66,17 +66,17 @@
*
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <glib.h>
#include <clutter/clutter.h>
#include "clutter/clutter.h"
#include "clutter/clutter-actor-private.h"
#include <math.h>
#include "cally-actor.h"
#include "cally-actor-private.h"
#include "cally/cally-actor.h"
#include "cally/cally-actor-private.h"
typedef struct _CallyActorActionInfo CallyActorActionInfo;

View File

@ -29,7 +29,8 @@
#endif
#include <atk/atk.h>
#include <clutter/clutter.h>
#include "clutter/clutter.h"
G_BEGIN_DECLS

View File

@ -68,10 +68,10 @@
* a11y POV should still be managed as a image (with the proper properties,
* position, size, etc.).
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "cally-clone.h"
#include "cally-actor-private.h"
#include "cally/cally-clone.h"
#include "cally/cally-actor-private.h"
/* AtkObject */
static void cally_clone_real_initialize (AtkObject *obj,

View File

@ -24,8 +24,8 @@
#error "Only <cally/cally.h> can be included directly."
#endif
#include <clutter/clutter.h>
#include <cally/cally-actor.h>
#include "clutter/clutter.h"
#include "cally/cally-actor.h"
G_BEGIN_DECLS

View File

@ -35,13 +35,13 @@
* [class@Clutter.StageManager]).
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "cally-root.h"
#include "cally/cally-root.h"
#include "clutter-actor.h"
#include "clutter-stage-private.h"
#include "clutter-stage-manager.h"
#include "clutter/clutter-actor.h"
#include "clutter/clutter-stage-private.h"
#include "clutter/clutter-stage-manager.h"
/* GObject */

View File

@ -25,7 +25,8 @@
#endif
#include <atk/atk.h>
#include <clutter/clutter.h>
#include "clutter/clutter.h"
G_BEGIN_DECLS

View File

@ -33,10 +33,10 @@
* being a canvas. Anyway, this is required for applications using
* just clutter, or directly [class@Clutter.Stage]
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "cally-stage.h"
#include "cally-actor-private.h"
#include "cally/cally-stage.h"
#include "cally/cally-actor-private.h"
/* AtkObject.h */
static void cally_stage_real_initialize (AtkObject *obj,

View File

@ -24,8 +24,8 @@
#error "Only <cally/cally.h> can be included directly."
#endif
#include <cally/cally-actor.h>
#include <clutter/clutter.h>
#include "cally/cally-actor.h"
#include "clutter/clutter.h"
G_BEGIN_DECLS

View File

@ -37,14 +37,14 @@
* [class@Clutter.Text], #AtkText and #AtkEditableText
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "cally-text.h"
#include "cally-actor-private.h"
#include "cally/cally-text.h"
#include "cally/cally-actor-private.h"
#include "clutter-color.h"
#include "clutter-main.h"
#include "clutter-text.h"
#include "clutter/clutter-color.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-text.h"
static void cally_text_finalize (GObject *obj);

View File

@ -24,8 +24,8 @@
#error "Only <cally/cally.h> can be included directly."
#endif
#include <clutter/clutter.h>
#include <cally/cally-actor.h>
#include "clutter/clutter.h"
#include "cally/cally-actor.h"
G_BEGIN_DECLS

View File

@ -37,15 +37,15 @@
* available any accessible object.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <stdlib.h>
#include <string.h>
#include <clutter/clutter.h>
#include "cally-util.h"
#include "cally-root.h"
#include "cally-stage.h"
#include "cally/cally-util.h"
#include "cally/cally-root.h"
#include "cally/cally-stage.h"
#include "clutter/clutter.h"
#define DEFAULT_PASSWORD_CHAR '*'

View File

@ -24,7 +24,7 @@
#error "Only <cally/cally.h> can be included directly."
#endif
#include <clutter/clutter.h>
#include "clutter/clutter.h"
#include <atk/atk.h>
G_BEGIN_DECLS

View File

@ -29,24 +29,24 @@
*
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "cally.h"
#include "cally/cally.h"
#include "cally-actor.h"
#include "cally-stage.h"
#include "cally-text.h"
#include "cally-clone.h"
#include "cally/cally-actor.h"
#include "cally/cally-stage.h"
#include "cally/cally-text.h"
#include "cally/cally-clone.h"
#include "cally-factory.h"
#include "cally-util.h"
#include "cally/cally-factory.h"
#include "cally/cally-util.h"
#include "clutter.h"
#include "clutter/clutter.h"
#include "clutter-debug.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-private.h"
/* factories initialization*/
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)

View File

@ -22,13 +22,13 @@
#define __CALLY_H_INSIDE__
#include "cally-actor.h"
#include "cally-clone.h"
#include "cally-factory.h"
#include "cally-main.h"
#include "cally-root.h"
#include "cally-stage.h"
#include "cally-text.h"
#include "cally-util.h"
#include "cally/cally-actor.h"
#include "cally/cally-clone.h"
#include "cally/cally-factory.h"
#include "cally/cally-main.h"
#include "cally/cally-root.h"
#include "cally/cally-stage.h"
#include "cally/cally-text.h"
#include "cally/cally-util.h"
#undef __CALLY_H_INSIDE__

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-action.h>
#include "clutter/clutter-action.h"
G_BEGIN_DECLS

View File

@ -38,12 +38,12 @@
* various event-related signals provided by [class@Actor] itself.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-action.h"
#include "clutter-action-private.h"
#include "clutter-debug.h"
#include "clutter-private.h"
#include "clutter/clutter-action.h"
#include "clutter/clutter-action-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-private.h"
typedef struct _ClutterActionPrivate ClutterActionPrivate;

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-actor-meta.h>
#include "clutter/clutter-actor-meta.h"
G_BEGIN_DECLS

View File

@ -1,6 +1,6 @@
#pragma once
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -1,11 +1,11 @@
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include "clutter-types.h"
#include "clutter-interval.h"
#include "clutter-private.h"
#include "clutter-actor-box-private.h"
#include "clutter/clutter-types.h"
#include "clutter/clutter-interval.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-actor-box-private.h"
/**
* clutter_actor_box_new:

View File

@ -24,7 +24,7 @@
#pragma once
#include <clutter/clutter-actor-meta.h>
#include "clutter/clutter-actor-meta.h"
G_BEGIN_DECLS

View File

@ -38,12 +38,12 @@
* any kind of modification.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-actor-meta-private.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter-debug.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-private.h"
struct _ClutterActorMetaPrivate
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -21,8 +21,8 @@
#pragma once
#include <clutter/clutter-actor.h>
#include <clutter/clutter-grab.h>
#include "clutter/clutter-actor.h"
#include "clutter/clutter-grab.h"
G_BEGIN_DECLS

View File

@ -523,48 +523,48 @@
#include <gobject/gvaluecollector.h>
#include <cogl/cogl.h>
#include "cogl/cogl.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-actor-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter-action.h"
#include "clutter-action-private.h"
#include "clutter-actor-meta-private.h"
#include "clutter-animatable.h"
#include "clutter-color-state.h"
#include "clutter-color-static.h"
#include "clutter-color.h"
#include "clutter-constraint-private.h"
#include "clutter-container-private.h"
#include "clutter-content-private.h"
#include "clutter-debug.h"
#include "clutter-easing.h"
#include "clutter-effect-private.h"
#include "clutter-enum-types.h"
#include "clutter-fixed-layout.h"
#include "clutter-flatten-effect.h"
#include "clutter-interval.h"
#include "clutter-main.h"
#include "clutter-marshal.h"
#include "clutter-mutter.h"
#include "clutter-paint-context-private.h"
#include "clutter-paint-nodes.h"
#include "clutter-paint-node-private.h"
#include "clutter-paint-volume-private.h"
#include "clutter-pick-context-private.h"
#include "clutter-private.h"
#include "clutter-property-transition.h"
#include "clutter-scriptable.h"
#include "clutter-script-private.h"
#include "clutter-stage-private.h"
#include "clutter-stage-view-private.h"
#include "clutter-timeline.h"
#include "clutter-transition.h"
#include "clutter-units.h"
#include "clutter/clutter-action.h"
#include "clutter/clutter-action-private.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter/clutter-animatable.h"
#include "clutter/clutter-color-state.h"
#include "clutter/clutter-color-static.h"
#include "clutter/clutter-color.h"
#include "clutter/clutter-constraint-private.h"
#include "clutter/clutter-container-private.h"
#include "clutter/clutter-content-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-easing.h"
#include "clutter/clutter-effect-private.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-fixed-layout.h"
#include "clutter/clutter-flatten-effect.h"
#include "clutter/clutter-interval.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-mutter.h"
#include "clutter/clutter-paint-context-private.h"
#include "clutter/clutter-paint-nodes.h"
#include "clutter/clutter-paint-node-private.h"
#include "clutter/clutter-paint-volume-private.h"
#include "clutter/clutter-pick-context-private.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-property-transition.h"
#include "clutter/clutter-scriptable.h"
#include "clutter/clutter-script-private.h"
#include "clutter/clutter-stage-private.h"
#include "clutter/clutter-stage-view-private.h"
#include "clutter/clutter-timeline.h"
#include "clutter/clutter-transition.h"
#include "clutter/clutter-units.h"
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
/* Internal enum used to control mapped state update. This is a hint
* which indicates when to do something other than just enforce

View File

@ -34,12 +34,12 @@
#include <pango/pango.h>
#include <atk/atk.h>
#include <cogl/cogl.h>
#include "cogl/cogl.h"
#include <clutter/clutter-types.h>
#include <clutter/clutter-event.h>
#include <clutter/clutter-paint-context.h>
#include <clutter/clutter-pick-context.h>
#include "clutter/clutter-types.h"
#include "clutter/clutter-event.h"
#include "clutter/clutter-paint-context.h"
#include "clutter/clutter-pick-context.h"
G_BEGIN_DECLS

View File

@ -32,16 +32,16 @@
* [class@Actor] using an alignment factor
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-align-constraint.h"
#include "clutter/clutter-align-constraint.h"
#include "clutter-actor-meta-private.h"
#include "clutter-actor-private.h"
#include "clutter-constraint.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-private.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-constraint.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-private.h"
#include <math.h>

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-constraint.h>
#include "clutter/clutter-constraint.h"
G_BEGIN_DECLS

View File

@ -36,12 +36,12 @@
* depending on a progress factor, expressed as a floating point value.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-animatable.h"
#include "clutter-interval.h"
#include "clutter-debug.h"
#include "clutter-private.h"
#include "clutter/clutter-animatable.h"
#include "clutter/clutter-interval.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-private.h"
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -21,9 +21,9 @@
#pragma once
#include <clutter/clutter-backend.h>
#include <clutter/clutter-seat.h>
#include <clutter/clutter-stage-window.h>
#include "clutter/clutter-backend.h"
#include "clutter/clutter-seat.h"
#include "clutter/clutter-stage-window.h"
#define CLUTTER_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
#define CLUTTER_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND))

View File

@ -37,19 +37,19 @@
* and settings.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-backend-private.h"
#include "clutter-debug.h"
#include "clutter-event-private.h"
#include "clutter-marshal.h"
#include "clutter-mutter.h"
#include "clutter-private.h"
#include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h"
#include "clutter-stage-window.h"
#include "clutter/clutter-backend-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-event-private.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-mutter.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-stage-manager-private.h"
#include "clutter/clutter-stage-private.h"
#include "clutter/clutter-stage-window.h"
#include <cogl/cogl.h>
#include "cogl/cogl.h"
#define DEFAULT_FONT_NAME "Sans 10"

View File

@ -30,11 +30,11 @@
#include <cairo.h>
#include <pango/pango.h>
#include <cogl/cogl.h>
#include "cogl/cogl.h"
#include <clutter/clutter-keymap.h>
#include <clutter/clutter-types.h>
#include <clutter/clutter-seat.h>
#include "clutter/clutter-keymap.h"
#include "clutter/clutter-types.h"
#include "clutter/clutter-seat.h"
G_BEGIN_DECLS

View File

@ -30,10 +30,10 @@
* across the whole API.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-types.h"
#include "clutter-private.h"
#include "clutter/clutter-types.h"
#include "clutter/clutter-private.h"
#include <math.h>

View File

@ -21,12 +21,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <glib.h>
#include <string.h>
#include "clutter-bezier.h"
#include "clutter-debug.h"
#include "clutter/clutter-bezier.h"
#include "clutter/clutter-debug.h"
/*
* We have some experimental code here to allow for constant velocity

View File

@ -24,7 +24,8 @@
#pragma once
#include <glib.h>
#include "clutter-types.h"
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -42,21 +42,21 @@
* shows how to pack actors inside a #ClutterBinLayout.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
#include "clutter-actor-private.h"
#include "clutter-animatable.h"
#include "clutter-bin-layout.h"
#include "clutter-child-meta.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-layout-meta.h"
#include "clutter-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-animatable.h"
#include "clutter/clutter-bin-layout.h"
#include "clutter/clutter-child-meta.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-layout-meta.h"
#include "clutter/clutter-private.h"
#define CLUTTER_TYPE_BIN_LAYER (clutter_bin_layer_get_type ())
#define CLUTTER_BIN_LAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIN_LAYER, ClutterBinLayer))

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-layout-manager.h>
#include "clutter/clutter-layout-manager.h"
G_BEGIN_DECLS

View File

@ -81,18 +81,18 @@
* ```
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include "clutter-bind-constraint.h"
#include "clutter/clutter-bind-constraint.h"
#include "clutter-actor-meta-private.h"
#include "clutter-actor-private.h"
#include "clutter-constraint.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-private.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-constraint.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-private.h"
#define CLUTTER_BIND_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BIND_CONSTRAINT, ClutterBindConstraintClass))
#define CLUTTER_IS_BIND_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BIND_CONSTRAINT))

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-constraint.h>
#include "clutter/clutter-constraint.h"
G_BEGIN_DECLS

View File

@ -93,13 +93,13 @@
* key binding handler returned %FALSE.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-binding-pool.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-marshal.h"
#include "clutter-private.h"
#include "clutter/clutter-binding-pool.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-private.h"
#define CLUTTER_BINDING_POOL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CLUTTER_TYPE_BINDING_POOL, ClutterBindingPoolClass))
#define CLUTTER_IS_BINDING_POOL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_BINDING_POOL))

View File

@ -28,7 +28,8 @@
#endif
#include <glib-object.h>
#include <clutter/clutter-event.h>
#include "clutter/clutter-event.h"
G_BEGIN_DECLS

View File

@ -35,15 +35,15 @@
#define CLUTTER_IS_BLUR_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
#define CLUTTER_BLUR_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-blur-effect.h"
#include "clutter/clutter-blur-effect.h"
#include "cogl/cogl.h"
#include "clutter-debug.h"
#include "clutter-offscreen-effect.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-offscreen-effect.h"
#include "clutter/clutter-private.h"
#define BLUR_PADDING 2

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-effect.h>
#include "clutter/clutter-effect.h"
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#include <glib-object.h>
#include <cogl/cogl.h>
#include "cogl/cogl.h"
G_BEGIN_DECLS

View File

@ -15,9 +15,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "clutter-blur-private.h"
#include "clutter/clutter-blur-private.h"
#include "clutter-backend.h"
#include "clutter/clutter-backend.h"
/**
* SECTION:clutter-blur

View File

@ -46,21 +46,21 @@
* #ClutterBoxLayout by using clutter_box_layout_set_spacing().
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
#include "clutter-box-layout.h"
#include "clutter/clutter-box-layout.h"
#include "clutter-actor-private.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-layout-meta.h"
#include "clutter-private.h"
#include "clutter-types.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-layout-meta.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-types.h"
struct _ClutterBoxLayoutPrivate
{

View File

@ -31,7 +31,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-layout-manager.h>
#include "clutter/clutter-layout-manager.h"
G_BEGIN_DECLS

View File

@ -35,18 +35,17 @@
#define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
#define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include "clutter-brightness-contrast-effect.h"
#include "cogl/cogl.h"
#include <cogl/cogl.h>
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-offscreen-effect.h"
#include "clutter-private.h"
#include "clutter/clutter-brightness-contrast-effect.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-offscreen-effect.h"
#include "clutter/clutter-private.h"
struct _ClutterBrightnessContrastEffect
{

View File

@ -28,8 +28,8 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-color.h>
#include <clutter/clutter-effect.h>
#include "clutter/clutter-color.h"
#include "clutter/clutter-effect.h"
G_BEGIN_DECLS

View File

@ -27,10 +27,10 @@
* Clutter provides some utility functions for using Cairo.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-cairo.h"
#include "clutter-color.h"
#include "clutter/clutter-cairo.h"
#include "clutter/clutter-color.h"
/**
* clutter_cairo_set_source_color:

View File

@ -25,7 +25,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -39,25 +39,24 @@
* for an example of how to use #ClutterCanvas..
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include <cogl/cogl.h>
#include <cairo-gobject.h>
#include "clutter-canvas.h"
#include "clutter-actor-private.h"
#include "clutter-backend.h"
#include "clutter-cairo.h"
#include "clutter-color.h"
#include "clutter-content-private.h"
#include "clutter-debug.h"
#include "clutter-marshal.h"
#include "clutter-paint-node.h"
#include "clutter-paint-nodes.h"
#include "clutter-private.h"
#include "clutter-settings.h"
#include "cogl/cogl.h"
#include "clutter/clutter-canvas.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-backend.h"
#include "clutter/clutter-cairo.h"
#include "clutter/clutter-color.h"
#include "clutter/clutter-content-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-paint-node.h"
#include "clutter/clutter-paint-nodes.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-settings.h"
struct _ClutterCanvasPrivate
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -64,12 +64,12 @@
* and #ClutterContainerIface.get_child_meta().
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-child-meta.h"
#include "clutter-container.h"
#include "clutter-debug.h"
#include "clutter-private.h"
#include "clutter/clutter-child-meta.h"
#include "clutter/clutter-container.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-private.h"
G_DEFINE_ABSTRACT_TYPE (ClutterChildMeta, clutter_child_meta, G_TYPE_OBJECT);

View File

@ -32,7 +32,8 @@
#endif
#include <glib-object.h>
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -87,14 +87,14 @@
* ```
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-click-action.h"
#include "clutter/clutter-click-action.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-marshal.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-private.h"
struct _ClutterClickActionPrivate
{

View File

@ -31,8 +31,8 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-action.h>
#include <clutter/clutter-event.h>
#include "clutter/clutter-action.h"
#include "clutter/clutter-event.h"
G_BEGIN_DECLS

View File

@ -36,14 +36,14 @@
* implementation.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-actor-private.h"
#include "clutter-clone.h"
#include "clutter-debug.h"
#include "clutter-main.h"
#include "clutter-paint-volume-private.h"
#include "clutter-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-clone.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-paint-volume-private.h"
#include "clutter/clutter-private.h"
#include "cogl/cogl.h"

View File

@ -27,7 +27,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-actor.h>
#include "clutter/clutter-actor.h"
G_BEGIN_DECLS

View File

@ -43,13 +43,13 @@
* actor content is in pq or not, and things like that
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-color-state.h"
#include "clutter/clutter-color-state.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-private.h"
enum
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -21,17 +21,17 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include <pango/pango-attributes.h>
#include "clutter-interval.h"
#include "clutter-main.h"
#include "clutter-color.h"
#include "clutter-private.h"
#include "clutter-debug.h"
#include "clutter/clutter-interval.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-color.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-debug.h"
/* XXX - keep in sync with the ClutterStaticColor enumeration order */
static const ClutterColor static_colors[] = {

View File

@ -29,7 +29,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -35,16 +35,16 @@
#define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
#define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-colorize-effect.h"
#include "clutter/clutter-colorize-effect.h"
#include "cogl/cogl.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-offscreen-effect.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-offscreen-effect.h"
#include "clutter/clutter-private.h"
struct _ClutterColorizeEffect
{

View File

@ -28,8 +28,8 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-color.h>
#include <clutter/clutter-effect.h>
#include "clutter/clutter-color.h"
#include "clutter/clutter-effect.h"
G_BEGIN_DECLS

View File

@ -21,7 +21,7 @@
#pragma once
#include "clutter-constraint.h"
#include "clutter/clutter-constraint.h"
G_BEGIN_DECLS

View File

@ -125,15 +125,15 @@
* can be recovered at any point using clutter_actor_meta_get_actor().
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <string.h>
#include "clutter-constraint-private.h"
#include "clutter/clutter-constraint-private.h"
#include "clutter-actor.h"
#include "clutter-actor-meta-private.h"
#include "clutter-private.h"
#include "clutter/clutter-actor.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter/clutter-private.h"
G_DEFINE_ABSTRACT_TYPE (ClutterConstraint,
clutter_constraint,

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-actor-meta.h>
#include "clutter/clutter-actor-meta.h"
G_BEGIN_DECLS

View File

@ -21,7 +21,7 @@
#pragma once
#include <clutter/clutter-container.h>
#include "clutter/clutter-container.h"
G_BEGIN_DECLS

View File

@ -26,23 +26,23 @@
* Author: Emmanuele Bassi <ebassi@openedhand.com>
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <stdarg.h>
#include <glib-object.h>
#include <gobject/gvaluecollector.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
#include "clutter-actor-private.h"
#include "clutter-child-meta.h"
#include "clutter-container-private.h"
#include "clutter-debug.h"
#include "clutter-main.h"
#include "clutter-marshal.h"
#include "clutter-private.h"
#include "clutter-enum-types.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-child-meta.h"
#include "clutter/clutter-container-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-enum-types.h"
#define CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED(container,vfunc) \
G_STMT_START { \

View File

@ -30,9 +30,9 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-actor.h>
#include <clutter/clutter-child-meta.h>
#include <clutter/clutter-types.h>
#include "clutter/clutter-actor.h"
#include "clutter/clutter-child-meta.h"
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -24,7 +24,7 @@
#pragma once
#include <clutter/clutter-content.h>
#include "clutter/clutter-content.h"
G_BEGIN_DECLS

View File

@ -34,14 +34,14 @@
* to share the resources associated with painting the same content..
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-actor-private.h"
#include "clutter-content-private.h"
#include "clutter/clutter-actor-private.h"
#include "clutter/clutter-content-private.h"
#include "clutter-debug.h"
#include "clutter-marshal.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-private.h"
enum
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -16,9 +16,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-damage-history.h"
#include "clutter/clutter-damage-history.h"
#define DAMAGE_HISTORY_LENGTH 0x10

View File

@ -21,7 +21,7 @@
#include <cairo.h>
#include <glib.h>
#include "clutter-macros.h"
#include "clutter/clutter-macros.h"
typedef struct _ClutterDamageHistory ClutterDamageHistory;

View File

@ -1,7 +1,8 @@
#pragma once
#include <glib.h>
#include "clutter-main.h"
#include "clutter/clutter-main.h"
G_BEGIN_DECLS

View File

@ -48,18 +48,17 @@
* deformation algorithm.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-deform-effect.h"
#include "cogl/cogl.h"
#include <cogl/cogl.h>
#include "clutter-color.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-paint-node.h"
#include "clutter-paint-nodes.h"
#include "clutter-private.h"
#include "clutter/clutter-deform-effect.h"
#include "clutter/clutter-color.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-paint-node.h"
#include "clutter/clutter-paint-nodes.h"
#include "clutter/clutter-private.h"
#define DEFAULT_N_TILES 32

View File

@ -28,8 +28,8 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <cogl/cogl.h>
#include <clutter/clutter-offscreen-effect.h>
#include "cogl/cogl.h"
#include "clutter/clutter-offscreen-effect.h"
G_BEGIN_DECLS

View File

@ -2,7 +2,7 @@
#define __CLUTTER_DEPRECATED_H_INSIDE__
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
#undef __CLUTTER_DEPRECATED_H_INSIDE__

View File

@ -37,18 +37,18 @@
#define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT))
#define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#include "clutter-desaturate-effect.h"
#include "clutter/clutter-desaturate-effect.h"
#include "cogl/cogl.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-offscreen-effect.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-offscreen-effect.h"
#include "clutter/clutter-private.h"
struct _ClutterDesaturateEffect
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-effect.h>
#include "clutter/clutter-effect.h"
G_BEGIN_DECLS

View File

@ -1,6 +1,6 @@
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-easing.h"
#include "clutter/clutter-easing.h"
#include <math.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -1,6 +1,6 @@
#pragma once
#include <clutter/clutter-effect.h>
#include "clutter/clutter-effect.h"
G_BEGIN_DECLS

View File

@ -159,19 +159,19 @@
* ```
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-effect.h"
#include "clutter/clutter-effect.h"
#include "clutter-actor-meta-private.h"
#include "clutter-debug.h"
#include "clutter-effect-private.h"
#include "clutter-enum-types.h"
#include "clutter-marshal.h"
#include "clutter-paint-node-private.h"
#include "clutter-paint-nodes.h"
#include "clutter-private.h"
#include "clutter-actor-private.h"
#include "clutter/clutter-actor-meta-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-effect-private.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-marshal.h"
#include "clutter/clutter-paint-node-private.h"
#include "clutter/clutter-paint-nodes.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-actor-private.h"
G_DEFINE_ABSTRACT_TYPE (ClutterEffect,
clutter_effect,

View File

@ -28,9 +28,9 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-actor-meta.h>
#include <clutter/clutter-paint-context.h>
#include <clutter/clutter-pick-context.h>
#include "clutter/clutter-actor-meta.h"
#include "clutter/clutter-paint-context.h"
#include "clutter/clutter-pick-context.h"
G_BEGIN_DECLS

View File

@ -1,6 +1,6 @@
/*** BEGIN file-header ***/
#include "clutter-build-config.h"
#include "clutter-enum-types.h"
#include "clutter/clutter-build-config.h"
#include "clutter/clutter-enum-types.h"
/*** END file-header ***/
/*** BEGIN file-production ***/

View File

@ -5,7 +5,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include "clutter/clutter-types.h"
G_BEGIN_DECLS

View File

@ -1,6 +1,6 @@
#pragma once
#include <clutter/clutter-event.h>
#include "clutter/clutter-event.h"
G_BEGIN_DECLS

View File

@ -23,13 +23,13 @@
*
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-backend-private.h"
#include "clutter-debug.h"
#include "clutter-event-private.h"
#include "clutter-keysyms.h"
#include "clutter-private.h"
#include "clutter/clutter-backend-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-event-private.h"
#include "clutter/clutter-keysyms.h"
#include "clutter/clutter-private.h"
#include <math.h>

View File

@ -27,8 +27,8 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-types.h>
#include <clutter/clutter-input-device.h>
#include "clutter/clutter-types.h"
#include "clutter/clutter-input-device.h"
G_BEGIN_DECLS

View File

@ -35,17 +35,17 @@
* run-time.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include "clutter-backend-private.h"
#include "clutter-feature.h"
#include "clutter-main.h"
#include "clutter-private.h"
#include "clutter-debug.h"
#include "clutter/clutter-backend-private.h"
#include "clutter/clutter-feature.h"
#include "clutter/clutter-main.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-debug.h"
#include "cogl/cogl.h"

View File

@ -33,11 +33,11 @@
* layout policies as #ClutterGroup.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-debug.h"
#include "clutter-fixed-layout.h"
#include "clutter-private.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-fixed-layout.h"
#include "clutter/clutter-private.h"
G_DEFINE_TYPE (ClutterFixedLayout,
clutter_fixed_layout,

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-layout-manager.h>
#include "clutter/clutter-layout-manager.h"
G_BEGIN_DECLS

View File

@ -27,11 +27,11 @@
need to do anything on top of the ClutterOffscreenEffect class so
it only exists because that class is abstract */
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include "clutter-flatten-effect.h"
#include "clutter-private.h"
#include "clutter-actor-private.h"
#include "clutter/clutter-flatten-effect.h"
#include "clutter/clutter-private.h"
#include "clutter/clutter-actor-private.h"
G_DEFINE_TYPE (ClutterFlattenEffect,
_clutter_flatten_effect,

View File

@ -24,7 +24,7 @@
#pragma once
#include <clutter/clutter-offscreen-effect.h>
#include "clutter/clutter-offscreen-effect.h"
G_BEGIN_DECLS

View File

@ -51,21 +51,21 @@
* shows how to use the #ClutterFlowLayout.
*/
#include "clutter-build-config.h"
#include "clutter/clutter-build-config.h"
#include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-container.h"
#include "clutter/deprecated/clutter-container.h"
#include "clutter-actor.h"
#include "clutter-animatable.h"
#include "clutter-child-meta.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-flow-layout.h"
#include "clutter-layout-meta.h"
#include "clutter-private.h"
#include "clutter/clutter-actor.h"
#include "clutter/clutter-animatable.h"
#include "clutter/clutter-child-meta.h"
#include "clutter/clutter-debug.h"
#include "clutter/clutter-enum-types.h"
#include "clutter/clutter-flow-layout.h"
#include "clutter/clutter-layout-meta.h"
#include "clutter/clutter-private.h"
struct _ClutterFlowLayoutPrivate
{

View File

@ -28,7 +28,7 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
#include <clutter/clutter-layout-manager.h>
#include "clutter/clutter-layout-manager.h"
G_BEGIN_DECLS

Some files were not shown because too many files have changed in this diff Show More