From 4c776308fb4fd5b497e44e9655ff09d9f77070be Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 8 Mar 2010 08:08:04 +0000 Subject: [PATCH] remove ecore_txt SVN revision: 46985 --- legacy/ecore/Makefile.am | 5 -- legacy/ecore/configure.ac | 13 ----- legacy/ecore/ecore-txt.pc.in | 12 ----- legacy/ecore/src/lib/Makefile.am | 1 - legacy/ecore/src/lib/ecore_txt/.cvsignore | 6 --- legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h | 52 ------------------- legacy/ecore/src/lib/ecore_txt/Makefile.am | 26 ---------- legacy/ecore/src/lib/ecore_txt/ecore_txt.c | 20 ------- .../src/lib/ecore_txt/ecore_txt_private.h | 35 ------------- .../src/lib/ecore_x/xcb/ecore_xcb_events.c | 7 +-- 10 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 legacy/ecore/ecore-txt.pc.in delete mode 100644 legacy/ecore/src/lib/ecore_txt/.cvsignore delete mode 100644 legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h delete mode 100644 legacy/ecore/src/lib/ecore_txt/Makefile.am delete mode 100644 legacy/ecore/src/lib/ecore_txt/ecore_txt.c delete mode 100644 legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am index 0989683299..821bcdccc7 100644 --- a/legacy/ecore/Makefile.am +++ b/legacy/ecore/Makefile.am @@ -72,7 +72,6 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \ ecore-imf.pc.in \ ecore-imf-evas.pc.in \ ecore-ipc.pc.in \ - ecore-txt.pc.in \ ecore-x.pc.in \ ecore-win32.pc.in \ ecore-sdl.pc.in \ @@ -133,10 +132,6 @@ if BUILD_ECORE_IPC pkgconfig_DATA += ecore-ipc.pc endif -if BUILD_ECORE_TXT -pkgconfig_DATA += ecore-txt.pc -endif - if BUILD_ECORE_X pkgconfig_DATA += ecore-x.pc endif diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index f78dccd5a2..8aee11abe8 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -51,7 +51,6 @@ case "$host_os" in ecore_quartz_release_info="-release $release" ecore_release_info="-release $release" ecore_sdl_release_info="-release $release" - ecore_txt_release_info="-release $release" ecore_win32_release_info="-release $release" ecore_x_release_info="-release $release" ;; @@ -71,7 +70,6 @@ AC_SUBST(ecore_ipc_release_info) AC_SUBST(ecore_quartz_release_info) AC_SUBST(ecore_release_info) AC_SUBST(ecore_sdl_release_info) -AC_SUBST(ecore_txt_release_info) AC_SUBST(ecore_win32_release_info) AC_SUBST(ecore_wince_release_info) AC_SUBST(ecore_x_release_info) @@ -113,7 +111,6 @@ want_glib="no" # core modules want_ecore_data="no" -want_ecore_txt="no" want_ecore_con="yes" want_ecore_ipc="no" want_ecore_file="yes" @@ -243,7 +240,6 @@ requirements_ecore_input_evas="" requirements_ecore_ipc="" requirements_ecore_quartz="" requirements_ecore_sdl="" -requirements_ecore_txt="" requirements_ecore_x="" requirements_ecore_win32="" requirements_ecore_wince="" @@ -341,7 +337,6 @@ case "$host_os" in requirements_ecore_imf="evil ${requirements_ecore_imf}" requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}" EFL_ECORE_BUILD="-DEFL_ECORE_BUILD" - EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD" EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD" EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD" EFL_ECORE_IMF_BUILD="-DEFL_ECORE_IMF_BUILD" @@ -367,7 +362,6 @@ case "$host_os" in esac AC_SUBST(EFL_ECORE_BUILD) -AC_SUBST(EFL_ECORE_TXT_BUILD) AC_SUBST(EFL_ECORE_FILE_BUILD) AC_SUBST(EFL_ECORE_EVAS_BUILD) AC_SUBST(EFL_ECORE_IMF_BUILD) @@ -968,9 +962,6 @@ fi # ecore_data ECORE_CHECK_MODULE([data], [${want_ecore_data}], [Data]) -# ecore_txt -ECORE_CHECK_MODULE([txt], [${want_ecore_txt}], [Txt], [yes]) - # ecore_con ECORE_CHECK_MODULE([con], [${want_ecore_con}], [Con], [${have_addrinfo}]) @@ -1315,7 +1306,6 @@ AC_SUBST(requirements_ecore_input_evas) AC_SUBST(requirements_ecore_ipc) AC_SUBST(requirements_ecore_quartz) AC_SUBST(requirements_ecore_sdl) -AC_SUBST(requirements_ecore_txt) AC_SUBST(requirements_ecore_x) AC_SUBST(requirements_ecore_win32) AC_SUBST(requirements_ecore_wince) @@ -1338,7 +1328,6 @@ ecore-input.pc ecore-input-evas.pc ecore-win32.pc ecore-sdl.pc -ecore-txt.pc ecore-wince.pc ecore.pc doc/ecore.dox @@ -1361,7 +1350,6 @@ src/lib/ecore_imf_evas/Makefile src/lib/ecore_input/Makefile src/lib/ecore_input_evas/Makefile src/lib/ecore_ipc/Makefile -src/lib/ecore_txt/Makefile src/lib/ecore_win32/Makefile src/lib/ecore_wince/Makefile src/lib/ecore_x/Makefile @@ -1384,7 +1372,6 @@ echo " Ecore........................: always" echo " Thread support.............: $have_pthread" echo " GLib support...............: $have_glib" echo " Ecore_Data...................: $have_ecore_data (deprecated)" -echo " Ecore_Txt....................: $have_ecore_txt (deprecated)" echo " Ecore_Con....................: $have_ecore_con" if test "x$have_ecore_con" = "xyes" ; then echo $ECHO_N " OpenSSL....................: $have_openssl $ECHO_C" diff --git a/legacy/ecore/ecore-txt.pc.in b/legacy/ecore/ecore-txt.pc.in deleted file mode 100644 index 04c71e6d1e..0000000000 --- a/legacy/ecore/ecore-txt.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: ecore-txt -Description: E core library, Text module -@pkgconfig_requires_private@: @requirements_ecore_txt@ -Version: @VERSION@ -Libs: -L${libdir} -lecore_txt -Libs.private: @iconv_libs@ -Cflags: -I${includedir} diff --git a/legacy/ecore/src/lib/Makefile.am b/legacy/ecore/src/lib/Makefile.am index d580797479..fdb9ffc6ba 100644 --- a/legacy/ecore/src/lib/Makefile.am +++ b/legacy/ecore/src/lib/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS = \ ecore \ ecore_input \ ecore_input_evas \ -ecore_txt \ ecore_fb \ ecore_directfb \ ecore_con \ diff --git a/legacy/ecore/src/lib/ecore_txt/.cvsignore b/legacy/ecore/src/lib/ecore_txt/.cvsignore deleted file mode 100644 index e59917237b..0000000000 --- a/legacy/ecore/src/lib/ecore_txt/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -ecore_txt.lo -libecore_txt.la diff --git a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h b/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h deleted file mode 100644 index ece863730a..0000000000 --- a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ - -#ifndef _ECORE_TXT_H -#define _ECORE_TXT_H - -#include -#warning "this file is deprecated. use Eina.h instead." - -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_ECORE_TXT_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif /* ! DLL_EXPORT */ -# else -# define EAPI __declspec(dllimport) -# endif /* ! EFL_ECORE_TXT_BUILD */ -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif /* ! _WIN32 */ - -/** - * @file Ecore_Txt.h - * @brief Provides a text encoding conversion function. - */ - -#ifdef __cplusplus -extern "C" { -#endif - -EAPI char *ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text) EINA_DEPRECATED; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/legacy/ecore/src/lib/ecore_txt/Makefile.am b/legacy/ecore/src/lib/ecore_txt/Makefile.am deleted file mode 100644 index 3ec8e35d7a..0000000000 --- a/legacy/ecore/src/lib/ecore_txt/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I$(top_srcdir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore \ -@EFL_ECORE_TXT_BUILD@ \ -@EINA_CFLAGS@ - -if BUILD_ECORE_TXT - -lib_LTLIBRARIES = libecore_txt.la - -include_HEADERS = \ -Ecore_Txt.h - -libecore_txt_la_SOURCES = \ -ecore_txt.c - -libecore_txt_la_LIBADD = @EINA_LIBS@ - -libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_txt_release_info@ - - -endif - -EXTRA_DIST = ecore_txt_private.h diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c b/legacy/ecore/src/lib/ecore_txt/ecore_txt.c deleted file mode 100644 index dd4545c69c..0000000000 --- a/legacy/ecore/src/lib/ecore_txt/ecore_txt.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "Ecore_Txt.h" - - -/** - * @deprecated use eina_str_convert() instead. - */ -EAPI char * -ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text) -{ - EINA_LOG_ERR("use eina_str_convert() instead."); - return eina_str_convert(enc_from, enc_to, text); -} diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h b/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h deleted file mode 100644 index 8ab81db211..0000000000 --- a/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _ECORE_TXT_PRIVATE_H -#define _ECORE_TXT_PRIVATE_H - -extern int _ecore_txt_log_dom; - -#ifdef ECORE_TXT_DEFAULT_LOG_COLOR -# undef ECORE_TXT_DEFAULT_LOG_COLOR -#endif -#define ECORE_TXT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE - -#ifdef ERR -# undef ERR -#endif -#define ERR(...) EINA_LOG_DOM_ERR(_ecore_txt_log_dom, __VA_ARGS__) - -#ifdef DBG -# undef DBG -#endif -#define DBG(...) EINA_LOG_DOM_DBG(_ecore_txt_log_dom, __VA_ARGS__) - -#ifdef INF -# undef INF -#endif -#define INF(...) EINA_LOG_DOM_INFO(_ecore_txt_log_dom, __VA_ARGS__) - -#ifdef WRN -# undef WRN -#endif -#define WRN(...) EINA_LOG_DOM_WARN(_ecore_txt_log_dom, __VA_ARGS__) - -#ifdef CRIT -# undef CRIT -#endif -#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_txt_log_dom, __VA_ARGS__) -#endif diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c index 73ed581707..94d2c5c90b 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c @@ -6,6 +6,7 @@ # include #endif +#include #include #include @@ -312,7 +313,7 @@ _ecore_key_press(int event, #ifdef X_HAVE_UTF8_STRING compose = compose_buffer; #else - compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer); + compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer); tmp = compose; #endif } @@ -323,7 +324,7 @@ _ecore_key_press(int event, if (val > 0) { compose_buffer[val] = 0; - compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer); + compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer); tmp = compose; } } @@ -1913,7 +1914,7 @@ _ecore_x_event_handle_client_message(xcb_generic_event_t *event) } else if ((ev->type == ECORE_X_ATOM_WM_CHANGE_STATE) && (ev->format == 32) - && (ev->data.data32[0] == XCB_WM_ICONIC_STATE)) + && (ev->data.data32[0] == XCB_WM_HINT_STATE)) { Ecore_X_Event_Window_State_Request *e;