elementary-cxx: Fix C++ examples

Fix C++ examples with new API

configure.ac

@@ -5416,6 +5416,7 @@ EFL_LIB_START([Elementary_Cxx])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina_Cxx])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eet_Cxx])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo_Cxx])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina])
 EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo])

src/examples/elementary/Makefile.am

@@ -18,14 +18,14 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/efl/interfaces \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/bindings/eina_cxx \
--I$(top_builddir)/src/bindings/eina_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+-I$(top_builddir)/src/bindings/cxx/eina_cxx \
 -I$(top_srcdir)/src/lib/eo \
 -I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/bindings/eo_cxx \
--I$(top_builddir)/src/bindings/eo_cxx \
--I$(top_srcdir)/src/bindings/eldbus_cxx \
--I$(top_builddir)/src/bindings/eldbus_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eo_cxx \
+-I$(top_builddir)/src/bindings/cxx/eo_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \
+-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \
 -I$(top_srcdir)/src/lib/ector \
 -I$(top_builddir)/src/lib/ector \
 -I$(top_srcdir)/src/lib/evas \
@@ -177,35 +177,35 @@ evas3d_map_example.c \
 track_example_01.c \
 twitter_example_01.edc
 
-# if HAVE_CXX11
-# SRCS += \
-# thumb_cxx_example_01.cc \
-# table_cxx_example_02.cc \
-# table_cxx_example_01.cc \
-# spinner_cxx_example.cc \
-# slider_cxx_example.cc \
-# separator_cxx_example_01.cc \
-# radio_cxx_example_01.cc \
-# popup_cxx_example_01.cc \
-# menu_cxx_example_01.cc \
-# location_cxx_example_01.cc \
-# icon_cxx_example_01.cc \
-# hoversel_cxx_example_01.cc \
-# glview_cxx_example_01.cc \
-# datetime_cxx_example.cc \
-# clock_cxx_example.cc \
-# calendar_cxx_example_05.cc \
-# calendar_cxx_example_04.cc \
-# calendar_cxx_example_03.cc \
-# calendar_cxx_example_02.cc \
-# calendar_cxx_example_01.cc \
-# button_cxx_example_01.cc \
-# button_cxx_example_00.cc \
-# bubble_cxx_example_01.cc \
-# box_cxx_example_02.cc \
-# bg_cxx_example_02.cc \
-# bg_cxx_example_01.cc
-# endif
+if HAVE_CXX11
+SRCS += \
+thumb_cxx_example_01.cc \
+table_cxx_example_02.cc \
+table_cxx_example_01.cc \
+spinner_cxx_example.cc \
+slider_cxx_example.cc \
+separator_cxx_example_01.cc \
+radio_cxx_example_01.cc \
+popup_cxx_example_01.cc \
+menu_cxx_example_01.cc \
+location_cxx_example_01.cc \
+icon_cxx_example_01.cc \
+hoversel_cxx_example_01.cc \
+glview_cxx_example_01.cc \
+datetime_cxx_example.cc \
+clock_cxx_example.cc \
+calendar_cxx_example_05.cc \
+calendar_cxx_example_04.cc \
+calendar_cxx_example_03.cc \
+calendar_cxx_example_02.cc \
+calendar_cxx_example_01.cc \
+button_cxx_example_01.cc \
+button_cxx_example_00.cc \
+bubble_cxx_example_01.cc \
+box_cxx_example_02.cc \
+bg_cxx_example_02.cc \
+bg_cxx_example_01.cc
+endif
 
 .edc.edj:
 	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
