[mutter] clutter: Remove unused deprecated/clutter-behaviour-opacity.c
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove unused deprecated/clutter-behaviour-opacity.c
- Date: Tue, 22 Oct 2019 19:09:42 +0000 (UTC)
commit 68fca552d761a73ec12b13f288aff7da6c8c8bba
Author: Adam Jackson <ajax redhat com>
Date: Fri Mar 1 10:34:30 2019 -0500
clutter: Remove unused deprecated/clutter-behaviour-opacity.c
https://gitlab.gnome.org/GNOME/mutter/merge_requests/879
clutter/clutter/clutter-deprecated.h | 1 -
.../clutter/deprecated/clutter-behaviour-opacity.c | 310 ---------------------
.../clutter/deprecated/clutter-behaviour-opacity.h | 115 --------
clutter/clutter/meson.build | 2 -
src/tests/clutter/conform/behaviours.c | 88 ------
src/tests/clutter/conform/meson.build | 1 -
src/tests/clutter/conform/script-parser.c | 39 ---
.../scripts/test-script-implicit-alpha.json | 8 -
src/tests/clutter/interactive/test-script.c | 12 -
9 files changed, 576 deletions(-)
---
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 1673be861..5cc18725d 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -9,7 +9,6 @@
#include "deprecated/clutter-animation.h"
#include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-behaviour-depth.h"
-#include "deprecated/clutter-behaviour-opacity.h"
#include "deprecated/clutter-behaviour-scale.h"
#include "deprecated/clutter-bin-layout.h"
#include "deprecated/clutter-box.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index eff7c2230..95ee967a7 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -224,7 +224,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-animation.h',
'deprecated/clutter-behaviour.h',
'deprecated/clutter-behaviour-depth.h',
- 'deprecated/clutter-behaviour-opacity.h',
'deprecated/clutter-behaviour-scale.h',
'deprecated/clutter-bin-layout.h',
'deprecated/clutter-box.h',
@@ -246,7 +245,6 @@ clutter_deprecated_sources = [
'deprecated/clutter-animation.c',
'deprecated/clutter-behaviour.c',
'deprecated/clutter-behaviour-depth.c',
- 'deprecated/clutter-behaviour-opacity.c',
'deprecated/clutter-behaviour-scale.c',
'deprecated/clutter-box.c',
'deprecated/clutter-cairo-texture.c',
diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index eced790b1..d565934d4 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -36,7 +36,6 @@ clutter_conform_tests_general_tests = [
]
clutter_conform_tests_deprecated_tests = [
- 'behaviours',
'group',
'rectangle',
]
diff --git a/src/tests/clutter/conform/script-parser.c b/src/tests/clutter/conform/script-parser.c
index d7fad094a..b51db38d6 100644
--- a/src/tests/clutter/conform/script-parser.c
+++ b/src/tests/clutter/conform/script-parser.c
@@ -198,44 +198,6 @@ script_single (void)
g_free (test_file);
}
-static void
-script_implicit_alpha (void)
-{
- ClutterScript *script = clutter_script_new ();
- ClutterTimeline *timeline;
- GObject *behaviour = NULL;
- GError *error = NULL;
- ClutterAlpha *alpha;
- gchar *test_file;
-
- test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-implicit-alpha.json", NULL);
- clutter_script_load_from_file (script, test_file, &error);
- if (g_test_verbose () && error)
- g_print ("Error: %s", error->message);
-
-#if GLIB_CHECK_VERSION (2, 20, 0)
- g_assert_no_error (error);
-#else
- g_assert (error == NULL);
-#endif
-
- behaviour = clutter_script_get_object (script, "test");
- g_assert (CLUTTER_IS_BEHAVIOUR (behaviour));
-
- alpha = clutter_behaviour_get_alpha (CLUTTER_BEHAVIOUR (behaviour));
- g_assert (CLUTTER_IS_ALPHA (alpha));
-
- g_assert_cmpint (clutter_alpha_get_mode (alpha), ==, CLUTTER_EASE_OUT_CIRC);
-
- timeline = clutter_alpha_get_timeline (alpha);
- g_assert (CLUTTER_IS_TIMELINE (timeline));
-
- g_assert_cmpint (clutter_timeline_get_duration (timeline), ==, 500);
-
- g_object_unref (script);
- g_free (test_file);
-}
-
static void
script_object_property (void)
{
@@ -422,7 +384,6 @@ CLUTTER_TEST_SUITE (
CLUTTER_TEST_UNIT ("/script/container-child", script_child)
CLUTTER_TEST_UNIT ("/script/named-object", script_named_object)
CLUTTER_TEST_UNIT ("/script/animation", script_animation)
- CLUTTER_TEST_UNIT ("/script/implicit-alpha", script_implicit_alpha)
CLUTTER_TEST_UNIT ("/script/object-property", script_object_property)
CLUTTER_TEST_UNIT ("/script/layout-property", script_layout_property)
CLUTTER_TEST_UNIT ("/script/actor-margin", script_margin)
diff --git a/src/tests/clutter/interactive/test-script.c b/src/tests/clutter/interactive/test-script.c
index d84235c4d..999e5191b 100644
--- a/src/tests/clutter/interactive/test-script.c
+++ b/src/tests/clutter/interactive/test-script.c
@@ -47,18 +47,6 @@ static const gchar *test_behaviour =
" \"function\" : \"sine_alpha\","
" \"timeline\" : \"main-timeline\""
" },"
-" {"
-" \"id\" : \"fade-behaviour\","
-" \"type\" : \"ClutterBehaviourOpacity\","
-" \"opacity-start\" : 255,"
-" \"opacity-end\" : 0,"
-" \"alpha\" : {"
-" \"id\" : \"fade-alpha\","
-" \"type\" : \"ClutterAlpha\","
-" \"timeline\" : \"main-timeline\","
-" \"mode\" : \"linear\""
-" }"
-" }"
"]";
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]