enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

cxx: Rename Elementary.hh into Efl_Ui.hh 

Also include Efl_Ui.h alongside Elementary.h (the latter is still needed
by some widgets).
This commit is contained in:
Lauro Moura 2019-05-02 15:08:04 -03:00 committed by Marcel Hollerbach
parent fdfb781e22
commit e38fc2264c
24 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bindings/cxx/elementary_cxx/meson.build Normal file
View File

@ -0,0 +1 @@
cxx_header_src += files(join_paths('..', file_location, 'Efl_Ui.hh'))

2
src/bindings/cxx/meson.build
View File

@ -11,7 +11,7 @@ cxx_sublibs = [
['Evas', false, true, true, []],
['Edje', false, false, true, []],
['Eldbus', true, true, true, []],
['Elementary', false, true, true, []]
['Elementary', true, true, true, []]
]
increased_dependency = []

2
src/examples/elementary/bg_cxx_example_01.cc
View File

@ -1,6 +1,6 @@
#define EFL_CXXPERIMENTAL // for background part
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/bg_cxx_example_02.cc
View File

@ -8,7 +8,7 @@
#define EFL_CXXPERIMENTAL
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/box_cxx_example_02.cc
View File

@ -1,6 +1,6 @@
// 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
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/button_cxx_example_00.cc
View File

@ -2,7 +2,7 @@
#define EFL_CXXPERIMENTAL
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
#include <iostream>
using efl::eo::instantiate;

2
src/examples/elementary/button_cxx_example_01.cc
View File

@ -2,7 +2,7 @@
#define EFL_CXXPERIMENTAL
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/calendar_cxx_example_01.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/calendar_cxx_example_02.cc
View File

@ -1,6 +1,6 @@
#define EFL_CXXPERIMENTAL
#include <Elementary.hh>
#include <Efl_Ui.hh>
using namespace std::placeholders;
using efl::eo::add;

2
src/examples/elementary/calendar_cxx_example_03.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/calendar_cxx_example_04.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
#warning This example can not be implemented with EO APIs... FIXME

2
src/examples/elementary/calendar_cxx_example_05.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
#warning This example can not be implemented with EO APIs... FIXME

2
src/examples/elementary/clock_cxx_example.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/icon_cxx_example_01.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
EAPI_MAIN int
elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)

2
src/examples/elementary/menu_cxx_example_01.cc
View File

@ -1,4 +1,4 @@
#include <Elementary.hh>
#include <Efl_Ui.hh>
#warning This example can not be implemented with EO APIs... FIXME

2
src/examples/elementary/popup_cxx_example.cc
View File

@ -4,7 +4,7 @@
#include <Evas.hh>
#include <Efl_Ui.h>
#include <Elementary.hh>
#include <Efl_Ui.hh>
#include <iostream>
using efl::eo::instantiate;

2
src/examples/elementary/radio_cxx_example_01.cc
View File

@ -2,7 +2,7 @@
#define EFL_CXXPERIMENTAL
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
#include <iostream>
using efl::eo::instantiate;

2
src/examples/elementary/slider_cxx_example.cc
View File

@ -2,7 +2,7 @@
#define EFL_CXXPERIMENTAL
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
using namespace std::placeholders;
using efl::eo::instantiate;

2
src/examples/elementary/spinner_cxx_example.cc
View File

@ -2,7 +2,7 @@
#define ELM_WIDGET_PROTECTED
#include <Elementary.hh>
#include <Efl_Ui.hh>
#include <iostream>
#warning FIXME: This example requires proper EO API usage (not legacy spinner)

2
src/examples/elementary/table_cxx_example_01.cc
View File

@ -1,6 +1,6 @@
// 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
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/table_cxx_example_02.cc
View File

@ -1,7 +1,7 @@
// 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
#include <Evas.hh>
#include <Elementary.hh>
#include <Efl_Ui.hh>
using efl::eo::instantiate;

2
src/examples/elementary/toolbar_cxx_example_01.cc
View File

@ -8,7 +8,7 @@
#warning This example requires yet unfinished EO APIs
#define EFL_BETA_API_SUPPORT
#include <Elementary.hh>
#include <Efl_Ui.hh>
EAPI int
elm_main(int argc, char* argv[])

2
src/lib/elementary/Elementary.hh → src/lib/elementary/Efl_Ui.hh
View File

@ -14,7 +14,9 @@
#include <Efl.hh>
extern "C" {
// Some Elm_* classes are built and require the old header.
#include "Elementary.h"
#include "Efl_Ui.h"
}
#include <Edje.hh>

2
src/tests/elementary_cxx/cxx_compile_test.cc
View File

@ -4,7 +4,7 @@
# include "elementary_config.h"
#endif
#include <Elementary.hh>
#include <Efl_Ui.hh>
#include <iostream>