@@ -382,35 +382,35 @@ sphere_hunter/sphere_hunter.edj: sphere_hunter/sphere_hunter.edc
 	$(MKDIR_P) sphere_hunter/; \
 	$(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@
 
-# if HAVE_CXX11
-# examples_PROGRAMS += \
-# thumb_cxx_example_01 \
-# table_cxx_example_02 \
-# table_cxx_example_01 \
-# spinner_cxx_example \
-# slider_cxx_example \
-# separator_cxx_example_01 \
-# radio_cxx_example_01 \
-# popup_cxx_example_01 \
-# menu_cxx_example_01 \
-# location_cxx_example_01 \
-# icon_cxx_example_01 \
-# hoversel_cxx_example_01 \
-# glview_cxx_example_01 \
-# datetime_cxx_example \
-# clock_cxx_example \
-# calendar_cxx_example_05 \
-# calendar_cxx_example_04 \
-# calendar_cxx_example_03 \
-# calendar_cxx_example_02 \
-# calendar_cxx_example_01 \
-# button_cxx_example_01 \
-# button_cxx_example_00 \
-# bubble_cxx_example_01 \
-# box_cxx_example_02 \
-# bg_cxx_example_02 \
-# bg_cxx_example_01
-# endif
+if HAVE_CXX11
+examples_PROGRAMS += \
+thumb_cxx_example_01 \
+table_cxx_example_02 \
+table_cxx_example_01 \
+spinner_cxx_example \
+slider_cxx_example \
+separator_cxx_example_01 \
+radio_cxx_example_01 \
+popup_cxx_example_01 \
+menu_cxx_example_01 \
+location_cxx_example_01 \
+icon_cxx_example_01 \
+hoversel_cxx_example_01 \
+glview_cxx_example_01 \
+datetime_cxx_example \
+clock_cxx_example \
+calendar_cxx_example_05 \
+calendar_cxx_example_04 \
+calendar_cxx_example_03 \
+calendar_cxx_example_02 \
+calendar_cxx_example_01 \
+button_cxx_example_01 \
+button_cxx_example_00 \
+bubble_cxx_example_01 \
+box_cxx_example_02 \
+bg_cxx_example_02 \
+bg_cxx_example_01
+endif
 
 if HAVE_WINDOWS
 efl_thread_1_SOURCES = efl_thread_win32_1.c
@@ -424,34 +424,34 @@ efl_thread_3_SOURCES = efl_thread_3.c
 efl_thread_4_SOURCES = efl_thread_4.c
 endif
 
-# if HAVE_CXX11
-# thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc
-# table_cxx_example_02_SOURCES = table_cxx_example_02.cc
-# table_cxx_example_01_SOURCES = table_cxx_example_01.cc
-# spinner_cxx_example_SOURCES = spinner_cxx_example.cc
-# slider_cxx_example_SOURCES = slider_cxx_example.cc
-# separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc
-# radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc
-# popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc
-# menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc
-# location_cxx_example_01_SOURCES = location_cxx_example_01.cc
-# icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc
-# hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc
-# glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc
-# datetime_cxx_example_SOURCES = datetime_cxx_example.cc
-# clock_cxx_example_SOURCES = clock_cxx_example.cc
-# calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc
-# calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc
-# calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc
-# calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc
-# calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc
-# button_cxx_example_01_SOURCES = button_cxx_example_01.cc
-# button_cxx_example_00_SOURCES = button_cxx_example_00.cc
-# bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc
-# box_cxx_example_02_SOURCES = box_cxx_example_02.cc
-# bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc
-# bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc
-# endif
+if HAVE_CXX11
+thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc
+table_cxx_example_02_SOURCES = table_cxx_example_02.cc
+table_cxx_example_01_SOURCES = table_cxx_example_01.cc
+spinner_cxx_example_SOURCES = spinner_cxx_example.cc
+slider_cxx_example_SOURCES = slider_cxx_example.cc
+separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc
+radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc
+popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc
+menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc
+location_cxx_example_01_SOURCES = location_cxx_example_01.cc
+icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc
+hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc
+glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc
+datetime_cxx_example_SOURCES = datetime_cxx_example.cc
+clock_cxx_example_SOURCES = clock_cxx_example.cc
+calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc
+calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc
+calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc
+calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc
+calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc
+button_cxx_example_01_SOURCES = button_cxx_example_01.cc
+button_cxx_example_00_SOURCES = button_cxx_example_00.cc
+bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc
+box_cxx_example_02_SOURCES = box_cxx_example_02.cc
+bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc
+bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc
+endif
 
 # This variable will hold the list of screenshots that will be made
 # by "make screenshots". Each item in the list is of the form:
@@ -539,33 +539,33 @@ table_example_01:table_example_01.png:0.0 \
 table_example_02:table_example_02.png:0.0 \
 menu_example_01:menu_example_01.png:0.5
 
-# if HAVE_CXX11
-# SCREENSHOTS += \
-# bg_cxx_example_02:bg_cxx_example_02.png:0.0 \
-# box_cxx_example_02:box_cxx_example_02.png:1.3 \
-# bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \
-# button_cxx_example_00:button_cxx_example_00.png:0.0 \
-# button_cxx_example_01:button_cxx_example_01.png:0.0 \
-# calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \
-# calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \
-# calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \
-# calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \
-# calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \
-# clock_cxx_example:clock_cxx_example.png:0.5 \
-# datetime_cxx_example:datetime_cxx_example.png:0.0 \
-# hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \
-# icon_cxx_example_01:icon_cxx_example_01.png:0.0 \
-# menu_cxx_example_01:menu_cxx_example_01.png:0.5 \
-# popup_cxx_example_01:popup_cxx_example_01.png:1.0 \
-# popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \
-# radio_cxx_example_01:radio_cxx_example_01.png:0.0 \
-# separator_cxx_example_01:separator_cxx_example_01.png:0.0 \
-# slider_cxx_example:slider_cxx_example.png:0.0 \
-# spinner_cxx_example:spinner_cxx_example.png:0.0 \
-# table_cxx_example_01:table_cxx_example_01.png:0.0 \
-# table_cxx_example_02:table_cxx_example_02.png:0.0 \
-# thumb_cxx_example_01:thumb_cxx_example_01.png:0.5
-# endif
+if HAVE_CXX11
+SCREENSHOTS += \
+bg_cxx_example_02:bg_cxx_example_02.png:0.0 \
+box_cxx_example_02:box_cxx_example_02.png:1.3 \
+bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \
+button_cxx_example_00:button_cxx_example_00.png:0.0 \
+button_cxx_example_01:button_cxx_example_01.png:0.0 \
+calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \
+calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \
+calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \
+calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \
+calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \
+clock_cxx_example:clock_cxx_example.png:0.5 \
+datetime_cxx_example:datetime_cxx_example.png:0.0 \
+hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \
+icon_cxx_example_01:icon_cxx_example_01.png:0.0 \
+menu_cxx_example_01:menu_cxx_example_01.png:0.5 \
+popup_cxx_example_01:popup_cxx_example_01.png:1.0 \
+popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \
+radio_cxx_example_01:radio_cxx_example_01.png:0.0 \
+separator_cxx_example_01:separator_cxx_example_01.png:0.0 \
+slider_cxx_example:slider_cxx_example.png:0.0 \
+spinner_cxx_example:spinner_cxx_example.png:0.0 \
+table_cxx_example_01:table_cxx_example_01.png:0.0 \
+table_cxx_example_02:table_cxx_example_02.png:0.0 \
+thumb_cxx_example_01:thumb_cxx_example_01.png:0.5
+endif
 
 HTML_SS_DIR=$(top_builddir)/doc/html/screenshots
 LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots

src/examples/elementary/popup_cxx_example_01.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 EAPI_MAIN int

src/examples/elementary/radio_cxx_example_01.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 EAPI_MAIN int
@@ -7,11 +13,11 @@ elm_main (int argc, char *argv[])
 
    static int val = 1;
 
-   ::elm::win_standard win;
+   ::elm::win::Standard win;
    win.title_set("Radio");
    win.autohide_set(true);
 
-   ::elm::box bx(efl::eo::parent = win);
+   ::elm::Box bx(efl::eo::parent = win);
    bx.horizontal_set(true);
    bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    win.resize_object_add(bx);

src/examples/elementary/separator_cxx_example_01.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 #include <Evas.hh>
 

src/examples/elementary/slider_cxx_example.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 EAPI_MAIN int

src/examples/elementary/spinner_cxx_example.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 EAPI_MAIN int
@@ -5,28 +11,28 @@ elm_main (int argc, char *argv[])
 {
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
-   ::elm::win win(elm_win_util_standard_add("spinner", "Spinner Example"));
+   ::elm::win::Standard win(elm_win_util_standard_add("spinner", "Spinner Example"));
    win.autohide_set(true);
 
-   ::elm::box bx(efl::eo::parent = win);
+   ::elm::Box bx(efl::eo::parent = win);
    bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    win.resize_object_add(bx);
    bx.visible_set(true);
 
-   ::elm::spinner sp(efl::eo::parent = win);
+   ::elm::Spinner sp(efl::eo::parent = win);
    sp.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    sp.size_hint_align_set(EVAS_HINT_FILL, 0.5);
    bx.pack_end(sp);
    sp.visible_set(true);
 
-   ::elm::spinner sp2(efl::eo::parent = win);
+   ::elm::Spinner sp2(efl::eo::parent = win);
    sp2.label_format_set("Percentage %%%1.2f something");
    sp2.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    sp2.size_hint_align_set(EVAS_HINT_FILL, 0.5);
    bx.pack_end(sp2);
    sp2.visible_set(true);
 
-   ::elm::spinner sp3(efl::eo::parent = win);
+   ::elm::Spinner sp3(efl::eo::parent = win);
    sp3.label_format_set("%1.1f units");
    sp3.step_set(1.5);
    sp3.wrap_set(true);
@@ -36,7 +42,7 @@ elm_main (int argc, char *argv[])
    bx.pack_end(sp3);
    sp3.visible_set(true);
 
-   ::elm::spinner sp4(efl::eo::parent = win);
+   ::elm::Spinner sp4(efl::eo::parent = win);
    sp4.style_set("vertical");
    sp4.interval_set(0.2);
    sp4.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -44,14 +50,14 @@ elm_main (int argc, char *argv[])
    bx.pack_end(sp4);
    sp4.visible_set(true);
 
-   ::elm::spinner sp5(efl::eo::parent = win);
+   ::elm::Spinner sp5(efl::eo::parent = win);
    sp5.editable_set(false);
    sp5.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    sp5.size_hint_align_set(EVAS_HINT_FILL, 0.5);
    bx.pack_end(sp5);
    sp5.visible_set(true);
 
-   ::elm::spinner sp6(efl::eo::parent = win);
+   ::elm::Spinner sp6(efl::eo::parent = win);
    sp6.editable_set(false);
    sp6.min_max_set(1, 12);
    sp6.special_value_add(1, "January");
@@ -71,7 +77,7 @@ elm_main (int argc, char *argv[])
    bx.pack_end(sp6);
    sp6.visible_set(true);
 
-   ::elm::spinner sp7(efl::eo::parent = win);
+   ::elm::Spinner sp7(efl::eo::parent = win);
    sp7.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    sp7.size_hint_align_set(EVAS_HINT_FILL, 0.5);
    bx.pack_end(sp7);

src/examples/elementary/table_cxx_example_01.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 EAPI_MAIN int
@@ -5,31 +11,31 @@ elm_main (int argc, char *argv[])
 {
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
-   ::elm::win win(elm_win_util_standard_add("table", "Table"));
+   ::elm::win::Standard win(elm_win_util_standard_add("table", "Table"));
    win.autohide_set(true);
 
-   ::elm::table table(efl::eo::parent = win);
+   ::efl::ui::Grid table(efl::eo::parent = win);
    win.resize_object_add(table);
    table.visible_set(true);
    table.padding_set(5, 5);
    table.homogeneous_set(true);
 
-   ::elm::label label(efl::eo::parent = win);
+   ::elm::Label label(efl::eo::parent = win);
    label.text_set(nullptr, "label 0");
    label.visible_set(true);
    table.pack(label, 0, 0, 1, 1);
 
-   ::elm::label label1(efl::eo::parent = win);
+   ::elm::Label label1(efl::eo::parent = win);
    label1.text_set(nullptr, "label 1");
    label1.visible_set(true);
    table.pack(label1, 1, 0, 1, 1);
 
-   ::elm::label label2(efl::eo::parent = win);
+   ::elm::Label label2(efl::eo::parent = win);
    label2.text_set(nullptr, "label 2");
    label2.visible_set(true);
    table.pack(label2, 0, 1, 1, 1);
 
-   ::elm::label label3(efl::eo::parent = win);
+   ::elm::Label label3(efl::eo::parent = win);
    label3.text_set(nullptr, "label 3");
    label3.visible_set(true);
    table.pack(label3, 1, 1, 1, 1);

src/examples/elementary/table_cxx_example_02.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 #include <Evas.hh>
 

src/examples/elementary/thumb_cxx_example_01.cc

@@ -1,3 +1,9 @@
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "elementary_config.h"
+#endif
+
 #include <Elementary.hh>
 
 #include <iostream>
@@ -11,11 +17,11 @@ elm_main(int argc, char *argv[])
    elm_app_info_set(reinterpret_cast<void*>(elm_main), "elementary", "images/plant_01.jpg");
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
-   ::elm::win_standard win;
+   ::elm::win::Standard win;
    win.title_set("Thumbnailer");
    win.autohide_set(true);
 
-   ::elm::thumb thumb(efl::eo::parent = win);
+   ::elm::Thumb thumb(efl::eo::parent = win);
 
    auto generation_started = std::bind([] { std::cout << "thumbnail generation started." << std::endl; });
 
@@ -28,7 +34,6 @@ elm_main(int argc, char *argv[])
    thumb.callback_generate_error_add( generation_error );
 
    thumb.size_set(160, 160);
-   thumb.editable_set(false);
    std::stringstream ss;
    ss << elm_app_data_dir_get() << "/images/plant_01.jpg";
    thumb.file_set(ss.str(), "image");