From ca6a1e25f506aa02f925c7c5d7f5019d5a7ff3c8 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 19 Sep 2017 08:23:48 +0200 Subject: [PATCH] examples: cxx: fix examples for new size_set function signature This no longer takes two parameters. Update to the new signature. --- src/examples/elementary/bg_cxx_example_01.cc | 2 +- src/examples/elementary/bg_cxx_example_02.cc | 4 ++-- src/examples/elementary/button_cxx_example_00.cc | 6 +++--- src/examples/elementary/calendar_cxx_example_01.cc | 4 ++-- src/examples/elementary/calendar_cxx_example_02.cc | 4 ++-- src/examples/elementary/calendar_cxx_example_03.cc | 4 ++-- src/examples/elementary/calendar_cxx_example_04.cc | 8 ++++---- src/examples/elementary/calendar_cxx_example_05.cc | 4 ++-- src/examples/elementary/clock_cxx_example.cc | 4 ++-- src/examples/elementary/icon_cxx_example_01.cc | 4 ++-- src/examples/elementary/toolbar_cxx_example_01.cc | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/examples/elementary/bg_cxx_example_01.cc b/src/examples/elementary/bg_cxx_example_01.cc index bf90bbf..290ee57 100644 --- a/src/examples/elementary/bg_cxx_example_01.cc +++ b/src/examples/elementary/bg_cxx_example_01.cc @@ -11,7 +11,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) // win.title_set("Bg Plain"); win.autohide_set(true); - win.eo_cxx::efl::Gfx::size_set(320,320); + win.eo_cxx::efl::Gfx::size_set({320,320}); //win.size_set(320,320); win.visible_set(true); diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc index 97a8684..df16a0f 100644 --- a/src/examples/elementary/bg_cxx_example_02.cc +++ b/src/examples/elementary/bg_cxx_example_02.cc @@ -24,10 +24,10 @@ elm_main (int argc EINA_UNUSED, char **args EINA_UNUSED) //ss << elm_app_data_dir_get() << "/images/plant_01.jpg"; bg.file_set("/home/luciana/Pictures/surprised_cat.jpeg", nullptr); //win.resize_object_add(bg); - bg.eo_cxx::efl::Gfx::size_set(640,400); + bg.eo_cxx::efl::Gfx::size_set({640,400}); bg.visible_set(true); - win.eo_cxx::efl::Gfx::size_set(640, 400); + win.eo_cxx::efl::Gfx::size_set({640, 400}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc index e01f571..037a156 100644 --- a/src/examples/elementary/button_cxx_example_00.cc +++ b/src/examples/elementary/button_cxx_example_00.cc @@ -27,15 +27,15 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) efl::ui::Button btn(instantiate, win); btn.text_set("Good-Bye, World!"); - btn.eo_cxx::efl::Gfx::size_set(120, 30); - btn.eo_cxx::efl::Gfx::position_set(60, 15); + btn.eo_cxx::efl::Gfx::size_set({120, 30}); + btn.eo_cxx::efl::Gfx::position_set({60, 15}); btn.visible_set(true); auto on_click = std::bind([] () { elm_exit(); }); efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn, on_click); - win.eo_cxx::efl::Gfx::size_set(240, 60); + win.eo_cxx::efl::Gfx::size_set({240, 60}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/calendar_cxx_example_01.cc b/src/examples/elementary/calendar_cxx_example_01.cc index e88ed6d..89e0de8 100644 --- a/src/examples/elementary/calendar_cxx_example_01.cc +++ b/src/examples/elementary/calendar_cxx_example_01.cc @@ -18,11 +18,11 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) ::elm::Calendar cal(instantiate, win); //cal.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - cal.eo_cxx::efl::Gfx::size_set(134,134); + cal.eo_cxx::efl::Gfx::size_set({134,134}); //win.resize_object_add(cal); cal.visible_set(true); - win.eo_cxx::efl::Gfx::size_set(134,134); + win.eo_cxx::efl::Gfx::size_set({134,134}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/calendar_cxx_example_02.cc b/src/examples/elementary/calendar_cxx_example_02.cc index 623c1e7..ebc095d 100644 --- a/src/examples/elementary/calendar_cxx_example_02.cc +++ b/src/examples/elementary/calendar_cxx_example_02.cc @@ -32,8 +32,8 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) cal.format_function_set(_format_month_year); // cal.weekdays_names_set(weekdays); - cal.eo_cxx::efl::Gfx::size_set(125,134); - win.eo_cxx::efl::Gfx::size_set(125,134); + cal.eo_cxx::efl::Gfx::size_set({125,134}); + win.eo_cxx::efl::Gfx::size_set({125,134}); cal.visible_set(true); win.visible_set(true); diff --git a/src/examples/elementary/calendar_cxx_example_03.cc b/src/examples/elementary/calendar_cxx_example_03.cc index 876a667..672e631 100644 --- a/src/examples/elementary/calendar_cxx_example_03.cc +++ b/src/examples/elementary/calendar_cxx_example_03.cc @@ -29,8 +29,8 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) cal.date_max_set(max); cal.visible_set(true); - cal.eo_cxx::efl::Gfx::size_set(140,140); - win.eo_cxx::efl::Gfx::size_set(140,140); + cal.eo_cxx::efl::Gfx::size_set({140,140}); + win.eo_cxx::efl::Gfx::size_set({140,140}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/calendar_cxx_example_04.cc b/src/examples/elementary/calendar_cxx_example_04.cc index 566449b..0b6b21a 100644 --- a/src/examples/elementary/calendar_cxx_example_04.cc +++ b/src/examples/elementary/calendar_cxx_example_04.cc @@ -24,14 +24,14 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) ::efl::ui::Box bx(instantiate, win); //bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); //win.resize_object_add(bx); - bx.eo_cxx::efl::Gfx::size_set(700,700); + bx.eo_cxx::efl::Gfx::size_set({700,700}); bx.visible_set(true); ::elm::Calendar cal(instantiate, win); // cal.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); // cal.size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL); cal.select_mode_set(ELM_CALENDAR_SELECT_MODE_NONE); - cal.eo_cxx::efl::Gfx::size_set(125,135); + cal.eo_cxx::efl::Gfx::size_set({125,135}); cal.visible_set(true); //bx.pack_end(cal); no matching function for call to ‘efl::ui::Box::pack_end(elm::Calendar&)’ //candidate: bool eo_cxx::efl::pack::Linear::pack_end(Efl_Gfx*) const @@ -43,11 +43,11 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) current_time = time(NULL) +2 * SECS_DAY; localtime_r(¤t_time, &selected_time); // cal2.selected_time_set(&selected_time); - cal2.eo_cxx::efl::Gfx::size_set(125,135); + cal2.eo_cxx::efl::Gfx::size_set({125,135}); cal2.visible_set(true); //bx.pack_end(cal2); - win.eo_cxx::efl::Gfx::size_set(500,560); + win.eo_cxx::efl::Gfx::size_set({500,560}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/calendar_cxx_example_05.cc b/src/examples/elementary/calendar_cxx_example_05.cc index aba248e..3f6332e 100644 --- a/src/examples/elementary/calendar_cxx_example_05.cc +++ b/src/examples/elementary/calendar_cxx_example_05.cc @@ -19,7 +19,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) elm::Calendar cal(instantiate, win); //cal.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); //win.resize_object_add(cal); - cal.eo_cxx::efl::Gfx::size_set(135,135); + cal.eo_cxx::efl::Gfx::size_set({135,135}); // auto print_cal_info = std::bind([] (::elm::Calendar obj) // { @@ -50,7 +50,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) // cal.callback_changed_add(print_cal_info); cal.visible_set(true); - win.eo_cxx::efl::Gfx::size_set(135,135); + win.eo_cxx::efl::Gfx::size_set({135,135}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/clock_cxx_example.cc b/src/examples/elementary/clock_cxx_example.cc index aa5866a..bb8be2b 100644 --- a/src/examples/elementary/clock_cxx_example.cc +++ b/src/examples/elementary/clock_cxx_example.cc @@ -19,7 +19,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) efl::ui::Box bx(instantiate, win); //bx.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); //win.resize_object_add(bx); - bx.eo_cxx::efl::Gfx::size_set(300,300); + bx.eo_cxx::efl::Gfx::size_set({300,300}); bx.visible_set(true); ::elm::Clock ck(instantiate, win); @@ -53,7 +53,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) bx.pack_end(ck5); ck5.visible_set(true); - win.eo_cxx::efl::Gfx::size_set(500,500); + win.eo_cxx::efl::Gfx::size_set({500,500}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc index ba3db99..c3eb91d 100644 --- a/src/examples/elementary/icon_cxx_example_01.cc +++ b/src/examples/elementary/icon_cxx_example_01.cc @@ -32,10 +32,10 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED) // icon.size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); //win.resize_object_add(icon); - icon.eo_cxx::efl::Gfx::size_set(320,320); + icon.eo_cxx::efl::Gfx::size_set({320,320}); icon.visible_set(true); - win.eo_cxx::efl::Gfx::size_set(320, 320); + win.eo_cxx::efl::Gfx::size_set({320, 320}); win.visible_set(true); elm_run(); diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc index 28e0dfc..f194221 100644 --- a/src/examples/elementary/toolbar_cxx_example_01.cc +++ b/src/examples/elementary/toolbar_cxx_example_01.cc @@ -25,7 +25,7 @@ elm_main(int argc, char* argv[]) }); win_1.autodel_set(true); - win_1.eo_cxx::efl::Gfx::size_set(320, 300); + win_1.eo_cxx::efl::Gfx::size_set({320, 300}); efl::ui::Box box_1(instantiate, win_1); box_1.hint_weight_set(1.0, 1.0); -- 2.7.4