From dae089f79e30c1652d1ec98f0cbbd8be9620831e Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Tue, 24 Nov 2020 21:46:03 +0300 Subject: [PATCH] clutter: Remove CLUTTER_ENABLE_EXPERIMENTAL_API It is no longer used anywhere. Part-of: --- clutter/clutter/clutter-actor.c | 1 - clutter/clutter/clutter-backend.c | 2 -- clutter/clutter/clutter-blur-effect.c | 2 -- clutter/clutter/clutter-brightness-contrast-effect.c | 2 -- clutter/clutter/clutter-canvas.c | 2 -- clutter/clutter/clutter-clone.c | 1 - clutter/clutter/clutter-colorize-effect.c | 2 -- clutter/clutter/clutter-deform-effect.c | 1 - clutter/clutter/clutter-desaturate-effect.c | 2 -- clutter/clutter/clutter-image.c | 2 -- clutter/clutter/clutter-paint-node.c | 2 -- clutter/clutter/clutter-paint-nodes.c | 2 -- clutter/clutter/clutter-stage.c | 1 - clutter/clutter/cogl/clutter-stage-cogl.c | 2 -- src/meson.build | 1 - src/tests/clutter/conform/actor-shader-effect.c | 1 - 16 files changed, 26 deletions(-) diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index 3bab3d1ac..70b2b930b 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -609,7 +609,6 @@ #include #define CLUTTER_DISABLE_DEPRECATION_WARNINGS -#define CLUTTER_ENABLE_EXPERIMENTAL_API #include "clutter-actor-private.h" diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c index 47ea4c4e5..fb918d9bc 100644 --- a/clutter/clutter/clutter-backend.c +++ b/clutter/clutter/clutter-backend.c @@ -40,8 +40,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-backend-private.h" #include "clutter-debug.h" #include "clutter-event-private.h" diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c index 92aeca697..d3e7ddca6 100644 --- a/clutter/clutter/clutter-blur-effect.c +++ b/clutter/clutter/clutter-blur-effect.c @@ -39,8 +39,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-blur-effect.h" #include "cogl/cogl.h" diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c index 4942b8772..4f0ce2e5e 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.c +++ b/clutter/clutter/clutter-brightness-contrast-effect.c @@ -41,8 +41,6 @@ #include -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-brightness-contrast-effect.h" #include diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c index 43af0b98f..220daa7b2 100644 --- a/clutter/clutter/clutter-canvas.c +++ b/clutter/clutter/clutter-canvas.c @@ -50,8 +50,6 @@ #include "clutter-canvas.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-actor-private.h" #include "clutter-backend.h" #include "clutter-cairo.h" diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c index 86f124e6d..42e3e07cd 100644 --- a/clutter/clutter/clutter-clone.c +++ b/clutter/clutter/clutter-clone.c @@ -39,7 +39,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API #include "clutter-actor-private.h" #include "clutter-clone.h" #include "clutter-debug.h" diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index d73a0524f..6f7de95bd 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -39,8 +39,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-colorize-effect.h" #include "cogl/cogl.h" diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c index eca46e8f9..039ce014b 100644 --- a/clutter/clutter/clutter-deform-effect.c +++ b/clutter/clutter/clutter-deform-effect.c @@ -53,7 +53,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API #include "clutter-deform-effect.h" #include diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index d7035b679..4ac60d0e0 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -41,8 +41,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include #include "clutter-desaturate-effect.h" diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c index eb6c2f50a..9d368e68d 100644 --- a/clutter/clutter/clutter-image.c +++ b/clutter/clutter/clutter-image.c @@ -38,8 +38,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-image.h" #include "clutter-actor-private.h" diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c index 4df3dac34..27142af87 100644 --- a/clutter/clutter/clutter-paint-node.c +++ b/clutter/clutter/clutter-paint-node.c @@ -60,8 +60,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include #include #include diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c index 3fb7d384a..f1f7fce31 100644 --- a/clutter/clutter/clutter-paint-nodes.c +++ b/clutter/clutter/clutter-paint-nodes.c @@ -33,8 +33,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-paint-node-private.h" #include diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 1cdf5e6f5..e2630ff09 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -48,7 +48,6 @@ #include #define CLUTTER_DISABLE_DEPRECATION_WARNINGS -#define CLUTTER_ENABLE_EXPERIMENTAL_API #include "clutter-stage.h" #include "deprecated/clutter-container.h" diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c index ba03dd24e..b9f5af6e4 100644 --- a/clutter/clutter/cogl/clutter-stage-cogl.c +++ b/clutter/clutter/cogl/clutter-stage-cogl.c @@ -27,8 +27,6 @@ #include "clutter-build-config.h" -#define CLUTTER_ENABLE_EXPERIMENTAL_API - #include "clutter-config.h" #include "clutter-stage-cogl.h" diff --git a/src/meson.build b/src/meson.build index 9fe5e8ebf..92064e6e2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -147,7 +147,6 @@ mutter_deps = [ mutter_c_args = [ '-DCLUTTER_ENABLE_COMPOSITOR_API', - '-DCLUTTER_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API', '-DCOGL_ENABLE_MUTTER_API', diff --git a/src/tests/clutter/conform/actor-shader-effect.c b/src/tests/clutter/conform/actor-shader-effect.c index 38a2d862d..a22ae5f99 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_ENABLE_EXPERIMENTAL_API #define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include