summaryrefslogtreecommitdiff
path: root/src/examples/evas
diff options
context:
space:
mode:
authorDaniel Kolesa <daniel@octaforge.org>2019-03-18 12:13:41 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-03-18 12:13:59 +0100
commit58b8a3d1636160a752b8792f1037b8d9f3067a48 (patch)
tree5f7ab0b0289941f756beac99c63453f80cf59fc1 /src/examples/evas
parent3fa8bb7bad584533311753fb447321e9f333591e (diff)
efl: remove EFL_EO_API_SUPPORT macro
Summary: Since we're now going to be shipping some eo classes as stable, there is no point in keeping the eo api behind a macro, and it should be enabled by default. Another case is beta classes, but those are behind the EFL_BETA_API_SUPPORT guard. This also changes includes around the place where things are clearly broken (such as an included header needing something from another header but that other header being guarded, notably efl_ui_widget.h needing focus manager but focus manager being behind beta in Elementary.h) Reviewers: zmike, cedric, bu5hm4n, stefan_schmidt, segfaultxavi Reviewed By: cedric, segfaultxavi Subscribers: segfaultxavi, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8322
Diffstat (limited to 'src/examples/evas')
-rw-r--r--src/examples/evas/evas-3d-aabb.c1
-rw-r--r--src/examples/evas/evas-3d-blending.c1
-rw-r--r--src/examples/evas/evas-3d-colorpick.c1
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c1
-rw-r--r--src/examples/evas/evas-3d-cube.c1
-rw-r--r--src/examples/evas/evas-3d-cube2.c1
-rw-r--r--src/examples/evas/evas-3d-eet.c1
-rw-r--r--src/examples/evas/evas-3d-fog.c1
-rw-r--r--src/examples/evas/evas-3d-frustum.c1
-rw-r--r--src/examples/evas/evas-3d-hull.c1
-rw-r--r--src/examples/evas/evas-3d-md2.c1
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c1
-rw-r--r--src/examples/evas/evas-3d-obj.c1
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c1
-rw-r--r--src/examples/evas/evas-3d-pick.c1
-rw-r--r--src/examples/evas/evas-3d-ply.c1
-rw-r--r--src/examples/evas/evas-3d-proxy.c1
-rw-r--r--src/examples/evas/evas-3d-shadows.c1
-rw-r--r--src/examples/evas/evas-3d-static-lod.c1
-rw-r--r--src/examples/evas/evas-map-aa-eo.c4
-rw-r--r--src/examples/evas/evas-map-utils-eo.c4
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c1
-rw-r--r--src/examples/evas/evas-vg-batman.c4
-rw-r--r--src/examples/evas/evas-vg-simple.c4
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.h1
25 files changed, 0 insertions, 37 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index fdb8a45278..99e3b98cce 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -14,7 +14,6 @@
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15#define PACKAGE_EXAMPLES_DIR "."
16#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
17#define EFL_EO_API_SUPPORT
18#endif 17#endif
19 18
20#include <Eo.h> 19#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 667b671197..47271ff460 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -14,7 +14,6 @@
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
17#define EFL_EO_API_SUPPORT
18#endif 17#endif
19 18
20#include <Eo.h> 19#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 7b894cd23e..138ceb089a 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -19,7 +19,6 @@
19#else 19#else
20#define PACKAGE_EXAMPLES_DIR "." 20#define PACKAGE_EXAMPLES_DIR "."
21#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#define EFL_EO_API_SUPPORT
23#endif 22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 25889024d1..d5b89b3037 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -16,7 +16,6 @@
16#include "config.h" 16#include "config.h"
17#else 17#else
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Ecore.h> 21#include <Ecore.h>
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index e8d04d4ea9..3fba86a147 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -12,7 +12,6 @@
12#include "config.h" 12#include "config.h"
13#else 13#else
14#define EFL_BETA_API_SUPPORT 14#define EFL_BETA_API_SUPPORT
15#define EFL_EO_API_SUPPORT
16#endif 15#endif
17 16
18#include <Eo.h> 17#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index b2d905e873..493cea98ce 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -11,7 +11,6 @@
11#else 11#else
12#define PACKAGE_EXAMPLES_DIR "." 12#define PACKAGE_EXAMPLES_DIR "."
13#define EFL_BETA_API_SUPPORT 13#define EFL_BETA_API_SUPPORT
14#define EFL_EO_API_SUPPORT
15#endif 14#endif
16 15
17#include <Eo.h> 16#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index becd0bcadc..5ecd79e350 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -18,7 +18,6 @@
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#define EFL_BETA_API_SUPPORT 20#define EFL_BETA_API_SUPPORT
21#define EFL_EO_API_SUPPORT
22#endif 21#endif
23 22
24#include <Eo.h> 23#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 4c69dcac94..8bcd51b94e 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -10,7 +10,6 @@
10#include "config.h" 10#include "config.h"
11#else 11#else
12#define EFL_BETA_API_SUPPORT 12#define EFL_BETA_API_SUPPORT
13#define EFL_EO_API_SUPPORT
14#endif 13#endif
15 14
16#include <math.h> 15#include <math.h>
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 6e765bd399..6aacecc825 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -20,7 +20,6 @@
20#else 20#else
21#define PACKAGE_EXAMPLES_DIR "." 21#define PACKAGE_EXAMPLES_DIR "."
22#define EFL_BETA_API_SUPPORT 22#define EFL_BETA_API_SUPPORT
23#define EFL_EO_API_SUPPORT
24#endif 23#endif
25 24
26#include <Ecore.h> 25#include <Ecore.h>
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index e82f31bca7..6ca12837dc 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -18,7 +18,6 @@
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#define EFL_BETA_API_SUPPORT 20#define EFL_BETA_API_SUPPORT
21#define EFL_EO_API_SUPPORT
22#endif 21#endif
23 22
24#include <Eo.h> 23#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index f97c183bd0..4c93b54ec0 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -11,7 +11,6 @@
11#else 11#else
12#define PACKAGE_EXAMPLES_DIR "." 12#define PACKAGE_EXAMPLES_DIR "."
13#define EFL_BETA_API_SUPPORT 13#define EFL_BETA_API_SUPPORT
14#define EFL_EO_API_SUPPORT
15#endif 14#endif
16 15
17#include <Eo.h> 16#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 149217d95a..df8bdbdd4d 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -15,7 +15,6 @@
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
18#define EFL_EO_API_SUPPORT
19#endif 18#endif
20 19
21#include <Eo.h> 20#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 91126fbfa0..6bf668ba09 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -19,7 +19,6 @@
19#else 19#else
20#define PACKAGE_EXAMPLES_DIR "." 20#define PACKAGE_EXAMPLES_DIR "."
21#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#define EFL_EO_API_SUPPORT
23#endif 22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 1d2cc75263..65d1880559 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -13,7 +13,6 @@
13#else 13#else
14#define PACKAGE_EXAMPLES_DIR "." 14#define PACKAGE_EXAMPLES_DIR "."
15#define EFL_BETA_API_SUPPORT 15#define EFL_BETA_API_SUPPORT
16#define EFL_EO_API_SUPPORT
17#endif 16#endif
18 17
19#include <Eo.h> 18#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 20230d0112..5ed8067dc3 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -15,7 +15,6 @@
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
18#define EFL_EO_API_SUPPORT
19#endif 18#endif
20 19
21#include <math.h> 20#include <math.h>
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 7769a45442..ba0b912d0b 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -16,7 +16,6 @@
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Eo.h> 21#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 6445ee9564..1a671f811d 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -12,7 +12,6 @@
12#include "config.h" 12#include "config.h"
13#else 13#else
14#define EFL_BETA_API_SUPPORT 14#define EFL_BETA_API_SUPPORT
15#define EFL_EO_API_SUPPORT
16#endif 15#endif
17 16
18#include <math.h> 17#include <math.h>
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 16733183f4..eaa2f02f55 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -31,7 +31,6 @@
31#else 31#else
32#define PACKAGE_EXAMPLES_DIR "." 32#define PACKAGE_EXAMPLES_DIR "."
33#define EFL_BETA_API_SUPPORT 33#define EFL_BETA_API_SUPPORT
34#define EFL_EO_API_SUPPORT
35#endif 34#endif
36 35
37#include <Eo.h> 36#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 92e3b1a1a9..3b08380f1c 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -16,7 +16,6 @@
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Eo.h> 21#include <Eo.h>
diff --git a/src/examples/evas/evas-map-aa-eo.c b/src/examples/evas/evas-map-aa-eo.c
index 30e8831c7b..b8156ad2b9 100644
--- a/src/examples/evas/evas-map-aa-eo.c
+++ b/src/examples/evas/evas-map-aa-eo.c
@@ -16,10 +16,6 @@
16# define EFL_BETA_API_SUPPORT 16# define EFL_BETA_API_SUPPORT
17#endif 17#endif
18 18
19#ifndef EFL_EO_API_SUPPORT
20# define EFL_EO_API_SUPPORT
21#endif
22
23#include <Ecore.h> 19#include <Ecore.h>
24#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
25#include <stdlib.h> 21#include <stdlib.h>
diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 157b3af847..1ea812bed1 100644
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -19,10 +19,6 @@
19# define EFL_BETA_API_SUPPORT 19# define EFL_BETA_API_SUPPORT
20#endif 20#endif
21 21
22#ifndef EFL_EO_API_SUPPORT
23# define EFL_EO_API_SUPPORT
24#endif
25
26#include <Ecore.h> 22#include <Ecore.h>
27#include <Ecore_Evas.h> 23#include <Ecore_Evas.h>
28 24
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 4d4c37fa90..7ba391acc9 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -14,7 +14,6 @@
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_EO_API_SUPPORT
18#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
19#endif 18#endif
20 19
diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index 650709f250..8625366962 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -22,10 +22,6 @@
22#define EFL_BETA_API_SUPPORT 22#define EFL_BETA_API_SUPPORT
23#endif 23#endif
24 24
25#ifndef EFL_EO_API_SUPPORT
26#define EFL_EO_API_SUPPORT
27#endif
28
29#include <Eo.h> 25#include <Eo.h>
30#include <Efl.h> 26#include <Efl.h>
31#include <Evas.h> 27#include <Evas.h>
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 36b8baaf55..ef128d511e 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -43,10 +43,6 @@
43#define EFL_BETA_API_SUPPORT 43#define EFL_BETA_API_SUPPORT
44#endif 44#endif
45 45
46#ifndef EFL_EO_API_SUPPORT
47#define EFL_EO_API_SUPPORT
48#endif
49
50#include <Eo.h> 46#include <Eo.h>
51#include <Efl.h> 47#include <Efl.h>
52#include <Evas.h> 48#include <Evas.h>
diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.h b/src/examples/evas/shooter/evas-3d-shooter-header.h
index 13600ec121..aaa6ff389c 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-header.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.h
@@ -5,7 +5,6 @@
5#else 5#else
6#define PACKAGE_EXAMPLES_DIR "." 6#define PACKAGE_EXAMPLES_DIR "."
7#define EFL_BETA_API_SUPPORT 7#define EFL_BETA_API_SUPPORT
8#define EFL_EO_API_SUPPORT
9#endif 8#endif
10 9
11#include <stdio.h> 10#include <stdio.h>