Update code after Eolian changes in EFL
Use latest EFL from GIT
This commit is contained in:
parent
c64d481e70
commit
28713189a0
|
@ -18,7 +18,7 @@ find_package(Elementary REQUIRED)
|
||||||
find_package(Ecore REQUIRED)
|
find_package(Ecore REQUIRED)
|
||||||
find_package(Evas REQUIRED)
|
find_package(Evas REQUIRED)
|
||||||
find_package(Ffi REQUIRED)
|
find_package(Ffi REQUIRED)
|
||||||
find_package(efl_profiler)
|
find_package(efl_profiler QUIET)
|
||||||
|
|
||||||
add_subdirectory(src/bin)
|
add_subdirectory(src/bin)
|
||||||
add_subdirectory(src/lib)
|
add_subdirectory(src/lib)
|
||||||
|
|
|
@ -154,13 +154,13 @@ _eolian_type_resolve(const Eolian_Type *eo_type)
|
||||||
|
|
||||||
if (type_base == EOLIAN_TYPE_REGULAR)
|
if (type_base == EOLIAN_TYPE_REGULAR)
|
||||||
{
|
{
|
||||||
const char *full_name = eolian_type_full_name_get(eo_type);
|
const char *full_name = eolian_type_name_get(eo_type);
|
||||||
const Eolian_Typedecl *alias = eolian_state_alias_by_name_get(eos, full_name);
|
const Eolian_Typedecl *alias = eolian_state_alias_by_name_get(eos, full_name);
|
||||||
if (alias)
|
if (alias)
|
||||||
{
|
{
|
||||||
eo_type = eolian_typedecl_base_type_get(alias);
|
eo_type = eolian_typedecl_base_type_get(alias);
|
||||||
type_base = eolian_type_type_get(eo_type);
|
type_base = eolian_type_type_get(eo_type);
|
||||||
full_name = eolian_type_full_name_get(eo_type);
|
full_name = eolian_type_name_get(eo_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (full_name)
|
if (full_name)
|
||||||
|
@ -464,7 +464,7 @@ _class_buffer_fill(Eo *obj, const Eolian_Class *ekl, char *buf)
|
||||||
int len, i;
|
int len, i;
|
||||||
if (!size) // only if its the first func to succeed
|
if (!size) // only if its the first func to succeed
|
||||||
{
|
{
|
||||||
const char *class_name = eolian_class_full_name_get(ekl);
|
const char *class_name = eolian_class_name_get(ekl);
|
||||||
len = strlen(class_name) + 1;
|
len = strlen(class_name) + 1;
|
||||||
memcpy(buf, class_name, len);
|
memcpy(buf, class_name, len);
|
||||||
size += len;
|
size += len;
|
||||||
|
@ -1344,7 +1344,7 @@ eolian_debug_object_information_decode(char *buffer, unsigned int size)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf("Unknown parameter type %s\n", eolian_type_full_name_get(eo_type));
|
printf("Unknown parameter type %s\n", eolian_type_name_get(eo_type));
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1380,7 +1380,7 @@ eolian_debug_object_information_decode(char *buffer, unsigned int size)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf("Unknown parameter type %s\n", eolian_type_full_name_get(eo_type));
|
printf("Unknown parameter type %s\n", eolian_type_name_get(eo_type));
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -435,7 +435,7 @@ _eolian_type_to_string(const Eolian_Type *param_eolian_type, Eina_Strbuf *buf)
|
||||||
if ((type == EOLIAN_TYPE_REGULAR || type == EOLIAN_TYPE_CLASS) &&
|
if ((type == EOLIAN_TYPE_REGULAR || type == EOLIAN_TYPE_CLASS) &&
|
||||||
!eolian_type_base_type_get(param_eolian_type))
|
!eolian_type_base_type_get(param_eolian_type))
|
||||||
{
|
{
|
||||||
eina_strbuf_append_printf(buf, "%s", eolian_type_full_name_get(param_eolian_type));
|
eina_strbuf_append_printf(buf, "%s", eolian_type_name_get(param_eolian_type));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -443,7 +443,7 @@ _eolian_type_to_string(const Eolian_Type *param_eolian_type, Eina_Strbuf *buf)
|
||||||
if ((eolian_type_type_get(base) == EOLIAN_TYPE_REGULAR) ||
|
if ((eolian_type_type_get(base) == EOLIAN_TYPE_REGULAR) ||
|
||||||
(eolian_type_type_get(base) == EOLIAN_TYPE_CLASS))
|
(eolian_type_type_get(base) == EOLIAN_TYPE_CLASS))
|
||||||
{
|
{
|
||||||
eina_strbuf_append_printf(buf, "%s *", eolian_type_full_name_get(base));
|
eina_strbuf_append_printf(buf, "%s *", eolian_type_name_get(base));
|
||||||
}
|
}
|
||||||
else if (eolian_type_type_get(base) == EOLIAN_TYPE_VOID)
|
else if (eolian_type_type_get(base) == EOLIAN_TYPE_VOID)
|
||||||
{
|
{
|
||||||
|
@ -584,7 +584,7 @@ _obj_kl_info_item_label_get(void *data, Evas_Object *obj EINA_UNUSED,
|
||||||
const char *part EINA_UNUSED)
|
const char *part EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eolian_Debug_Class *kl = data;
|
Eolian_Debug_Class *kl = data;
|
||||||
return strdup(eolian_class_full_name_get(kl->ekl));
|
return strdup(eolian_class_name_get(kl->ekl));
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
|
|
Loading…
Reference in New Issue