[mutter/wip/nielsdg/clutter-remove-deprecated: 6/6] clutter: remove deprecated ClutterStage/ClutterAnimator
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/nielsdg/clutter-remove-deprecated: 6/6] clutter: remove deprecated ClutterStage/ClutterAnimator
- Date: Sun, 18 Nov 2018 10:54:24 +0000 (UTC)
commit 5f1410f96828eb54b0c6ed4d9ec51882f8549e4a
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Nov 18 11:52:50 2018 +0100
clutter: remove deprecated ClutterStage/ClutterAnimator
Removing one without the other was quite the headache, so just remove
both of them together instead.
clutter/clutter/Makefile.am | 4 -
clutter/clutter/clutter-deprecated.h | 2 -
clutter/clutter/clutter-script.c | 231 --
clutter/clutter/clutter-script.h | 9 -
clutter/clutter/clutter-timeline.c | 4 +-
clutter/clutter/clutter-types.h | 2 -
clutter/clutter/deprecated/clutter-animator.c | 2164 ------------------
clutter/clutter/deprecated/clutter-animator.h | 188 --
.../clutter/deprecated/clutter-behaviour-depth.c | 3 +-
.../clutter/deprecated/clutter-behaviour-opacity.c | 3 +-
.../clutter/deprecated/clutter-behaviour-rotate.c | 3 +-
.../clutter/deprecated/clutter-behaviour-scale.c | 3 +-
clutter/clutter/deprecated/clutter-behaviour.c | 3 +-
clutter/clutter/deprecated/clutter-state.c | 2308 --------------------
clutter/clutter/deprecated/clutter-state.h | 187 --
clutter/clutter/meson.build | 4 -
clutter/tests/conform/Makefile.am | 7 +-
clutter/tests/conform/animator.c | 199 --
clutter/tests/conform/meson.build | 1 -
clutter/tests/conform/scripts/test-animator-1.json | 5 -
clutter/tests/conform/scripts/test-animator-2.json | 29 -
clutter/tests/conform/scripts/test-animator-3.json | 40 -
clutter/tests/conform/scripts/test-state-1.json | 33 -
clutter/tests/conform/state.c | 87 -
clutter/tests/interactive/Makefile.am | 4 -
clutter/tests/interactive/meson.build | 4 -
clutter/tests/interactive/test-animator.c | 138 --
clutter/tests/interactive/test-script-signals.json | 68 -
clutter/tests/interactive/test-state-animator.c | 144 --
clutter/tests/interactive/test-state-script.c | 53 -
clutter/tests/interactive/test-state.c | 206 --
clutter/tests/performance/Makefile.am | 7 +-
clutter/tests/performance/meson.build | 5 -
clutter/tests/performance/test-state-hidden.c | 150 --
clutter/tests/performance/test-state-interactive.c | 194 --
clutter/tests/performance/test-state-mini.c | 153 --
clutter/tests/performance/test-state-pick.c | 159 --
clutter/tests/performance/test-state.c | 158 --
po/POTFILES.skip | 2 -
39 files changed, 9 insertions(+), 6955 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index 6d96a4a1c..8d1f3767a 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -257,7 +257,6 @@ deprecated_h = \
deprecated/clutter-alpha.h \
deprecated/clutter-animatable.h \
deprecated/clutter-animation.h \
- deprecated/clutter-animator.h \
deprecated/clutter-backend.h \
deprecated/clutter-behaviour.h \
deprecated/clutter-behaviour-depth.h \
@@ -275,7 +274,6 @@ deprecated_h = \
deprecated/clutter-rectangle.h \
deprecated/clutter-stage-manager.h \
deprecated/clutter-stage.h \
- deprecated/clutter-state.h \
deprecated/clutter-texture.h \
deprecated/clutter-timeline.h \
deprecated/clutter-util.h \
@@ -286,7 +284,6 @@ deprecated_c = \
deprecated/clutter-actor-deprecated.c \
deprecated/clutter-alpha.c \
deprecated/clutter-animation.c \
- deprecated/clutter-animator.c \
deprecated/clutter-behaviour.c \
deprecated/clutter-behaviour-depth.c \
deprecated/clutter-behaviour-ellipse.c \
@@ -298,7 +295,6 @@ deprecated_c = \
deprecated/clutter-input-device-deprecated.c \
deprecated/clutter-layout-manager-deprecated.c \
deprecated/clutter-rectangle.c \
- deprecated/clutter-state.c \
deprecated/clutter-texture.c \
$(NULL)
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 558617ff5..793439557 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -7,7 +7,6 @@
#include "deprecated/clutter-alpha.h"
#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
-#include "deprecated/clutter-animator.h"
#include "deprecated/clutter-backend.h"
#include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-behaviour-depth.h"
@@ -25,7 +24,6 @@
#include "deprecated/clutter-rectangle.h"
#include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h"
-#include "deprecated/clutter-state.h"
#include "deprecated/clutter-texture.h"
#include "deprecated/clutter-timeline.h"
#include "deprecated/clutter-util.h"
diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
index 7a58cd0fb..cff711939 100644
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -157,49 +157,6 @@
* respectively) and the "object" string member for calling
* g_signal_connect_object() instead of g_signal_connect().
*
- * Signals can also be directly attached to a specific state defined
- * inside a #ClutterState instance, for instance:
- *
- * |[
- * ...
- * "signals" : [
- * {
- * "name" : "enter-event",
- * "states" : "button-states",
- * "target-state" : "hover"
- * },
- * {
- * "name" : "leave-event",
- * "states" : "button-states",
- * "target-state" : "base"
- * },
- * {
- * "name" : "button-press-event",
- * "states" : "button-states",
- * "target-state" : "active",
- * },
- * {
- * "name" : "key-press-event",
- * "states" : "button-states",
- * "target-state" : "key-focus",
- * "warp" : true
- * }
- * ],
- * ...
- * ]|
- *
- * The "states" key defines the #ClutterState instance to be used to
- * resolve the "target-state" key; it can be either a script id for a
- * #ClutterState built by the same #ClutterScript instance, or to a
- * #ClutterState built in code and associated to the #ClutterScript
- * instance through the clutter_script_add_states() function. If no
- * "states" key is present, then the default #ClutterState associated to
- * the #ClutterScript instance will be used; the default #ClutterState
- * can be set using clutter_script_add_states() using a %NULL name. The
- * "warp" key can be used to warp to a specific state instead of
- * animating to it. State changes on signal emission will not affect
- * the signal emission chain.
- *
* Clutter reserves the following names, so classes defining properties
* through the usual GObject registration process should avoid using these
* names to avoid collisions:
@@ -248,7 +205,6 @@
#include "deprecated/clutter-alpha.h"
#include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-container.h"
-#include "deprecated/clutter-state.h"
enum
{
@@ -274,8 +230,6 @@ struct _ClutterScriptPrivate
ClutterScriptParser *parser;
- GHashTable *states;
-
gchar **search_paths;
gchar *translation_domain;
@@ -328,7 +282,6 @@ signal_info_free (gpointer data)
g_free (sinfo->name);
g_free (sinfo->handler);
g_free (sinfo->object);
- g_free (sinfo->state);
g_free (sinfo->target);
g_slice_free (SignalInfo, sinfo);
@@ -386,7 +339,6 @@ clutter_script_finalize (GObject *gobject)
g_hash_table_destroy (priv->objects);
g_strfreev (priv->search_paths);
g_free (priv->filename);
- g_hash_table_destroy (priv->states);
g_free (priv->translation_domain);
G_OBJECT_CLASS (clutter_script_parent_class)->finalize (gobject);
@@ -521,9 +473,6 @@ clutter_script_init (ClutterScript *script)
priv->objects = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL,
object_info_free);
- priv->states = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free,
- (GDestroyNotify) g_object_unref);
}
/**
@@ -1043,65 +992,12 @@ clutter_script_connect_signals (ClutterScript *script,
g_free (cd);
}
-typedef struct {
- ClutterState *state;
- GObject *emitter;
- gchar *target;
- gulong signal_id;
- gulong hook_id;
- gboolean warp_to;
-} HookData;
-
typedef struct {
ClutterScript *script;
ClutterScriptConnectFunc func;
gpointer user_data;
} SignalConnectData;
-static void
-hook_data_free (gpointer data)
-{
- if (G_LIKELY (data != NULL))
- {
- HookData *hook_data = data;
-
- g_free (hook_data->target);
- g_slice_free (HookData, hook_data);
- }
-}
-
-static gboolean
-clutter_script_state_change_hook (GSignalInvocationHint *ihint,
- guint n_params,
- const GValue *params,
- gpointer user_data)
-{
- HookData *hook_data = user_data;
- GObject *emitter;
-
- emitter = g_value_get_object (¶ms[0]);
-
- if (emitter == hook_data->emitter)
- {
- if (hook_data->warp_to)
- clutter_state_warp_to_state (hook_data->state, hook_data->target);
- else
- clutter_state_set_state (hook_data->state, hook_data->target);
- }
-
- return TRUE;
-}
-
-static void
-clutter_script_remove_state_change_hook (gpointer user_data,
- GObject *object_p)
-{
- HookData *hook_data = user_data;
-
- g_signal_remove_emission_hook (hook_data->signal_id,
- hook_data->hook_id);
-}
-
static void
connect_each_object (gpointer key,
gpointer value,
@@ -1139,67 +1035,6 @@ connect_each_object (gpointer key,
connect_data->user_data);
}
}
- else
- {
- GObject *state_object = NULL;
- const gchar *signal_name, *signal_detail;
- gchar **components;
- GQuark signal_quark;
- guint signal_id;
- HookData *hook_data;
-
- if (sinfo->state == NULL)
- state_object = (GObject *) clutter_script_get_states (script, NULL);
- else
- {
- state_object = clutter_script_get_object (script, sinfo->state);
- if (state_object == NULL)
- state_object = (GObject *) clutter_script_get_states (script, sinfo->state);
- }
-
- if (state_object == NULL)
- continue;
-
- components = g_strsplit (sinfo->name, "::", 2);
- if (g_strv_length (components) == 2)
- {
- signal_name = components[0];
- signal_detail = components[1];
- }
- else
- {
- signal_name = components[0];
- signal_detail = NULL;
- }
-
- signal_id = g_signal_lookup (signal_name, G_OBJECT_TYPE (object));
- if (signal_id == 0)
- {
- g_strfreev (components);
- continue;
- }
-
- if (signal_detail != NULL)
- signal_quark = g_quark_from_string (signal_detail);
- else
- signal_quark = 0;
-
- hook_data = g_slice_new (HookData);
- hook_data->emitter = object;
- hook_data->state = CLUTTER_STATE (state_object);
- hook_data->target = g_strdup (sinfo->target);
- hook_data->warp_to = sinfo->warp_to;
- hook_data->signal_id = signal_id;
- hook_data->hook_id =
- g_signal_add_emission_hook (signal_id, signal_quark,
- clutter_script_state_change_hook,
- hook_data,
- hook_data_free);
-
- g_object_weak_ref (hook_data->emitter,
- clutter_script_remove_state_change_hook,
- hook_data);
- }
signal_info_free (sinfo);
}
@@ -1423,72 +1258,6 @@ clutter_script_list_objects (ClutterScript *script)
return retval;
}
-/**
- * clutter_script_add_states:
- * @script: a #ClutterScript
- * @name: (allow-none): a name for the @state, or %NULL to
- * set the default #ClutterState
- * @state: a #ClutterState
- *
- * Associates a #ClutterState to the #ClutterScript instance using the given
- * name.
- *
- * The #ClutterScript instance will use @state to resolve target states when
- * connecting signal handlers.
- *
- * The #ClutterScript instance will take a reference on the #ClutterState
- * passed to this function.
- *
- * Since: 1.8
- *
- * Deprecated: 1.12
- */
-void
-clutter_script_add_states (ClutterScript *script,
- const gchar *name,
- ClutterState *state)
-{
- g_return_if_fail (CLUTTER_IS_SCRIPT (script));
- g_return_if_fail (CLUTTER_IS_STATE (state));
-
- if (name == NULL || *name == '\0')
- name = "__clutter_script_default_state";
-
- g_hash_table_replace (script->priv->states,
- g_strdup (name),
- g_object_ref (state));
-}
-
-/**
- * clutter_script_get_states:
- * @script: a #ClutterScript
- * @name: (allow-none): the name of the #ClutterState, or %NULL
- *
- * Retrieves the #ClutterState for the given @state_name.
- *
- * If @name is %NULL, this function will return the default
- * #ClutterState instance.
- *
- * Return value: (transfer none): a pointer to the #ClutterState for the
- * given name. The #ClutterState is owned by the #ClutterScript instance
- * and it should not be unreferenced
- *
- * Since: 1.8
- *
- * Deprecated: 1.12
- */
-ClutterState *
-clutter_script_get_states (ClutterScript *script,
- const gchar *name)
-{
- g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), NULL);
-
- if (name == NULL || *name == '\0')
- name = "__clutter_script_default_state";
-
- return g_hash_table_lookup (script->priv->states, name);
-}
-
/**
* clutter_script_set_translation_domain:
* @script: a #ClutterScript
diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h
index 5642e1034..b919d148f 100644
--- a/clutter/clutter/clutter-script.h
+++ b/clutter/clutter/clutter-script.h
@@ -178,15 +178,6 @@ void clutter_script_unmerge_objects (ClutterScript
CLUTTER_EXPORT
void clutter_script_ensure_objects (ClutterScript *script);
-CLUTTER_DEPRECATED
-void clutter_script_add_states (ClutterScript *script,
- const gchar *name,
- ClutterState *state);
-
-CLUTTER_DEPRECATED
-ClutterState * clutter_script_get_states (ClutterScript *script,
- const gchar *name);
-
CLUTTER_EXPORT
void clutter_script_connect_signals (ClutterScript *script,
gpointer user_data);
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index c2efdd117..7e8f06c2c 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -24,7 +24,7 @@
/**
* SECTION:clutter-timeline
* @short_description: A class for time-based events
- * @see_also: #ClutterAnimation, #ClutterAnimator, #ClutterState
+ * @see_also: #ClutterAnimation
*
* #ClutterTimeline is a base class for managing time-based event that cause
* Clutter to redraw a stage, such as animations.
@@ -71,7 +71,7 @@
* when reaching completion by using the #ClutterTimeline:auto-reverse property.
*
* Timelines are used in the Clutter animation framework by classes like
- * #ClutterAnimation, #ClutterAnimator, and #ClutterState.
+ * #ClutterAnimation.
*
* ## Defining Timelines in ClutterScript
*
diff --git a/clutter/clutter/clutter-types.h b/clutter/clutter/clutter-types.h
index 1d4d3f9a3..6e78171ed 100644
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -90,8 +90,6 @@ typedef struct _ClutterVertex ClutterVertex;
typedef struct _ClutterAlpha ClutterAlpha;
typedef struct _ClutterAnimation ClutterAnimation;
-typedef struct _ClutterAnimator ClutterAnimator;
-typedef struct _ClutterState ClutterState;
typedef struct _ClutterInputDeviceTool ClutterInputDeviceTool;
typedef struct _ClutterInputDevice ClutterInputDevice;
diff --git a/clutter/clutter/deprecated/clutter-behaviour-depth.c
b/clutter/clutter/deprecated/clutter-behaviour-depth.c
index f5c8279da..c5861d005 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-depth.c
@@ -48,8 +48,7 @@
* #ClutterBehaviourDepth is available since Clutter 0.4.
*
* Deprecated: 1.6: Use the #ClutterActor:depth property and
- * clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
- * instead.
+ * clutter_actor_animate() instead.
*/
struct _ClutterBehaviourDepthPrivate
diff --git a/clutter/clutter/deprecated/clutter-behaviour-opacity.c
b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
index a5220a9ff..f771cfaa8 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
@@ -32,8 +32,7 @@
* Since: 0.2
*
* Deprecated: 1.6: Use the #ClutterActor:opacity property and
- * clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
- * instead.
+ * clutter_actor_animate().
*/
#include "clutter-build-config.h"
diff --git a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
index 6982e6e3b..9714fbf99 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
@@ -31,8 +31,7 @@
* The #ClutterBehaviourRotate is available since version 0.4.
*
* Deprecated: 1.6: Use the #ClutterActor rotation properties and
- * clutter_actor_animate(), or #ClutterAnimator, or #ClutterState
- * instead.
+ * clutter_actor_animate() instead.
*/
#include "clutter-build-config.h"
diff --git a/clutter/clutter/deprecated/clutter-behaviour-scale.c
b/clutter/clutter/deprecated/clutter-behaviour-scale.c
index 85202430c..23cd0b36c 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-scale.c
@@ -31,8 +31,7 @@
* A #ClutterBehaviourScale interpolates actors size between two values.
*
* Deprecated: 1.6: Use the #ClutterActor:scale-x and #ClutterActor:scale-y
- * properties, and clutter_actor_animate(), or #ClutterAnimator or
- * #ClutterState instead.
+ * properties, and clutter_actor_animate() instead.
*/
#include "clutter-build-config.h"
diff --git a/clutter/clutter/deprecated/clutter-behaviour.c b/clutter/clutter/deprecated/clutter-behaviour.c
index 3fd61afb1..cfd6cd87d 100644
--- a/clutter/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/clutter/deprecated/clutter-behaviour.c
@@ -25,8 +25,7 @@
* SECTION:clutter-behaviour
* @Title: ClutterBehaviour
* @short_description: Class for providing behaviours to actors
- * @Deprecated: 1.6: Use clutter_actor_animate(), #ClutterAnimator or
- * #ClutterState instead
+ * @Deprecated: 1.6: Use clutter_actor_animate() instead
*
* #ClutterBehaviour is the base class for implementing behaviours. A
* behaviour is a controller object for #ClutterActor<!-- -->s; you can
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index b16e7a231..4e2d28d07 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -217,7 +217,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-alpha.h',
'deprecated/clutter-animatable.h',
'deprecated/clutter-animation.h',
- 'deprecated/clutter-animator.h',
'deprecated/clutter-backend.h',
'deprecated/clutter-behaviour.h',
'deprecated/clutter-behaviour-depth.h',
@@ -235,7 +234,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-rectangle.h',
'deprecated/clutter-stage-manager.h',
'deprecated/clutter-stage.h',
- 'deprecated/clutter-state.h',
'deprecated/clutter-texture.h',
'deprecated/clutter-timeline.h',
'deprecated/clutter-util.h',
@@ -245,7 +243,6 @@ clutter_deprecated_sources = [
'deprecated/clutter-actor-deprecated.c',
'deprecated/clutter-alpha.c',
'deprecated/clutter-animation.c',
- 'deprecated/clutter-animator.c',
'deprecated/clutter-behaviour.c',
'deprecated/clutter-behaviour-depth.c',
'deprecated/clutter-behaviour-ellipse.c',
@@ -257,7 +254,6 @@ clutter_deprecated_sources = [
'deprecated/clutter-input-device-deprecated.c',
'deprecated/clutter-layout-manager-deprecated.c',
'deprecated/clutter-rectangle.c',
- 'deprecated/clutter-state.c',
'deprecated/clutter-texture.c',
]
diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index acd9d2d09..11d4835ad 100644
--- a/clutter/tests/conform/Makefile.am
+++ b/clutter/tests/conform/Makefile.am
@@ -49,7 +49,6 @@ general_tests = \
# Test for deprecated functionality
deprecated_tests = \
- animator \
behaviours \
group \
rectangle \
@@ -61,9 +60,6 @@ test_programs = $(actor_tests) $(general_tests) $(classes_tests) $(deprecated_te
dist_test_data = $(script_ui_files)
script_ui_files = $(addprefix scripts/,$(script_tests))
script_tests = \
- test-animator-1.json \
- test-animator-2.json \
- test-animator-3.json \
test-script-animation.json \
test-script-child.json \
test-script-implicit-alpha.json \
@@ -74,8 +70,7 @@ script_tests = \
test-script-named-object.json \
test-script-object-property.json \
test-script-single.json \
- test-script-timeline-markers.json \
- test-state-1.json
+ test-script-timeline-markers.json
TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 CLUTTER_SCALE=1
diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build
index 87b316318..474af146d 100644
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -40,7 +40,6 @@ clutter_conform_tests_general_tests = [
]
clutter_conform_tests_deprecated_tests = [
- 'animator',
'behaviours',
'rectangle',
'texture',
diff --git a/clutter/tests/interactive/Makefile.am b/clutter/tests/interactive/Makefile.am
index 466e1ed52..9005e2891 100644
--- a/clutter/tests/interactive/Makefile.am
+++ b/clutter/tests/interactive/Makefile.am
@@ -9,9 +9,6 @@ UNIT_TESTS = \
test-script.c \
test-grab.c \
test-cogl-shader-glsl.c \
- test-animator.c \
- test-state.c \
- test-state-animator.c \
test-fbo.c \
test-multistage.c \
test-cogl-tex-tile.c \
@@ -37,7 +34,6 @@ UNIT_TESTS = \
test-swipe-action.c \
test-cogl-point-sprites.c \
test-path-constraint.c \
- test-state-script.c \
test-devices.c \
test-content.c \
test-keyframe-transition.c \
diff --git a/clutter/tests/interactive/meson.build b/clutter/tests/interactive/meson.build
index 668e21f61..80838ffe3 100644
--- a/clutter/tests/interactive/meson.build
+++ b/clutter/tests/interactive/meson.build
@@ -27,9 +27,6 @@ clutter_tests_interactive_test_sources = [
'test-script.c',
'test-grab.c',
'test-cogl-shader-glsl.c',
- 'test-animator.c',
- 'test-state.c',
- 'test-state-animator.c',
'test-fbo.c',
'test-multistage.c',
'test-cogl-tex-tile.c',
@@ -55,7 +52,6 @@ clutter_tests_interactive_test_sources = [
'test-swipe-action.c',
'test-cogl-point-sprites.c',
'test-path-constraint.c',
- 'test-state-script.c',
'test-devices.c',
'test-content.c',
'test-keyframe-transition.c',
diff --git a/clutter/tests/performance/Makefile.am b/clutter/tests/performance/Makefile.am
index 145b77902..b031a1b08 100644
--- a/clutter/tests/performance/Makefile.am
+++ b/clutter/tests/performance/Makefile.am
@@ -1,11 +1,6 @@
check_PROGRAMS = \
test-picking \
- test-text-perf \
- test-state \
- test-state-interactive \
- test-state-hidden \
- test-state-mini \
- test-state-pick
+ test-text-perf
common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@LIBMUTTER_API_VERSION@.la
diff --git a/clutter/tests/performance/meson.build b/clutter/tests/performance/meson.build
index 5d7157580..0b9069d5d 100644
--- a/clutter/tests/performance/meson.build
+++ b/clutter/tests/performance/meson.build
@@ -11,11 +11,6 @@ clutter_tests_performance_c_args += clutter_debug_c_args
clutter_tests_performance_tests = [
'test-picking',
'test-text-perf',
- 'test-state',
- 'test-state-interactive',
- 'test-state-hidden',
- 'test-state-mini',
- 'test-state-pick',
]
foreach test : clutter_tests_performance_tests
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index f9ebb7245..a104e9153 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -56,7 +56,6 @@ clutter/clutter/clutter-virtual-input-device.c
clutter/clutter/clutter-zoom-action.c
clutter/clutter/deprecated/clutter-alpha.c
clutter/clutter/deprecated/clutter-animation.c
-clutter/clutter/deprecated/clutter-animator.c
clutter/clutter/deprecated/clutter-behaviour.c
clutter/clutter/deprecated/clutter-behaviour-depth.c
clutter/clutter/deprecated/clutter-behaviour-ellipse.c
@@ -67,7 +66,6 @@ clutter/clutter/deprecated/clutter-behaviour-scale.c
clutter/clutter/deprecated/clutter-box.c
clutter/clutter/deprecated/clutter-cairo-texture.c
clutter/clutter/deprecated/clutter-rectangle.c
-clutter/clutter/deprecated/clutter-state.c
clutter/clutter/deprecated/clutter-table-layout.c
clutter/clutter/deprecated/clutter-texture.c
clutter/clutter/evdev/clutter-input-device-evdev.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
