e_magnifier: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I3f6b34c6f16a145ce0baf3a1a56f37a7f8970c45

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index f60dcb8..b81cd36 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -105,7 +105,6 @@ src/bin/e_policy_private_data.h \
 src/bin/e_policy_wl.h \
 src/bin/e_policy_appinfo.h \
 src/bin/e_appinfo.h \
-src/bin/e_magnifier.h \
 src/bin/e_process.h \
 src/bin/e_privilege.h \
 src/bin/e_security.h \

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 0cd50e5..e0b0c86 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -52,7 +52,6 @@
 #include "e_policy_conformant.h"
 #include "e_policy_visibility.h"
 #include "e_appinfo.h"
-#include "e_magnifier.h"
 #include "e_process.h"
 #include "e_privilege.h"
 #include "e_security.h"

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 0e90e26..d54fd34 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -20,6 +20,7 @@
 #include "e_policy_wl_intern.h"
 #include "e_output_intern.h"
 #include "e_module_intern.h"
+#include "e_magnifier_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_magnifier.c b/src/bin/e_magnifier.c
index 784d436..626e737 100644 (file)
--- a/src/bin/e_magnifier.c
+++ b/src/bin/e_magnifier.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_magnifier_intern.h"
 
 #define E_MAGNIFIER_SMART_DATA_GET(obj, ptr)                        \
    E_Magnifier_Smart_Data *ptr = evas_object_smart_data_get(obj);
@@ -116,7 +117,7 @@ _e_magnifier_proxy_ec_new(E_Client *ec)
 
    evas_object_show(ec->magnifier_proxy);
 
-   return EINA_TRUE;   
+   return EINA_TRUE;
 }
 
 static void

diff --git a/src/bin/e_magnifier.h b/src/bin/e_magnifier.h
deleted file mode 100644 (file)
index a292453..0000000
--- a/src/bin/e_magnifier.h
+++ /dev/null
@@ -1,47 +0,0 @@
-# ifdef E_TYPEDEFS
-typedef enum _E_Magnifier_Zoom_Ratio
-{
-   E_MAGNIFIER_ZOOM_RATIO_100 = 100,
-   E_MAGNIFIER_ZOOM_RATIO_110 = 110,
-   E_MAGNIFIER_ZOOM_RATIO_120 = 120,
-   E_MAGNIFIER_ZOOM_RATIO_130 = 130,
-   E_MAGNIFIER_ZOOM_RATIO_140 = 140,
-   E_MAGNIFIER_ZOOM_RATIO_150 = 150,
-   E_MAGNIFIER_ZOOM_RATIO_160 = 160,
-   E_MAGNIFIER_ZOOM_RATIO_170 = 170,
-   E_MAGNIFIER_ZOOM_RATIO_180 = 180,
-   E_MAGNIFIER_ZOOM_RATIO_190 = 190,
-   E_MAGNIFIER_ZOOM_RATIO_200 = 200,
-} E_Magnifier_Zoom_Ratio;
-# else
-
-# ifndef E_MAGNIFIER_H
-# define E_MAGNIFIER_H
-
-#define E_MAGNIFIER_SMART_OBJ_TYPE "E_Magnifier_Smart_Object"
-
-EINTERN int       e_magnifier_init(void);
-EINTERN int       e_magnifier_shutdown(void);
-
-EINTERN Eina_Bool   e_magnifier_new(void);
-EINTERN void        e_magnifier_del(void);
-
-EINTERN Eina_Bool   e_magnifier_show(E_Client *ec);
-EINTERN void        e_magnifier_hide(E_Client *ec);
-
-EINTERN Eina_Bool   e_magnifier_zoom_obj_ratio_set(E_Client *ec, E_Magnifier_Zoom_Ratio ratio);
-EINTERN Eina_Bool   e_magnifier_zoom_obj_geometry_set(E_Client *ec, int angle, int x, int y, int w, int h);
-
-EINTERN Eina_Bool e_magnifier_smart_member_add(E_Desk *desk, Evas_Object *obj);
-EINTERN Eina_Bool e_magnifier_smart_member_del(Evas_Object *obj);
-
-EINTERN Eina_Bool   e_magnifier_owner_set(E_Client *ec);
-EINTERN void        e_magnifier_owner_unset(E_Client *ec);
-EINTERN E_Client   *e_magnifier_owner_get(void);
-
-EINTERN Eina_Bool e_magnifier_stand_alone_mode_set(Eina_Bool stand_alone);
-#endif
-#endif
-
-
-

diff --git a/src/bin/e_magnifier_intern.h b/src/bin/e_magnifier_intern.h
new file mode 100644 (file)
index 0000000..7223f89
--- /dev/null
+++ b/src/bin/e_magnifier_intern.h
@@ -0,0 +1,40 @@
+# ifndef E_MAGNIFIER_INTERN_H
+# define E_MAGNIFIER_INTERN_H
+
+#define E_MAGNIFIER_SMART_OBJ_TYPE "E_Magnifier_Smart_Object"
+
+typedef enum _E_Magnifier_Zoom_Ratio
+{
+   E_MAGNIFIER_ZOOM_RATIO_100 = 100,
+   E_MAGNIFIER_ZOOM_RATIO_110 = 110,
+   E_MAGNIFIER_ZOOM_RATIO_120 = 120,
+   E_MAGNIFIER_ZOOM_RATIO_130 = 130,
+   E_MAGNIFIER_ZOOM_RATIO_140 = 140,
+   E_MAGNIFIER_ZOOM_RATIO_150 = 150,
+   E_MAGNIFIER_ZOOM_RATIO_160 = 160,
+   E_MAGNIFIER_ZOOM_RATIO_170 = 170,
+   E_MAGNIFIER_ZOOM_RATIO_180 = 180,
+   E_MAGNIFIER_ZOOM_RATIO_190 = 190,
+   E_MAGNIFIER_ZOOM_RATIO_200 = 200,
+} E_Magnifier_Zoom_Ratio;
+
+EINTERN int e_magnifier_init(void);
+EINTERN int e_magnifier_shutdown(void);
+
+EINTERN Eina_Bool  e_magnifier_new(void);
+EINTERN void       e_magnifier_del(void);
+EINTERN Eina_Bool  e_magnifier_show(E_Client *ec);
+EINTERN void       e_magnifier_hide(E_Client *ec);
+EINTERN Eina_Bool  e_magnifier_zoom_obj_ratio_set(E_Client *ec, E_Magnifier_Zoom_Ratio ratio);
+EINTERN Eina_Bool  e_magnifier_zoom_obj_geometry_set(E_Client *ec, int angle, int x, int y, int w, int h);
+EINTERN Eina_Bool  e_magnifier_smart_member_add(E_Desk *desk, Evas_Object *obj);
+EINTERN Eina_Bool  e_magnifier_smart_member_del(Evas_Object *obj);
+EINTERN Eina_Bool  e_magnifier_owner_set(E_Client *ec);
+EINTERN void       e_magnifier_owner_unset(E_Client *ec);
+EINTERN E_Client  *e_magnifier_owner_get(void);
+EINTERN Eina_Bool  e_magnifier_stand_alone_mode_set(Eina_Bool stand_alone);
+
+#endif
+
+
+

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 4d97416..b3f4bbc 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -23,6 +23,7 @@
 #include "e_msg_intern.h"
 #include "e_mouse_intern.h"
 #include "e_module_intern.h"
+#include "e_magnifier_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 3a07bcb..3b3309e 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -24,6 +24,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_intern.h"
 #include "e_privilege_intern.h"
+#include "e_magnifier_intern.h"
 
 #include <device/display.h>
 #include <wayland-server.h>