isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Make include macro usages consistent

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter/cally/cally-actor-private.h
View File

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

8
clutter/clutter/cally/cally-actor.c
View File

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

3
clutter/clutter/cally/cally-actor.h
View File

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

6
clutter/clutter/cally/cally-clone.c
View File

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

4
clutter/clutter/cally/cally-clone.h
View File

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

10
clutter/clutter/cally/cally-root.c
View File

@ -35,13 +35,13 @@
* [class@Clutter.StageManager]). * [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/clutter-actor.h"
#include "clutter-stage-private.h" #include "clutter/clutter-stage-private.h"
#include "clutter-stage-manager.h" #include "clutter/clutter-stage-manager.h"
/* GObject */ /* GObject */

3
clutter/clutter/cally/cally-root.h
View File

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

6
clutter/clutter/cally/cally-stage.c
View File

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

4
clutter/clutter/cally/cally-stage.h
View File

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

12
clutter/clutter/cally/cally-text.c
View File

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

4
clutter/clutter/cally/cally-text.h
View File

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

10
clutter/clutter/cally/cally-util.c
View File

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

2
clutter/clutter/cally/cally-util.h
View File

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

22
clutter/clutter/cally/cally.c
View File

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

16
clutter/clutter/cally/cally.h
View File

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

2
clutter/clutter/clutter-action-private.h
View File

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

10
clutter/clutter/clutter-action.c
View File

@ -38,12 +38,12 @@
* various event-related signals provided by [class@Actor] itself. * 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/clutter-action.h"
#include "clutter-action-private.h" #include "clutter/clutter-action-private.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
typedef struct _ClutterActionPrivate ClutterActionPrivate; typedef struct _ClutterActionPrivate ClutterActionPrivate;

2
clutter/clutter/clutter-action.h
View File

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

2
clutter/clutter/clutter-actor-box-private.h
View File

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

10
clutter/clutter/clutter-actor-box.c
View File

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

2
clutter/clutter/clutter-actor-meta-private.h
View File

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

8
clutter/clutter/clutter-actor-meta.c
View File

@ -38,12 +38,12 @@
* any kind of modification. * 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/clutter-debug.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
struct _ClutterActorMetaPrivate struct _ClutterActorMetaPrivate
{ {

2
clutter/clutter/clutter-actor-meta.h
View File

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

4
clutter/clutter/clutter-actor-private.h
View File

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

74
clutter/clutter/clutter-actor.c
View File

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

10
clutter/clutter/clutter-actor.h
View File

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

16
clutter/clutter/clutter-align-constraint.c
View File

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

2
clutter/clutter/clutter-align-constraint.h
View File

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

10
clutter/clutter/clutter-animatable.c
View File

@ -36,12 +36,12 @@
* depending on a progress factor, expressed as a floating point value. * 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/clutter-animatable.h"
#include "clutter-interval.h" #include "clutter/clutter-interval.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT); G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);

2
clutter/clutter/clutter-animatable.h
View File

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

6
clutter/clutter/clutter-backend-private.h
View File

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

22
clutter/clutter/clutter-backend.c
View File

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

8
clutter/clutter/clutter-backend.h
View File

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

6
clutter/clutter/clutter-base-types.c
View File

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

7
clutter/clutter/clutter-bezier.c
View File

@ -21,12 +21,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * 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 <glib.h>
#include <string.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 * We have some experimental code here to allow for constant velocity

3
clutter/clutter/clutter-bezier.h
View File

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

20
clutter/clutter/clutter-bin-layout.c
View File

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

2
clutter/clutter/clutter-bin-layout.h
View File

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

16
clutter/clutter/clutter-bind-constraint.c
View File

@ -81,18 +81,18 @@
* ``` * ```
*/ */
#include "clutter-build-config.h" #include "clutter/clutter-build-config.h"
#include <math.h> #include <math.h>
#include "clutter-bind-constraint.h" #include "clutter/clutter-bind-constraint.h"
#include "clutter-actor-meta-private.h" #include "clutter/clutter-actor-meta-private.h"
#include "clutter-actor-private.h" #include "clutter/clutter-actor-private.h"
#include "clutter-constraint.h" #include "clutter/clutter-constraint.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-private.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_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)) #define CLUTTER_IS_BIND_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BIND_CONSTRAINT))

2
clutter/clutter/clutter-bind-constraint.h
View File

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

12
clutter/clutter/clutter-binding-pool.c
View File

@ -93,13 +93,13 @@
* key binding handler returned %FALSE. * key binding handler returned %FALSE.
*/ */
#include "clutter-build-config.h" #include "clutter/clutter-build-config.h"
#include "clutter-binding-pool.h" #include "clutter/clutter-binding-pool.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-marshal.h" #include "clutter/clutter-marshal.h"
#include "clutter-private.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_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)) #define CLUTTER_IS_BINDING_POOL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_BINDING_POOL))

3
clutter/clutter/clutter-binding-pool.h
View File

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

10
clutter/clutter/clutter-blur-effect.c
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_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)) #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 "cogl/cogl.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-offscreen-effect.h" #include "clutter/clutter-offscreen-effect.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
#define BLUR_PADDING 2 #define BLUR_PADDING 2

2
clutter/clutter/clutter-blur-effect.h
View File

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

2
clutter/clutter/clutter-blur-private.h
View File

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

4
clutter/clutter/clutter-blur.c
View File

@ -15,9 +15,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * 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 * SECTION:clutter-blur

18
clutter/clutter/clutter-box-layout.c
View File

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

2
clutter/clutter/clutter-box-layout.h
View File

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

15
clutter/clutter/clutter-brightness-contrast-effect.c
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_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)) #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 <math.h>
#include "clutter-brightness-contrast-effect.h" #include "cogl/cogl.h"
#include <cogl/cogl.h> #include "clutter/clutter-brightness-contrast-effect.h"
#include "clutter/clutter-debug.h"
#include "clutter-debug.h" #include "clutter/clutter-enum-types.h"
#include "clutter-enum-types.h" #include "clutter/clutter-offscreen-effect.h"
#include "clutter-offscreen-effect.h" #include "clutter/clutter-private.h"
#include "clutter-private.h"
struct _ClutterBrightnessContrastEffect struct _ClutterBrightnessContrastEffect
{ {

4
clutter/clutter/clutter-brightness-contrast-effect.h
View File

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

6
clutter/clutter/clutter-cairo.c
View File

@ -27,10 +27,10 @@
* Clutter provides some utility functions for using Cairo. * 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/clutter-cairo.h"
#include "clutter-color.h" #include "clutter/clutter-color.h"
/** /**
* clutter_cairo_set_source_color: * clutter_cairo_set_source_color:

2
clutter/clutter/clutter-cairo.h
View File

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

29
clutter/clutter/clutter-canvas.c
View File

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

2
clutter/clutter/clutter-canvas.h
View File

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

10
clutter/clutter/clutter-child-meta.c
View File

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

3
clutter/clutter/clutter-child-meta.h
View File

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

12
clutter/clutter/clutter-click-action.c
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/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-marshal.h" #include "clutter/clutter-marshal.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
struct _ClutterClickActionPrivate struct _ClutterClickActionPrivate
{ {

4
clutter/clutter/clutter-click-action.h
View File

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

14
clutter/clutter/clutter-clone.c
View File

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

2
clutter/clutter/clutter-clone.h
View File

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

10
clutter/clutter/clutter-color-state.c
View File

@ -43,13 +43,13 @@
* actor content is in pq or not, and things like that * 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/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
enum enum
{ {

2
clutter/clutter/clutter-color-state.h
View File

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

12
clutter/clutter/clutter-color.c
View File

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

2
clutter/clutter/clutter-color.h
View File

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

12
clutter/clutter/clutter-colorize-effect.c
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_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)) #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 "cogl/cogl.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-offscreen-effect.h" #include "clutter/clutter-offscreen-effect.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
struct _ClutterColorizeEffect struct _ClutterColorizeEffect
{ {

4
clutter/clutter/clutter-colorize-effect.h
View File

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

2
clutter/clutter/clutter-constraint-private.h
View File

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

10
clutter/clutter/clutter-constraint.c
View File

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

2
clutter/clutter/clutter-constraint.h
View File

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

2
clutter/clutter/clutter-container-private.h
View File

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

20
clutter/clutter/clutter-container.c
View File

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

6
clutter/clutter/clutter-container.h
View File

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

2
clutter/clutter/clutter-content-private.h
View File

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

12
clutter/clutter/clutter-content.c
View File

@ -34,14 +34,14 @@
* to share the resources associated with painting the same content.. * 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/clutter-actor-private.h"
#include "clutter-content-private.h" #include "clutter/clutter-content-private.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-marshal.h" #include "clutter/clutter-marshal.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
enum enum
{ {

2
clutter/clutter/clutter-content.h
View File

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

4
clutter/clutter/clutter-damage-history.c
View File

@ -16,9 +16,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * 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 #define DAMAGE_HISTORY_LENGTH 0x10

2
clutter/clutter/clutter-damage-history.h
View File

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

3
clutter/clutter/clutter-debug.h
View File

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

19
clutter/clutter/clutter-deform-effect.c
View File

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

4
clutter/clutter/clutter-deform-effect.h
View File

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

2
clutter/clutter/clutter-deprecated.h
View File

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

12
clutter/clutter/clutter-desaturate-effect.c
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_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)) #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 <math.h>
#include "clutter-desaturate-effect.h" #include "clutter/clutter-desaturate-effect.h"
#include "cogl/cogl.h" #include "cogl/cogl.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-offscreen-effect.h" #include "clutter/clutter-offscreen-effect.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
struct _ClutterDesaturateEffect struct _ClutterDesaturateEffect
{ {

2
clutter/clutter/clutter-desaturate-effect.h
View File

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

4
clutter/clutter/clutter-easing.c
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> #include <math.h>

2
clutter/clutter/clutter-easing.h
View File

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

2
clutter/clutter/clutter-effect-private.h
View File

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

22
clutter/clutter/clutter-effect.c
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/clutter-actor-meta-private.h"
#include "clutter-debug.h" #include "clutter/clutter-debug.h"
#include "clutter-effect-private.h" #include "clutter/clutter-effect-private.h"
#include "clutter-enum-types.h" #include "clutter/clutter-enum-types.h"
#include "clutter-marshal.h" #include "clutter/clutter-marshal.h"
#include "clutter-paint-node-private.h" #include "clutter/clutter-paint-node-private.h"
#include "clutter-paint-nodes.h" #include "clutter/clutter-paint-nodes.h"
#include "clutter-private.h" #include "clutter/clutter-private.h"
#include "clutter-actor-private.h" #include "clutter/clutter-actor-private.h"
G_DEFINE_ABSTRACT_TYPE (ClutterEffect, G_DEFINE_ABSTRACT_TYPE (ClutterEffect,
clutter_effect, clutter_effect,

6
clutter/clutter/clutter-effect.h
View File

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

4
clutter/clutter/clutter-enum-types.c.in
View File

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

2
clutter/clutter/clutter-enum-types.h.in
View File

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

2
clutter/clutter/clutter-event-private.h
View File

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

12
clutter/clutter/clutter-event.c
View File

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

4
clutter/clutter/clutter-event.h
View File

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

12
clutter/clutter/clutter-feature.c
View File

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

8
clutter/clutter/clutter-fixed-layout.c
View File

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

2
clutter/clutter/clutter-fixed-layout.h
View File

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

8
clutter/clutter/clutter-flatten-effect.c
View File

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

2
clutter/clutter/clutter-flatten-effect.h
View File

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

20
clutter/clutter/clutter-flow-layout.c
View File

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

2
clutter/clutter/clutter-flow-layout.h
View File

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

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