summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bindings/cxx/elementary_cxx/meson.build1
-rw-r--r--src/bindings/cxx/meson.build2
-rw-r--r--src/examples/elementary/bg_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/bg_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/box_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/button_cxx_example_00.cc2
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/calendar_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/calendar_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/calendar_cxx_example_03.cc2
-rw-r--r--src/examples/elementary/calendar_cxx_example_04.cc2
-rw-r--r--src/examples/elementary/calendar_cxx_example_05.cc2
-rw-r--r--src/examples/elementary/clock_cxx_example.cc2
-rw-r--r--src/examples/elementary/icon_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/menu_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/popup_cxx_example.cc2
-rw-r--r--src/examples/elementary/radio_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/slider_cxx_example.cc2
-rw-r--r--src/examples/elementary/spinner_cxx_example.cc2
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/table_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/toolbar_cxx_example_01.cc2
-rw-r--r--src/lib/elementary/Efl_Ui.hh (renamed from src/lib/elementary/Elementary.hh)2
-rw-r--r--src/tests/elementary_cxx/cxx_compile_test.cc2
24 files changed, 25 insertions, 22 deletions
diff --git a/src/bindings/cxx/elementary_cxx/meson.build b/src/bindings/cxx/elementary_cxx/meson.build
new file mode 100644
index 0000000000..3c76dade79
--- /dev/null
+++ b/src/bindings/cxx/elementary_cxx/meson.build
@@ -0,0 +1 @@
cxx_header_src += files(join_paths('..', file_location, 'Efl_Ui.hh'))
diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build
index d5b6295731..3401a43c3f 100644
--- a/src/bindings/cxx/meson.build
+++ b/src/bindings/cxx/meson.build
@@ -11,7 +11,7 @@ cxx_sublibs = [
11 ['Evas', false, true, true, []], 11 ['Evas', false, true, true, []],
12 ['Edje', false, false, true, []], 12 ['Edje', false, false, true, []],
13 ['Eldbus', true, true, true, []], 13 ['Eldbus', true, true, true, []],
14 ['Elementary', false, true, true, []] 14 ['Elementary', true, true, true, []]
15] 15]
16 16
17increased_dependency = [] 17increased_dependency = []
diff --git a/src/examples/elementary/bg_cxx_example_01.cc b/src/examples/elementary/bg_cxx_example_01.cc
index 1b3ae91736..5c8a61e198 100644
--- a/src/examples/elementary/bg_cxx_example_01.cc
+++ b/src/examples/elementary/bg_cxx_example_01.cc
@@ -1,6 +1,6 @@
1#define EFL_CXXPERIMENTAL // for background part 1#define EFL_CXXPERIMENTAL // for background part
2#define EFL_BETA_API_SUPPORT 2#define EFL_BETA_API_SUPPORT
3#include <Elementary.hh> 3#include <Efl_Ui.hh>
4 4
5using efl::eo::instantiate; 5using efl::eo::instantiate;
6 6
diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc
index f88329d2eb..07b40ab5fe 100644
--- a/src/examples/elementary/bg_cxx_example_02.cc
+++ b/src/examples/elementary/bg_cxx_example_02.cc
@@ -8,7 +8,7 @@
8#define EFL_CXXPERIMENTAL 8#define EFL_CXXPERIMENTAL
9#define EFL_BETA_API_SUPPORT 9#define EFL_BETA_API_SUPPORT
10 10
11#include <Elementary.hh> 11#include <Efl_Ui.hh>
12 12
13using efl::eo::instantiate; 13using efl::eo::instantiate;
14 14
diff --git a/src/examples/elementary/box_cxx_example_02.cc b/src/examples/elementary/box_cxx_example_02.cc
index e89007fdec..e9d802cb98 100644
--- a/src/examples/elementary/box_cxx_example_02.cc
+++ b/src/examples/elementary/box_cxx_example_02.cc
@@ -1,6 +1,6 @@
1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` box_cxx_example_02.cc -o box_cxx_example_02 1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` box_cxx_example_02.cc -o box_cxx_example_02
2 2
3#include <Elementary.hh> 3#include <Efl_Ui.hh>
4 4
5using efl::eo::instantiate; 5using efl::eo::instantiate;
6 6
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index a0cdb1c566..ff9f569c18 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -2,7 +2,7 @@
2 2
3#define EFL_CXXPERIMENTAL 3#define EFL_CXXPERIMENTAL
4#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
5#include <Elementary.hh> 5#include <Efl_Ui.hh>
6#include <iostream> 6#include <iostream>
7 7
8using efl::eo::instantiate; 8using efl::eo::instantiate;
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 3136f6ac04..4cad5d8ae7 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -2,7 +2,7 @@
2 2
3#define EFL_CXXPERIMENTAL 3#define EFL_CXXPERIMENTAL
4#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
5#include <Elementary.hh> 5#include <Efl_Ui.hh>
6 6
7using efl::eo::instantiate; 7using efl::eo::instantiate;
8 8
diff --git a/src/examples/elementary/calendar_cxx_example_01.cc b/src/examples/elementary/calendar_cxx_example_01.cc
index 0d89dfe2d6..fbeccb92bf 100644
--- a/src/examples/elementary/calendar_cxx_example_01.cc
+++ b/src/examples/elementary/calendar_cxx_example_01.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3using efl::eo::instantiate; 3using efl::eo::instantiate;
4 4
diff --git a/src/examples/elementary/calendar_cxx_example_02.cc b/src/examples/elementary/calendar_cxx_example_02.cc
index 047f5841f8..60fb796bf1 100644
--- a/src/examples/elementary/calendar_cxx_example_02.cc
+++ b/src/examples/elementary/calendar_cxx_example_02.cc
@@ -1,6 +1,6 @@
1#define EFL_CXXPERIMENTAL 1#define EFL_CXXPERIMENTAL
2 2
3#include <Elementary.hh> 3#include <Efl_Ui.hh>
4 4
5using namespace std::placeholders; 5using namespace std::placeholders;
6using efl::eo::add; 6using efl::eo::add;
diff --git a/src/examples/elementary/calendar_cxx_example_03.cc b/src/examples/elementary/calendar_cxx_example_03.cc
index 5b44afb557..3f75b07167 100644
--- a/src/examples/elementary/calendar_cxx_example_03.cc
+++ b/src/examples/elementary/calendar_cxx_example_03.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3using efl::eo::instantiate; 3using efl::eo::instantiate;
4 4
diff --git a/src/examples/elementary/calendar_cxx_example_04.cc b/src/examples/elementary/calendar_cxx_example_04.cc
index 4e7a17fe21..ef2a8eb643 100644
--- a/src/examples/elementary/calendar_cxx_example_04.cc
+++ b/src/examples/elementary/calendar_cxx_example_04.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3#warning This example can not be implemented with EO APIs... FIXME 3#warning This example can not be implemented with EO APIs... FIXME
4 4
diff --git a/src/examples/elementary/calendar_cxx_example_05.cc b/src/examples/elementary/calendar_cxx_example_05.cc
index 3e6b9f780c..ccb7891d15 100644
--- a/src/examples/elementary/calendar_cxx_example_05.cc
+++ b/src/examples/elementary/calendar_cxx_example_05.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3#warning This example can not be implemented with EO APIs... FIXME 3#warning This example can not be implemented with EO APIs... FIXME
4 4
diff --git a/src/examples/elementary/clock_cxx_example.cc b/src/examples/elementary/clock_cxx_example.cc
index 7e30937c2c..aa08d40c88 100644
--- a/src/examples/elementary/clock_cxx_example.cc
+++ b/src/examples/elementary/clock_cxx_example.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3using efl::eo::instantiate; 3using efl::eo::instantiate;
4 4
diff --git a/src/examples/elementary/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc
index 6252ce1cc0..fd71bedeb5 100644
--- a/src/examples/elementary/icon_cxx_example_01.cc
+++ b/src/examples/elementary/icon_cxx_example_01.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3EAPI_MAIN int 3EAPI_MAIN int
4elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) 4elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
diff --git a/src/examples/elementary/menu_cxx_example_01.cc b/src/examples/elementary/menu_cxx_example_01.cc
index 04cb3905ad..ff3a62e9be 100644
--- a/src/examples/elementary/menu_cxx_example_01.cc
+++ b/src/examples/elementary/menu_cxx_example_01.cc
@@ -1,4 +1,4 @@
1#include <Elementary.hh> 1#include <Efl_Ui.hh>
2 2
3#warning This example can not be implemented with EO APIs... FIXME 3#warning This example can not be implemented with EO APIs... FIXME
4 4
diff --git a/src/examples/elementary/popup_cxx_example.cc b/src/examples/elementary/popup_cxx_example.cc
index a6a29ed955..f92b1add89 100644
--- a/src/examples/elementary/popup_cxx_example.cc
+++ b/src/examples/elementary/popup_cxx_example.cc
@@ -4,7 +4,7 @@
4 4
5#include <Evas.hh> 5#include <Evas.hh>
6#include <Efl_Ui.h> 6#include <Efl_Ui.h>
7#include <Elementary.hh> 7#include <Efl_Ui.hh>
8#include <iostream> 8#include <iostream>
9 9
10using efl::eo::instantiate; 10using efl::eo::instantiate;
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index e72fe9f55e..6d6f943fb9 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -2,7 +2,7 @@
2 2
3#define EFL_CXXPERIMENTAL 3#define EFL_CXXPERIMENTAL
4#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
5#include <Elementary.hh> 5#include <Efl_Ui.hh>
6#include <iostream> 6#include <iostream>
7 7
8using efl::eo::instantiate; 8using efl::eo::instantiate;
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index 82846257cf..24de288d06 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -2,7 +2,7 @@
2 2
3#define EFL_CXXPERIMENTAL 3#define EFL_CXXPERIMENTAL
4#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
5#include <Elementary.hh> 5#include <Efl_Ui.hh>
6 6
7using namespace std::placeholders; 7using namespace std::placeholders;
8using efl::eo::instantiate; 8using efl::eo::instantiate;
diff --git a/src/examples/elementary/spinner_cxx_example.cc b/src/examples/elementary/spinner_cxx_example.cc
index a37e24e44c..98319c091d 100644
--- a/src/examples/elementary/spinner_cxx_example.cc
+++ b/src/examples/elementary/spinner_cxx_example.cc
@@ -2,7 +2,7 @@
2 2
3#define ELM_WIDGET_PROTECTED 3#define ELM_WIDGET_PROTECTED
4 4
5#include <Elementary.hh> 5#include <Efl_Ui.hh>
6#include <iostream> 6#include <iostream>
7 7
8#warning FIXME: This example requires proper EO API usage (not legacy spinner) 8#warning FIXME: This example requires proper EO API usage (not legacy spinner)
diff --git a/src/examples/elementary/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc
index 60a923d283..11e97b589f 100644
--- a/src/examples/elementary/table_cxx_example_01.cc
+++ b/src/examples/elementary/table_cxx_example_01.cc
@@ -1,6 +1,6 @@
1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01 1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01
2 2
3#include <Elementary.hh> 3#include <Efl_Ui.hh>
4 4
5using efl::eo::instantiate; 5using efl::eo::instantiate;
6 6
diff --git a/src/examples/elementary/table_cxx_example_02.cc b/src/examples/elementary/table_cxx_example_02.cc
index f9e4c13c53..f0ca35e76d 100644
--- a/src/examples/elementary/table_cxx_example_02.cc
+++ b/src/examples/elementary/table_cxx_example_02.cc
@@ -1,7 +1,7 @@
1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01 1// g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` table_cxx_example_01.cc -o table_cxx_example_01
2 2
3#include <Evas.hh> 3#include <Evas.hh>
4#include <Elementary.hh> 4#include <Efl_Ui.hh>
5 5
6using efl::eo::instantiate; 6using efl::eo::instantiate;
7 7
diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc
index 6f4e83be89..a32f4926b6 100644
--- a/src/examples/elementary/toolbar_cxx_example_01.cc
+++ b/src/examples/elementary/toolbar_cxx_example_01.cc
@@ -8,7 +8,7 @@
8#warning This example requires yet unfinished EO APIs 8#warning This example requires yet unfinished EO APIs
9 9
10#define EFL_BETA_API_SUPPORT 10#define EFL_BETA_API_SUPPORT
11#include <Elementary.hh> 11#include <Efl_Ui.hh>
12 12
13EAPI int 13EAPI int
14elm_main(int argc, char* argv[]) 14elm_main(int argc, char* argv[])
diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Efl_Ui.hh
index e5e1036e0c..d8551b8d09 100644
--- a/src/lib/elementary/Elementary.hh
+++ b/src/lib/elementary/Efl_Ui.hh
@@ -14,7 +14,9 @@
14#include <Efl.hh> 14#include <Efl.hh>
15 15
16extern "C" { 16extern "C" {
17// Some Elm_* classes are built and require the old header.
17#include "Elementary.h" 18#include "Elementary.h"
19#include "Efl_Ui.h"
18} 20}
19 21
20#include <Edje.hh> 22#include <Edje.hh>
diff --git a/src/tests/elementary_cxx/cxx_compile_test.cc b/src/tests/elementary_cxx/cxx_compile_test.cc
index 62b9460bf0..a32e863347 100644
--- a/src/tests/elementary_cxx/cxx_compile_test.cc
+++ b/src/tests/elementary_cxx/cxx_compile_test.cc
@@ -4,7 +4,7 @@
4# include "elementary_config.h" 4# include "elementary_config.h"
5#endif 5#endif
6 6
7#include <Elementary.hh> 7#include <Efl_Ui.hh>
8 8
9#include <iostream> 9#include <iostream>
10 10