From 7de0707dfa16a183182bc5a2ed5e463e9c42925a Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 15 Nov 2023 12:10:43 +0100 Subject: [PATCH] clutter/cleanup: Stop disabling deprecated API usage warnings As we have stopped using the deprecated APIs all over clutter, so let us enforce that newly introduced code doesn't use code that gets depreccated in the future Part-of: --- clutter/clutter/cally/cally.c | 2 -- clutter/clutter/clutter-actor.c | 2 -- clutter/clutter/clutter-stage.c | 2 -- src/meson.build | 1 - src/tests/clutter/accessibility/meson.build | 1 - src/tests/clutter/conform/actor-color-state.c | 1 - src/tests/clutter/conform/actor-destroy.c | 1 - src/tests/clutter/conform/actor-invariants.c | 1 - src/tests/clutter/conform/actor-offscreen-redirect.c | 1 - src/tests/clutter/conform/actor-pick.c | 1 - src/tests/clutter/conform/actor-pivot-point.c | 1 - src/tests/clutter/conform/actor-shader-effect.c | 1 - src/tests/clutter/conform/grab.c | 1 - src/tests/clutter/conform/timeline-interpolate.c | 1 - src/tests/clutter/conform/timeline-progress.c | 1 - src/tests/clutter/conform/timeline-rewind.c | 1 - src/tests/clutter/conform/timeline.c | 1 - src/tests/clutter/interactive/meson.build | 1 - src/tests/clutter/micro-bench/meson.build | 1 - src/tests/clutter/performance/meson.build | 1 - 20 files changed, 23 deletions(-) diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c index bc9875c71..247fa1662 100644 --- a/clutter/clutter/cally/cally.c +++ b/clutter/clutter/cally/cally.c @@ -29,8 +29,6 @@ #include "config.h" -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS - #include "cally/cally.h" #include "cally/cally-actor.h" diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index d4b9fca81..45cbb320f 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -487,8 +487,6 @@ #include "cogl/cogl.h" -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS - #include "clutter/clutter-actor-private.h" #include "clutter/clutter-action.h" diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 0a63247a9..7f8c9bd1d 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -39,8 +39,6 @@ #include -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS - #include "clutter/clutter-stage.h" #include "clutter/clutter-action-private.h" diff --git a/src/meson.build b/src/meson.build index f0de5df1f..11577785b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -177,7 +177,6 @@ mutter_deps = [ mutter_c_args = [ '-DCOGL_ENABLE_MUTTER_API', - '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DCOGL_DISABLE_DEPRECATION_WARNINGS', '-DSN_API_NOT_YET_FROZEN=1', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), diff --git a/src/tests/clutter/accessibility/meson.build b/src/tests/clutter/accessibility/meson.build index ce6361b59..695c82ee4 100644 --- a/src/tests/clutter/accessibility/meson.build +++ b/src/tests/clutter/accessibility/meson.build @@ -5,7 +5,6 @@ clutter_test_accessibility_common_sources = [ clutter_test_accessibility_c_args = [ '-DPREFIXDIR="@0@"'.format(libdir), - '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DGLIB_DISABLE_DEPRECATION_WARNINGS', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), ] diff --git a/src/tests/clutter/conform/actor-color-state.c b/src/tests/clutter/conform/actor-color-state.c index bdef7b8a4..037f38761 100644 --- a/src/tests/clutter/conform/actor-color-state.c +++ b/src/tests/clutter/conform/actor-color-state.c @@ -18,7 +18,6 @@ * Naveen Kumar */ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-destroy.c b/src/tests/clutter/conform/actor-destroy.c index 0ae4713d8..bf4e0ba83 100644 --- a/src/tests/clutter/conform/actor-destroy.c +++ b/src/tests/clutter/conform/actor-destroy.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-invariants.c b/src/tests/clutter/conform/actor-invariants.c index 4eb915c3d..de3ace96e 100644 --- a/src/tests/clutter/conform/actor-invariants.c +++ b/src/tests/clutter/conform/actor-invariants.c @@ -1,7 +1,6 @@ #include #include -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-offscreen-redirect.c b/src/tests/clutter/conform/actor-offscreen-redirect.c index f42d00486..1804b8b23 100644 --- a/src/tests/clutter/conform/actor-offscreen-redirect.c +++ b/src/tests/clutter/conform/actor-offscreen-redirect.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-pick.c b/src/tests/clutter/conform/actor-pick.c index af4ad6f95..123c67d33 100644 --- a/src/tests/clutter/conform/actor-pick.c +++ b/src/tests/clutter/conform/actor-pick.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-pivot-point.c b/src/tests/clutter/conform/actor-pivot-point.c index 6a5cdf22c..4ba98f9e5 100644 --- a/src/tests/clutter/conform/actor-pivot-point.c +++ b/src/tests/clutter/conform/actor-pivot-point.c @@ -1,7 +1,6 @@ #include #include -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/actor-shader-effect.c b/src/tests/clutter/conform/actor-shader-effect.c index af81290e5..57dfe3c8f 100644 --- a/src/tests/clutter/conform/actor-shader-effect.c +++ b/src/tests/clutter/conform/actor-shader-effect.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/grab.c b/src/tests/clutter/conform/grab.c index ce4fdebb7..21524fc4a 100644 --- a/src/tests/clutter/conform/grab.c +++ b/src/tests/clutter/conform/grab.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include "tests/clutter-test-utils.h" diff --git a/src/tests/clutter/conform/timeline-interpolate.c b/src/tests/clutter/conform/timeline-interpolate.c index b63461d93..988386403 100644 --- a/src/tests/clutter/conform/timeline-interpolate.c +++ b/src/tests/clutter/conform/timeline-interpolate.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include #include diff --git a/src/tests/clutter/conform/timeline-progress.c b/src/tests/clutter/conform/timeline-progress.c index fc4ce8421..54423afbc 100644 --- a/src/tests/clutter/conform/timeline-progress.c +++ b/src/tests/clutter/conform/timeline-progress.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include diff --git a/src/tests/clutter/conform/timeline-rewind.c b/src/tests/clutter/conform/timeline-rewind.c index aadedc5d1..6b0a96463 100644 --- a/src/tests/clutter/conform/timeline-rewind.c +++ b/src/tests/clutter/conform/timeline-rewind.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include #include diff --git a/src/tests/clutter/conform/timeline.c b/src/tests/clutter/conform/timeline.c index 369127c40..5447f48f2 100644 --- a/src/tests/clutter/conform/timeline.c +++ b/src/tests/clutter/conform/timeline.c @@ -1,4 +1,3 @@ -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include #include diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build index 69fd6a9be..02bcf7ff0 100644 --- a/src/tests/clutter/interactive/meson.build +++ b/src/tests/clutter/interactive/meson.build @@ -6,7 +6,6 @@ clutter_tests_interactive_c_args = [ '-DG_DISABLE_SINGLE_INCLUDES', '-DGLIB_DISABLE_DEPRECATION_WARNINGS', '-DCOGL_DISABLE_DEPRECATION_WARNINGS', - '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), ] clutter_tests_interactive_c_args += clutter_debug_c_args diff --git a/src/tests/clutter/micro-bench/meson.build b/src/tests/clutter/micro-bench/meson.build index 7fa2a8fca..79929469e 100644 --- a/src/tests/clutter/micro-bench/meson.build +++ b/src/tests/clutter/micro-bench/meson.build @@ -2,7 +2,6 @@ clutter_tests_micro_bench_c_args = [ '-DG_DISABLE_SINGLE_INCLUDES', '-DGLIB_DISABLE_DEPRECATION_WARNINGS', '-DCOGL_DISABLE_DEPRECATION_WARNINGS', - '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), ] clutter_tests_micro_bench_c_args += clutter_debug_c_args diff --git a/src/tests/clutter/performance/meson.build b/src/tests/clutter/performance/meson.build index 2c7637bad..ec18cd893 100644 --- a/src/tests/clutter/performance/meson.build +++ b/src/tests/clutter/performance/meson.build @@ -3,7 +3,6 @@ clutter_tests_performance_c_args = [ '-DG_DISABLE_SINGLE_INCLUDES', '-DGLIB_DISABLE_DEPRECATION_WARNINGS', '-DCOGL_DISABLE_DEPRECATION_WARNINGS', - '-DCLUTTER_DISABLE_DEPRECATION_WARNINGS', '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), ]