From d27b335b61bba50ba6b156d32cf3bdf094181104 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 18 Feb 2011 16:00:39 +0000 Subject: [PATCH] Move ClutterEffect private symbols to a private header No point in cluttering up clutter-private.h even more than necessary. --- clutter/Makefile.am | 1 + clutter/clutter-actor.c | 2 +- clutter/clutter-effect-private.h | 15 +++++++++++++++ clutter/clutter-effect.c | 1 + clutter/clutter-private.h | 5 ----- 5 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 clutter/clutter-effect-private.h diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 51afd61e2..46c4fd6f5 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -232,6 +232,7 @@ source_h_priv = \ $(srcdir)/clutter-bezier.h \ $(srcdir)/clutter-debug.h \ $(srcdir)/clutter-device-manager-private.h \ + $(srcdir)/clutter-effect-private.h \ $(srcdir)/clutter-event-translator.h \ $(srcdir)/clutter-id-pool.h \ $(srcdir)/clutter-keysyms-table.h \ diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index f5e3f3e81..8ddb9ff70 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -295,7 +295,7 @@ #include "clutter-constraint.h" #include "clutter-container.h" #include "clutter-debug.h" -#include "clutter-effect.h" +#include "clutter-effect-private.h" #include "clutter-enum-types.h" #include "clutter-main.h" #include "clutter-marshal.h" diff --git a/clutter/clutter-effect-private.h b/clutter/clutter-effect-private.h new file mode 100644 index 000000000..8b0153cef --- /dev/null +++ b/clutter/clutter-effect-private.h @@ -0,0 +1,15 @@ +#ifndef __CLUTTER_EFFECT_PRIVATE_H__ +#define __CLUTTER_EFFECT_PRIVATE_H__ + +#include + +G_BEGIN_DECLS + +gboolean _clutter_effect_pre_paint (ClutterEffect *effect); +void _clutter_effect_post_paint (ClutterEffect *effect); +gboolean _clutter_effect_get_paint_volume (ClutterEffect *effect, + ClutterPaintVolume *volume); + +G_END_DECLS + +#endif /* __CLUTTER_EFFECT_PRIVATE_H__ */ diff --git a/clutter/clutter-effect.c b/clutter/clutter-effect.c index 1a11e06a9..c00fff67d 100644 --- a/clutter/clutter-effect.c +++ b/clutter/clutter-effect.c @@ -172,6 +172,7 @@ #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-private.h" diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h index 22c53ce4c..846a2a585 100644 --- a/clutter/clutter-private.h +++ b/clutter/clutter-private.h @@ -226,11 +226,6 @@ gboolean _clutter_boolean_handled_accumulator (GSignalInvocationHint *ihint, void _clutter_run_repaint_functions (void); -gboolean _clutter_effect_pre_paint (ClutterEffect *effect); -void _clutter_effect_post_paint (ClutterEffect *effect); -gboolean _clutter_effect_get_paint_volume (ClutterEffect *effect, - ClutterPaintVolume *volume); - void _clutter_constraint_update_allocation (ClutterConstraint *constraint, ClutterActor *actor, ClutterActorBox *allocation);