From 66d0dfd51e21e6ff909da9fcf57d21e997c447c5 Mon Sep 17 00:00:00 2001 From: Fabio Mello Date: Mon, 20 Jan 2014 10:51:44 -0200 Subject: [PATCH] Make calculator not dependent of ecore_x. Change-Id: I874efb6a865e8694f0efbe78df70675d5b89b1ea Signed-off-by: Leandro Dorileo --- CMakeLists.txt | 4 ++-- debian/control | 2 +- packaging/org.tizen.calculator.spec | 1 - src/calc-main.c | 6 ------ src/calc-view.c | 1 - src/calculator_edje.c | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a401d2..f83a399 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,9 +31,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED elementary utilX +pkg_check_modules(pkgs REQUIRED elementary dlog glib-2.0 evas edje vconf - ecore-x ecore ecore-input capi-appfw-application + ecore ecore-input capi-appfw-application feedback ) diff --git a/debian/control b/debian/control index 99d8827..5fe0ca7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Zhang Xiang , Wang YongJun , Zhou Zhibin Uploaders: -Build-Depends: debhelper (>= 5), libelm-dev, libslp-utilx-dev, dlog-dev, libsvi-dev, libevas-dev, libedje-dev, capi-appfw-application-dev +Build-Depends: debhelper (>= 5), libelm-dev, dlog-dev, libsvi-dev, libevas-dev, libedje-dev, capi-appfw-application-dev Standards-Version: 0.1.0 Package: com.samsung.calculator diff --git a/packaging/org.tizen.calculator.spec b/packaging/org.tizen.calculator.spec index 65d1fbf..b9f3792 100644 --- a/packaging/org.tizen.calculator.spec +++ b/packaging/org.tizen.calculator.spec @@ -13,7 +13,6 @@ BuildRequires: pkgconfig(edje) BuildRequires: pkgconfig(embryo) BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(utilX) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(appcore-common) BuildRequires: pkgconfig(dlog) diff --git a/src/calc-main.c b/src/calc-main.c index 0faa445..69284da 100644 --- a/src/calc-main.c +++ b/src/calc-main.c @@ -16,8 +16,6 @@ * */ #include -#include /* ecore_x_window_size_get */ -#include /* KEY_END */ #include #include "calc-main.h" #include "calc-view.h" @@ -232,15 +230,11 @@ static Evas_Object *_create_win(const char *name) { CALC_FUN_BEG(); Evas_Object *eo; - int w, h; eo = elm_win_add(NULL, name, ELM_WIN_BASIC); if (eo) { elm_win_title_set(eo, name); evas_object_smart_callback_add(eo, "delete,request", _win_del, NULL); - ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, - &h); - evas_object_resize(eo, w, h); } CALC_FUN_END(); return eo; diff --git a/src/calc-view.c b/src/calc-view.c index f9128df..dc5863e 100755 --- a/src/calc-view.c +++ b/src/calc-view.c @@ -22,7 +22,6 @@ #include "calc-string.h" #include "calc-expression.h" #include "calc-view.h" -#include extern char decimal_ch; extern char separator_ch; diff --git a/src/calculator_edje.c b/src/calculator_edje.c index 30937d8..737d87c 100644 --- a/src/calculator_edje.c +++ b/src/calculator_edje.c @@ -26,7 +26,6 @@ #include "calc-expression.h" #include "calc-view.h" #include -#include #include #define CALCULATOR_CHAR_IS_OPERATOR(C) ((C == '+')||(C == '-')||(C == 'x')||(C == '/')) /**