cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b1f62061b960a4c40e89a440d7aa90473c9bfd9c
commit b1f62061b960a4c40e89a440d7aa90473c9bfd9c Author: Cedric BAIL <[email protected]> Date: Mon Jun 6 11:00:54 2016 -0700 eio: remove eio_model that should already be part of Eio.h. --- src/Makefile_Eio.am | 3 +- src/lib/eio/Eio_Eo.h | 1 + src/lib/eio/Makefile.am | 3 +- src/lib/eio/eio_model.c | 3 +- src/lib/eio/eio_model.h | 75 ------------------------------ src/lib/elementary/Elementary.h.in | 1 - src/tests/eio/eio_model_test_file.c | 1 - src/tests/eio/eio_model_test_monitor_add.c | 1 - 8 files changed, 5 insertions(+), 83 deletions(-) diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am index 6fa8a7c..e3a7a8b 100644 --- a/src/Makefile_Eio.am +++ b/src/Makefile_Eio.am @@ -45,8 +45,7 @@ lib/eio/eio_model.c \ lib/eio/eio_model_private.h \ lib/eio/eio_private.h \ lib/eio/eio_job_private.h \ -lib/eio/eio_sentry_private.h \ -lib/eio/eio_model.h +lib/eio/eio_sentry_private.h if HAVE_INOTIFY lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_inotify.c diff --git a/src/lib/eio/Eio_Eo.h b/src/lib/eio/Eio_Eo.h index ebd2d50..3fe3510 100644 --- a/src/lib/eio/Eio_Eo.h +++ b/src/lib/eio/Eio_Eo.h @@ -7,6 +7,7 @@ extern "C" { #include "eio_job.eo.h" #include "eio_sentry.eo.h" +#include "eio_model.eo.h" #ifdef __cplusplus } diff --git a/src/lib/eio/Makefile.am b/src/lib/eio/Makefile.am index 41d2d04..72aa5e3 100644 --- a/src/lib/eio/Makefile.am +++ b/src/lib/eio/Makefile.am @@ -37,8 +37,7 @@ eio_job.c \ eio_sentry.c \ eio_model.c \ eio_model_private.h \ -eio_private.h \ -eio_model.h +eio_private.h if HAVE_INOTIFY libeio_la_SOURCES += eio_monitor_inotify.c diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index da010ef..8eba635 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c @@ -11,8 +11,9 @@ #include <Eo.h> #include <Efreet_Mime.h> +#include "Eio.h" + #include "eio_private.h" -#include "eio_model.h" #include "eio_model_private.h" #define MY_CLASS EIO_MODEL_CLASS diff --git a/src/lib/eio/eio_model.h b/src/lib/eio/eio_model.h deleted file mode 100644 index e28870b..0000000 --- a/src/lib/eio/eio_model.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @page emodel_eio_main Emodel_Eio - * - * @date 2014 (created) - * - * @brief Emodel_Eio Library Public API Calls - * - * @section toc Table of Contents - * - * @li @ref emodel_eio_main_intro - * - * @section eo_main_intro Introduction - * - * This module targets file operations using Emodel. - - * - * Recommended reading: - * - * @li @ref Emodel - * @li @ref Eo - * @li @ref Eina - * - * @defgroup Emodel_Eio EIO implementation wrapper for Emodel - * - * @addtogroup Emodel_Eio - * @{ - */ - -#ifndef _EMODEL_EIO_H -#define _EMODEL_EIO_H - -#include <Eo.h> -#include <Efl.h> -#include <Eio.h> - -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_EIO_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif /* ! DLL_EXPORT */ -# else -# define EAPI __declspec(dllimport) -# endif /* ! EFL_EIO_BUILD */ -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif /* ! _WIN32 */ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <eio_model.eo.h> - -#ifdef __cplusplus -} -#endif - -#undef EAPI -#define EAPI - -#endif //_EMODEL_EIO_H diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in index 24c4ceb..3947fd7 100644 --- a/src/lib/elementary/Elementary.h.in +++ b/src/lib/elementary/Elementary.h.in @@ -83,7 +83,6 @@ #include <Efreet_Mime.h> #include <Efreet_Trash.h> #include <Ethumb_Client.h> -#include <eio_model.h> #ifdef ELM_ELOCATION #include <Elocation.h> diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c index 5ed7d7b..81a65de 100644 --- a/src/tests/eio/eio_model_test_file.c +++ b/src/tests/eio/eio_model_test_file.c @@ -8,7 +8,6 @@ #include <Eio.h> #include <Ecore.h> #include <Efl.h> -#include <eio_model.h> #include <stdio.h> #include <check.h> diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c index da24eab..99d6e07 100644 --- a/src/tests/eio/eio_model_test_monitor_add.c +++ b/src/tests/eio/eio_model_test_monitor_add.c @@ -8,7 +8,6 @@ #include <Eio.h> #include <Ecore.h> #include <Efl.h> -#include <eio_model.h> #include <stdio.h> #include <check.h> --
