Fix missing/redundant declarations
This commit is contained in:
parent
266ea8a3d9
commit
2567049ce3
@ -350,6 +350,7 @@
|
||||
#include "clutter-stage-private.h"
|
||||
#include "clutter-units.h"
|
||||
|
||||
#include "deprecated/clutter-actor.h"
|
||||
#include "deprecated/clutter-behaviour.h"
|
||||
#include "deprecated/clutter-container.h"
|
||||
|
||||
@ -14894,18 +14895,19 @@ _clutter_actor_foreach_child (ClutterActor *self,
|
||||
return cont;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* For debugging purposes this gives us a simple way to print out
|
||||
* the scenegraph e.g in gdb using:
|
||||
* [|
|
||||
* _clutter_actor_traverse (stage,
|
||||
* 0,
|
||||
* _clutter_debug_print_actor_cb,
|
||||
* clutter_debug_print_actor_cb,
|
||||
* NULL,
|
||||
* NULL);
|
||||
* |]
|
||||
*/
|
||||
ClutterActorTraverseVisitFlags
|
||||
_clutter_debug_print_actor_cb (ClutterActor *actor,
|
||||
static ClutterActorTraverseVisitFlags
|
||||
clutter_debug_print_actor_cb (ClutterActor *actor,
|
||||
int depth,
|
||||
void *user_data)
|
||||
{
|
||||
@ -14916,6 +14918,7 @@ _clutter_debug_print_actor_cb (ClutterActor *actor,
|
||||
|
||||
return CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
_clutter_actor_traverse_breadth (ClutterActor *actor,
|
||||
|
@ -54,6 +54,8 @@
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
#include "deprecated/clutter-animatable.h"
|
||||
|
||||
typedef ClutterAnimatableIface ClutterAnimatableInterface;
|
||||
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
|
||||
|
||||
|
@ -160,6 +160,8 @@
|
||||
#include "clutter-scriptable.h"
|
||||
#include "clutter-script-private.h"
|
||||
|
||||
#include "deprecated/clutter-animation.h"
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
|
@ -42,6 +42,8 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#define CLUTTER_ENABLE_EXPERIMENTAL_API
|
||||
|
||||
#include "clutter-backend-private.h"
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-event-private.h"
|
||||
|
@ -153,6 +153,8 @@ enum
|
||||
static GParamSpec *layer_props[PROP_LAYER_LAST] = { NULL, };
|
||||
static GParamSpec *bin_props[PROP_LAST] = { NULL, };
|
||||
|
||||
GType clutter_bin_layer_get_type (void);
|
||||
|
||||
G_DEFINE_TYPE (ClutterBinLayer,
|
||||
clutter_bin_layer,
|
||||
CLUTTER_TYPE_LAYOUT_META);
|
||||
|
@ -157,6 +157,8 @@ enum
|
||||
|
||||
static GParamSpec *obj_props[PROP_LAST] = { NULL, };
|
||||
|
||||
GType clutter_box_child_get_type (void);
|
||||
|
||||
G_DEFINE_TYPE (ClutterBoxChild,
|
||||
clutter_box_child,
|
||||
CLUTTER_TYPE_LAYOUT_META);
|
||||
|
@ -79,6 +79,8 @@
|
||||
#include "clutter-marshal.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
#include "deprecated/clutter-cairo-texture.h"
|
||||
|
||||
G_DEFINE_TYPE (ClutterCairoTexture,
|
||||
clutter_cairo_texture,
|
||||
CLUTTER_TYPE_TEXTURE);
|
||||
|
@ -143,6 +143,7 @@
|
||||
|
||||
#include "clutter-actor.h"
|
||||
#include "clutter-actor-meta-private.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
G_DEFINE_ABSTRACT_TYPE (ClutterConstraint,
|
||||
clutter_constraint,
|
||||
|
@ -119,8 +119,8 @@ clutter_deform_effect_real_deform_vertex (ClutterDeformEffect *effect,
|
||||
G_OBJECT_TYPE_NAME (effect));
|
||||
}
|
||||
|
||||
void
|
||||
_clutter_deform_effect_deform_vertex (ClutterDeformEffect *effect,
|
||||
static void
|
||||
clutter_deform_effect_deform_vertex (ClutterDeformEffect *effect,
|
||||
gfloat width,
|
||||
gfloat height,
|
||||
CoglTextureVertex *vertex)
|
||||
@ -241,7 +241,7 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect)
|
||||
|
||||
cogl_color_init_from_4ub (&vertex.color, 255, 255, 255, opacity);
|
||||
|
||||
_clutter_deform_effect_deform_vertex (self,
|
||||
clutter_deform_effect_deform_vertex (self,
|
||||
width, height,
|
||||
&vertex);
|
||||
|
||||
|
@ -61,8 +61,8 @@ typedef struct ClutterFeatures
|
||||
|
||||
static ClutterFeatures* __features = NULL;
|
||||
|
||||
ClutterFeatureFlags
|
||||
_clutter_features_from_cogl (guint cogl_flags)
|
||||
static ClutterFeatureFlags
|
||||
clutter_features_from_cogl (guint cogl_flags)
|
||||
{
|
||||
ClutterFeatureFlags clutter_flags = 0;
|
||||
|
||||
@ -107,7 +107,7 @@ _clutter_feature_init (GError **error)
|
||||
if (!_clutter_backend_create_context (context->backend, error))
|
||||
return FALSE;
|
||||
|
||||
__features->flags = (_clutter_features_from_cogl (cogl_get_features ())
|
||||
__features->flags = (clutter_features_from_cogl (cogl_get_features ())
|
||||
| _clutter_backend_get_features (context->backend));
|
||||
|
||||
__features->features_set = TRUE;
|
||||
|
@ -1,5 +1,7 @@
|
||||
#include <glib.h>
|
||||
|
||||
#include "clutter-event.h"
|
||||
|
||||
/* Code below from GDK, which contains following comment:
|
||||
*
|
||||
* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
|
||||
|
@ -94,6 +94,8 @@ struct _ClutterListModelIter
|
||||
|
||||
|
||||
|
||||
GType clutter_list_model_iter_get_type (void);
|
||||
|
||||
/*
|
||||
* ClutterListModel
|
||||
*/
|
||||
|
@ -102,7 +102,7 @@
|
||||
#include "clutter-config.h"
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-device-manager-private.h"
|
||||
#include "clutter-event.h"
|
||||
#include "clutter-event-private.h"
|
||||
#include "clutter-feature.h"
|
||||
#include "clutter-frame-source.h"
|
||||
#include "clutter-main.h"
|
||||
|
@ -319,7 +319,7 @@ property_info_free (gpointer data)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
signal_info_free (gpointer data)
|
||||
{
|
||||
if (G_LIKELY (data))
|
||||
|
@ -30,6 +30,7 @@
|
||||
#endif /* HAVE_PANGO_FT2 */
|
||||
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-settings-private.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
#define DEFAULT_FONT_NAME "Sans 12"
|
||||
|
@ -47,6 +47,8 @@
|
||||
#include "clutter-private.h"
|
||||
#include "clutter-version.h"
|
||||
|
||||
#include "deprecated/clutter-stage-manager.h"
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
|
@ -189,6 +189,8 @@ enum
|
||||
PROP_EASING_DURATION
|
||||
};
|
||||
|
||||
GType clutter_table_child_get_type (void);
|
||||
|
||||
G_DEFINE_TYPE (ClutterTableChild,
|
||||
clutter_table_child,
|
||||
CLUTTER_TYPE_LAYOUT_META);
|
||||
|
@ -71,8 +71,9 @@
|
||||
#include "clutter-scriptable.h"
|
||||
#include "clutter-stage-private.h"
|
||||
|
||||
#include "clutter-shader.h"
|
||||
#include "clutter-util.h"
|
||||
#include "deprecated/clutter-shader.h"
|
||||
#include "deprecated/clutter-texture.h"
|
||||
#include "deprecated/clutter-util.h"
|
||||
|
||||
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
|
||||
|
||||
|
@ -97,6 +97,8 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "clutter-timeline.h"
|
||||
|
||||
#include "clutter-debug.h"
|
||||
#include "clutter-easing.h"
|
||||
#include "clutter-enum-types.h"
|
||||
@ -105,7 +107,8 @@
|
||||
#include "clutter-master-clock.h"
|
||||
#include "clutter-private.h"
|
||||
#include "clutter-scriptable.h"
|
||||
#include "clutter-timeline.h"
|
||||
|
||||
#include "deprecated/clutter-timeline.h"
|
||||
|
||||
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
|
||||
|
||||
|
@ -36,8 +36,10 @@
|
||||
|
||||
#include <glib/gi18n-lib.h>
|
||||
|
||||
#include "deprecated/clutter-util.h"
|
||||
#include "clutter-main.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
#include "deprecated/clutter-util.h"
|
||||
|
||||
/**
|
||||
* clutter_util_next_p2:
|
||||
|
@ -29,10 +29,12 @@
|
||||
|
||||
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
|
||||
|
||||
#include "clutter-frame-source.h"
|
||||
#include "clutter-timeout-interval.h"
|
||||
#include "clutter-main.h"
|
||||
#include "clutter-private.h"
|
||||
|
||||
#include "deprecated/clutter-frame-source.h"
|
||||
#include "deprecated/clutter-timeout-interval.h"
|
||||
|
||||
typedef struct _ClutterFrameSource ClutterFrameSource;
|
||||
|
||||
struct _ClutterFrameSource
|
||||
|
Loading…
Reference in New Issue
Block a user