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

elm_prefs: remove efl.file usage 

Summary:
this is a legacy-only api which does not need to drag in unimplemented methods
from interfaces

ref T5719

Reviewers: cedric

Reviewed By: cedric

Subscribers: cedric, #reviewers, #committers

Tags: #efl_api

Maniphest Tasks: T5719

Differential Revision: https://phab.enlightenment.org/D7804
This commit is contained in:
Mike Blumenkrantz 2019-01-28 13:08:56 -05:00
parent 6dd861fe32
commit 497acc6722
2 changed files with 58 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/lib/elementary/elm_prefs.c
View File

@ -1098,69 +1098,6 @@ _elm_prefs_values_get_user(Elm_Prefs_Data *sd,
}
}
EOLIAN static Eina_Bool
_elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, const char *page)
{
const char *prefix;
if (!_elm_prefs_init_count)
{
CRI("prefs_iface module is not loaded! you can't"
" create prefs widgets");
return EINA_FALSE;
}
prefix = elm_app_data_dir_get();
if (!strlen(prefix))
{
WRN("we could not figure out the program's data"
" dir, fallbacking to local directory.");
prefix = ".";
}
if (!file)
sd->file = eina_stringshare_printf("%s/%s", prefix, "preferences.epb");
else
{
#ifndef _WIN32
if (*file != '/') /* relative */
#else
if (!evil_path_is_absolute(file)) /* relative */
#endif
sd->file = eina_stringshare_printf("%s/%s", prefix, file);
else
sd->file = eina_stringshare_add(file);
}
sd->page = eina_stringshare_add(page ? page : "main");
sd->root = _elm_prefs_page_load(obj, sd->page);
if (!sd->root) return EINA_FALSE;
if (!_elm_prefs_page_populate(sd->root, obj))
{
_root_node_free(sd);
sd->root = NULL;
return EINA_FALSE;
}
elm_widget_resize_object_set(obj, sd->root->w_obj);
_elm_prefs_values_get_default(sd->root, EINA_FALSE);
efl_event_callback_legacy_call
(obj, ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name);
return EINA_TRUE;
}
EOLIAN static void
_elm_prefs_efl_file_file_get(const Eo *obj EINA_UNUSED, Elm_Prefs_Data *sd, const char **file, const char **page)
{
if (file) *file = sd->file;
if (page) *page = sd->page;
}
EOLIAN static Eina_Bool
_elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data)
{
@ -1853,14 +1790,68 @@ _elm_prefs_class_constructor(Efl_Class *klass)
EAPI Eina_Bool
elm_prefs_file_set(Eo *obj, const char *file, const char *page)
{
return efl_file_set((Eo *) obj, file, page);
Elm_Prefs_Data *sd = efl_data_scope_get(obj, MY_CLASS);
const char *prefix;
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
if (!_elm_prefs_init_count)
{
CRI("prefs_iface module is not loaded! you can't"
" create prefs widgets");
return EINA_FALSE;
}
prefix = elm_app_data_dir_get();
if (!strlen(prefix))
{
WRN("we could not figure out the program's data"
" dir, fallbacking to local directory.");
prefix = ".";
}
if (!file)
sd->file = eina_stringshare_printf("%s/%s", prefix, "preferences.epb");
else
{
#ifndef _WIN32
if (*file != '/') /* relative */
#else
if (!evil_path_is_absolute(file)) /* relative */
#endif
sd->file = eina_stringshare_printf("%s/%s", prefix, file);
else
sd->file = eina_stringshare_add(file);
}
sd->page = eina_stringshare_add(page ? page : "main");
sd->root = _elm_prefs_page_load(obj, sd->page);
if (!sd->root) return EINA_FALSE;
if (!_elm_prefs_page_populate(sd->root, obj))
{
_root_node_free(sd);
sd->root = NULL;
return EINA_FALSE;
}
elm_widget_resize_object_set(obj, sd->root->w_obj);
_elm_prefs_values_get_default(sd->root, EINA_FALSE);
efl_event_callback_legacy_call
(obj, ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name);
return EINA_TRUE;
}
EAPI Eina_Bool
elm_prefs_file_get(const Eo *obj, const char **file, const char **page)
{
efl_file_get((Eo *) obj, file, page);
Elm_Prefs_Data *sd = efl_data_scope_get(obj, MY_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
if (file) *file = sd->file;
if (page) *page = sd->page;
return EINA_TRUE;
}

3
src/lib/elementary/elm_prefs.eo
View File

@ -1,7 +1,7 @@
type Elm_Prefs_Data: __undefined_type; [[Elementary preferences data type]]
type Elm_Prefs_Reset_Mode: __undefined_type; [[Elementary preferences reset mode type]]
class Elm.Prefs extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Legacy
class Elm.Prefs extends Efl.Ui.Widget implements Efl.Ui.Legacy
{
[[Elementary preferences class]]
legacy_prefix: elm_prefs;
@ -213,7 +213,6 @@ class Elm.Prefs extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Legacy
implements {
class.constructor;
Efl.Object.constructor;
Efl.File.file { get; set; }
}
events {
page,changed: string; [[Called when page changed]]