From 13ecefe6700cdafae1b07231774f93429067f7e3 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 1 Apr 2016 09:57:38 +0900 Subject: [PATCH] Revert "XXX - reword me when done" This reverts commit bc238146146d2bdd6a36e0aa31b83f9ce59ac98b. --- src/Makefile_Efl.am | 8 +----- src/lib/efl/Efl.h | 4 --- src/lib/efl/interfaces/efl_vpath.c | 18 ------------ src/lib/efl/interfaces/efl_vpath.eo | 15 ---------- src/lib/efl/interfaces/efl_vpath_file.c | 32 --------------------- src/lib/efl/interfaces/efl_vpath_file.eo | 24 ---------------- src/lib/efl/interfaces/efl_vpath_manager.c | 28 ------------------ src/lib/efl/interfaces/efl_vpath_manager.eo | 24 ---------------- 8 files changed, 1 insertion(+), 152 deletions(-) delete mode 100644 src/lib/efl/interfaces/efl_vpath.c delete mode 100644 src/lib/efl/interfaces/efl_vpath.eo delete mode 100644 src/lib/efl/interfaces/efl_vpath_file.c delete mode 100644 src/lib/efl/interfaces/efl_vpath_file.eo delete mode 100644 src/lib/efl/interfaces/efl_vpath_manager.c delete mode 100644 src/lib/efl/interfaces/efl_vpath_manager.eo diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 3fa30839cb..d8683e1362 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -23,9 +23,6 @@ efl_eolian_files = \ lib/efl/interfaces/efl_gfx_filter.eo \ lib/efl/interfaces/efl_model_base.eo \ lib/efl/interfaces/efl_animator.eo \ - lib/efl/interfaces/efl_vpath.eo \ - lib/efl/interfaces/efl_vpath_manager.eo \ - lib/efl/interfaces/efl_vpath_file.eo \ $(efl_eolian_legacy_files) \ $(NULL) @@ -58,10 +55,7 @@ lib_LTLIBRARIES += lib/efl/libefl.la lib_efl_libefl_la_SOURCES = \ lib/efl/interfaces/efl_interfaces_main.c \ lib/efl/interfaces/efl_model_common.c \ -lib/efl/interfaces/efl_gfx_shape.c \ -lib/efl/interfaces/efl_vpath.c \ -lib/efl/interfaces/efl_vpath_file.c \ -lib/efl/interfaces/efl_vpath_manager.c +lib/efl/interfaces/efl_gfx_shape.c lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA lib_efl_libefl_la_LIBADD = @EFL_LIBS@ diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 02fbe1da3b..2cb0bd7a0c 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -50,10 +50,6 @@ typedef struct tm Efl_Time; #include -#include "interfaces/efl_vpath_file.eo.h" -#include "interfaces/efl_vpath.eo.h" -#include "interfaces/efl_vpath_manager.eo.h" - /* Data types */ #include "interfaces/efl_gfx_types.eot.h" typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; diff --git a/src/lib/efl/interfaces/efl_vpath.c b/src/lib/efl/interfaces/efl_vpath.c deleted file mode 100644 index 28ecd109b9..0000000000 --- a/src/lib/efl/interfaces/efl_vpath.c +++ /dev/null @@ -1,18 +0,0 @@ -#define EFL_BETA_API_SUPPORT - -#include "Efl.h" - -typedef struct _Efl_Vpath_Data Efl_Vpath_Data; - -struct _Efl_Vpath_Data -{ - int dummy; -}; - -EOLIAN static Efl_Vpath_File * -_efl_vpath_fetch(Eo *obj EINA_UNUSED, Efl_Vpath_Data *pd EINA_UNUSED, const char *path EINA_UNUSED) -{ - return NULL; -} - -#include "interfaces/efl_vpath.eo.c" diff --git a/src/lib/efl/interfaces/efl_vpath.eo b/src/lib/efl/interfaces/efl_vpath.eo deleted file mode 100644 index 2e7dd6abad..0000000000 --- a/src/lib/efl/interfaces/efl_vpath.eo +++ /dev/null @@ -1,15 +0,0 @@ -class Efl.Vpath (Eo.Base) -{ - legacy_prefix: null; - eo_prefix: efl_vpath; - methods { - fetch { - params { - path: const(char)*; [[ The input virtual file path to fetch ]] - } - return: own(Efl.Vpath_File *); [[ An object representing the file ]] - } - } - events { - } -} diff --git a/src/lib/efl/interfaces/efl_vpath_file.c b/src/lib/efl/interfaces/efl_vpath_file.c deleted file mode 100644 index dffd44c275..0000000000 --- a/src/lib/efl/interfaces/efl_vpath_file.c +++ /dev/null @@ -1,32 +0,0 @@ -#define EFL_BETA_API_SUPPORT - -#include "Efl.h" - -typedef struct _Efl_Vpath_File_Data Efl_Vpath_File_Data; - -struct _Efl_Vpath_File_Data -{ - const char *path; - const char *result; -}; - -EOLIAN static void -_efl_vpath_file_path_set(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd, const char *path) -{ - eina_stringshare_replace(&(pd->path), path); - // XXX: begin resolve or fetch -} - -EOLIAN static const char * -_efl_vpath_file_path_get(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd) -{ - return pd->path; -} - -EOLIAN static const char * -_efl_vpath_file_result_get(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd) -{ - return pd->result; -} - -#include "interfaces/efl_vpath_file.eo.c" diff --git a/src/lib/efl/interfaces/efl_vpath_file.eo b/src/lib/efl/interfaces/efl_vpath_file.eo deleted file mode 100644 index ff338cab33..0000000000 --- a/src/lib/efl/interfaces/efl_vpath_file.eo +++ /dev/null @@ -1,24 +0,0 @@ -class Efl.Vpath_File (Eo.Base) -{ - legacy_prefix: null; - eo_prefix: efl_vpath_file; - methods { - @property path { - set {} - get {} - values { - path: const(char)*; [[ The input virtual path to a file ]] - } - } - @property result { - get {} - values { - path: const(char)*; [[ The resulting destination file ]] - } - } - } - events { - fetched; [[ File successfully mapped/fetched ]] - failed; [[ File fetch or mapping failed ]] - } -} diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c deleted file mode 100644 index 7905d817ef..0000000000 --- a/src/lib/efl/interfaces/efl_vpath_manager.c +++ /dev/null @@ -1,28 +0,0 @@ -#define EFL_BETA_API_SUPPORT - -#include "Efl.h" - -typedef struct _Efl_Vpath_Manager_Data Efl_Vpath_Manager_Data; - -struct _Efl_Vpath_Manager_Data -{ - Eina_List *list; -}; - -EOLIAN static Efl_Vpath_File * -_efl_vpath_manager_fetch(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const char *path EINA_UNUSED) -{ - return NULL; -} - -EOLIAN static void -_efl_vpath_manager_register(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int priority EINA_UNUSED, Efl_Vpath *vpath EINA_UNUSED) -{ -} - -EOLIAN static void -_efl_vpath_manager_unregister(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Vpath *vpath EINA_UNUSED) -{ -} - -#include "interfaces/efl_vpath_manager.eo.c" diff --git a/src/lib/efl/interfaces/efl_vpath_manager.eo b/src/lib/efl/interfaces/efl_vpath_manager.eo deleted file mode 100644 index 728e092a77..0000000000 --- a/src/lib/efl/interfaces/efl_vpath_manager.eo +++ /dev/null @@ -1,24 +0,0 @@ -class Efl.Vpath_Manager () -{ - legacy_prefix: null; - eo_prefix: efl_vpath_manager; - methods { - fetch @class { - params { - path: const(char)*; [[ The input virtual file path to fetch ]] - } - return: own(Efl.Vpath_File *); [[ An object representing the file ]] - } - register @class { - params { - priority: int; [[ Search order - higher values tired first ]] - vpath: Efl.Vpath * @nonull; [[ A Vpath implementation object ]] - } - } - unregister @class { - params { - vpath: Efl.Vpath * @nonull; [[ A Vpath implementation object ]] - } - } - } -}