nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/clouseau.git/commit/?id=af282ab41abb15a7073f7341ff42b795c15bd841
commit af282ab41abb15a7073f7341ff42b795c15bd841 Author: Mykyta Biliavskyi <[email protected]> Date: Wed May 1 12:09:44 2019 +0300 Fix build with efl 1.22 release. Fixed using efl API accordingly to the latest changes. --- src/bin/clouseau_client.c | 19 ++++++++++--------- src/lib/clouseau_debug.c | 5 ++--- src/lib/extensions/objects_introspection/gui.c | 5 +++-- src/lib/extensions/profiling_viewer/CMakeLists.txt | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c index 499cc21..b216aa5 100644 --- a/src/bin/clouseau_client.c +++ b/src/bin/clouseau_client.c @@ -10,6 +10,7 @@ #include <getopt.h> #include <Efreet.h> +#include <Efl_Ui.h> #include <Elementary.h> #include <Evas.h> #include <Ecore_File.h> @@ -539,15 +540,15 @@ _dialog_box_create(const char *title, const char *content, const char *but1_str, Eo *win, *bx, *lb; win = efl_add(EFL_UI_WIN_CLASS, _main_widgets->main_win, - efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC), + efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC), efl_ui_win_autodel_set(efl_added, EINA_TRUE), efl_text_set(efl_added, title), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); bx = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); efl_content_set(win, bx); @@ -555,8 +556,8 @@ _dialog_box_create(const char *title, const char *content, const char *but1_str, efl_text_multiline_set(efl_added, EINA_TRUE), efl_text_halign_set(efl_added, 0.5), efl_text_set(efl_added, content), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); efl_pack(bx, lb); @@ -565,8 +566,8 @@ _dialog_box_create(const char *title, const char *content, const char *but1_str, Eo *bx2; bx2 = efl_add(EFL_UI_BOX_CLASS, win, efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), - efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL), + efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), + efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); efl_pack(bx, bx2); @@ -574,7 +575,7 @@ _dialog_box_create(const char *title, const char *content, const char *but1_str, { Eo *bt1 = efl_add(EFL_UI_BUTTON_CLASS, bx2, efl_text_set(efl_added, but1_str), - efl_gfx_size_hint_weight_set(efl_added, 0, 0), + efl_gfx_hint_weight_set(efl_added, 0, 0), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); if (cb1) efl_event_callback_add(bt1, EFL_UI_EVENT_CLICKED, cb1, win); efl_pack(bx2, bt1); @@ -583,7 +584,7 @@ _dialog_box_create(const char *title, const char *content, const char *but1_str, { Eo *bt2 = efl_add(EFL_UI_BUTTON_CLASS, bx2, efl_text_set(efl_added, but2_str), - efl_gfx_size_hint_weight_set(efl_added, 0, 0), + efl_gfx_hint_weight_set(efl_added, 0, 0), efl_gfx_entity_visible_set(efl_added, EINA_TRUE)); if (cb2) efl_event_callback_add(bt2, EFL_UI_EVENT_CLICKED, cb2, win); efl_pack(bx2, bt2); diff --git a/src/lib/clouseau_debug.c b/src/lib/clouseau_debug.c index 8d41ca5..be691f7 100644 --- a/src/lib/clouseau_debug.c +++ b/src/lib/clouseau_debug.c @@ -9,7 +9,6 @@ #include <Evas.h> #include <Elementary.h> #define ELM_INTERNAL_API_ARGESFSDFEFC -#include <elm_widget.h> #include "Clouseau_Debug.h" @@ -338,7 +337,7 @@ _function_invoke(Eo *ptr, const Eolian_Function *foo, Eolian_Function_Type foo_t ffi_argc--; } - const char *full_func_name = eolian_function_full_c_name_get(foo, EOLIAN_PROP_GET, EINA_FALSE); + const char *full_func_name = eolian_function_full_c_name_get(foo, EOLIAN_PROP_GET); void *eo_func = dlsym(RTLD_DEFAULT, full_func_name); if (!eo_func) goto error; ffi_cif cif; @@ -526,7 +525,7 @@ _api_resolvable(Eo *obj, const Eolian_Function *function) const char *func_c_name; void *func_api; - func_c_name = eolian_function_full_c_name_get(function, EOLIAN_PROP_GET, EINA_FALSE); + func_c_name = eolian_function_full_c_name_get(function, EOLIAN_PROP_GET); func_api = dlsym(RTLD_DEFAULT, func_c_name); op = _efl_object_op_api_id_get(func_api, obj, func_c_name, __FILE__, __LINE__); _efl_object_call_resolve(obj, func_c_name, &call_data, op, __FILE__, __LINE__); diff --git a/src/lib/extensions/objects_introspection/gui.c b/src/lib/extensions/objects_introspection/gui.c index c9c31b1..30e140e 100644 --- a/src/lib/extensions/objects_introspection/gui.c +++ b/src/lib/extensions/objects_introspection/gui.c @@ -7,6 +7,7 @@ #ifndef ELM_INTERNAL_API_ARGESFSDFEFC #define ELM_INTERNAL_API_ARGESFSDFEFC #endif +#include <Efl_Ui.h> #include <Elementary.h> #include "gui.h" @@ -143,7 +144,7 @@ gui_take_screenshot_button_create(Eo *__main_parent) elm_icon1 = elm_icon_add(bt); evas_object_size_hint_weight_set(elm_icon1, 1.000000, 1.000000); efl_gfx_entity_visible_set(elm_icon1, EINA_TRUE); - efl_file_set(elm_icon1, TAKE_SCREENSHOT_ICON, NULL); + efl_file_set(elm_icon1, TAKE_SCREENSHOT_ICON); elm_object_part_content_set(bt, "icon", elm_icon1); efl_event_callback_add(bt, EFL_EVENT_DEL, _pubs_free_cb, pub_widgets); @@ -169,7 +170,7 @@ gui_show_screenshot_button_create(Eo *__main_parent) evas_object_size_hint_weight_set(elm_icon1, 1.000000, 1.000000); efl_gfx_entity_visible_set(elm_icon1, EINA_TRUE); efl_gfx_entity_size_set(elm_icon1, EINA_SIZE2D(40, 40)); - efl_file_set(elm_icon1, SHOW_SCREENSHOT_ICON, NULL); + efl_file_set(elm_icon1, SHOW_SCREENSHOT_ICON); elm_object_part_content_set(bt, "icon", elm_icon1); efl_event_callback_add(bt, EFL_EVENT_DEL, _pubs_free_cb, pub_widgets); diff --git a/src/lib/extensions/profiling_viewer/CMakeLists.txt b/src/lib/extensions/profiling_viewer/CMakeLists.txt index 0bf1204..39666c4 100644 --- a/src/lib/extensions/profiling_viewer/CMakeLists.txt +++ b/src/lib/extensions/profiling_viewer/CMakeLists.txt @@ -2,8 +2,8 @@ set(CMAKE_BUILD_TYPE Debug) -STRING(REGEX REPLACE "\n" "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR}) -STRING(REGEX REPLACE " " "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR}) +STRING(REGEX REPLACE "\n" "" EOLIAN_EO_DIR "${EOLIAN_EO_DIR}") +STRING(REGEX REPLACE " " "" EOLIAN_EO_DIR "${EOLIAN_EO_DIR}") add_definitions(${CLI_COMMON_DEFINITIONS} -DEFL_EO_API_SUPPORT -DEOLIAN_EO_DIR="${EOLIAN_EO_DIR}") --
