e_device: make an internal header

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

Change-Id: I162c048b281ee988fe3664d84d1d7d64f157b883

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index c165fbc..23b5885 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -125,7 +125,6 @@ src/bin/e_msg.h     \
 src/bin/e_foreign.h \
 src/bin/e_foreign_private.h \
 src/bin/e_map.h \
-src/bin/e_device.h \
 src/bin/e_input_event.h
 
 enlightenment_src = \

diff --git a/src/bin/e_comp_wl_intern.h b/src/bin/e_comp_wl_intern.h
index bc52758..c70454d 100644 (file)
--- a/src/bin/e_comp_wl_intern.h
+++ b/src/bin/e_comp_wl_intern.h
@@ -1,7 +1,7 @@
 #ifndef E_COMP_WL_INTERN_H
 #define E_COMP_WL_INTERN_H
 
-#include "e_device.h"
+#include "e_device_intern.h"
 
 EINTERN Eina_Bool e_comp_wl_init(void);
 EINTERN void      e_comp_wl_shutdown(void);

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index ca79f24..e207d96 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -1,7 +1,7 @@
 #include "e.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_policy_wl.h"
-#include "e_device.h"
+#include "e_device_intern.h"
 #include "e_client_intern.h"
 #include "e_process_intern.h"
 #include "e_comp_wl_intern.h"

diff --git a/src/bin/e_device.c b/src/bin/e_device.c
index 391ab95..0783ba5 100644 (file)
--- a/src/bin/e_device.c
+++ b/src/bin/e_device.c
@@ -1,4 +1,5 @@
-#include "e_device.h"
+#include "e.h"
+#include "e_device_intern.h"
 
 typedef struct {
     gchar *source; // just sample
@@ -20,7 +21,7 @@ e_device_init(E_Device *self)
 
 }
 
-E_Device *
+EINTERN E_Device *
 e_device_new(void)
 {
    E_Device *dev;
@@ -31,55 +32,55 @@ e_device_new(void)
    return dev;
 }
 
-void
+EINTERN void
 e_device_name_set(E_Device *dev, const char *name)
 {
    g_object_set_data_full(G_OBJECT(dev), "name", g_strdup(name), g_free);
 }
 
-const gchar *
+EINTERN const gchar *
 e_device_name_get(const E_Device *dev)
 {
    return g_object_get_data(G_OBJECT(dev), "name");
 }
 
-void
+EINTERN void
 e_device_class_set(E_Device *dev, Ecore_Device_Class device_class)
 {
    g_object_set_data(G_OBJECT(dev), "class", GINT_TO_POINTER(device_class));
 }
 
-Ecore_Device_Class
+EINTERN Ecore_Device_Class
 e_device_class_get(const E_Device *dev)
 {
    return (Ecore_Device_Class)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "class"));
 }
 
-void
+EINTERN void
 e_device_subclass_set(E_Device *dev, Ecore_Device_Subclass subclass)
 {
    g_object_set_data(G_OBJECT(dev), "subclass", GINT_TO_POINTER(subclass));
 }
 
-Ecore_Device_Subclass
+EINTERN Ecore_Device_Subclass
 e_device_subclass_get(const E_Device *dev)
 {
    return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "subclass"));
 }
 
-void
+EINTERN void
 e_device_identifier_set(E_Device *dev, const char *identifier)
 {
    g_object_set_data_full(G_OBJECT(dev), "identifier", g_strdup(identifier), g_free);
 }
 
-const gchar *
+EINTERN const gchar *
 e_device_identifier_get(const E_Device *dev)
 {
    return g_object_get_data(G_OBJECT(dev), "identifier");
 }
 
-const GList *
+EINTERN const GList *
 e_device_list_get(void)
 {
    return _dev_list;

diff --git a/src/bin/e_device.h b/src/bin/e_device.h
deleted file mode 100644 (file)
index 6a9e725..0000000
--- a/src/bin/e_device.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef E_DEVICE_H
-#define E_DEVICE_H
-
-#include <glib-object.h>
-#include <Ecore.h>
-
-G_BEGIN_DECLS
-
-#define TYPE_E_DEVICE e_device_get_type()
-G_DECLARE_DERIVABLE_TYPE(E_Device, e_device, E, DEVICE, GObject)
-
-struct _E_DeviceClass {
-    GObjectClass parent_class;
-};
-
-E_Device *
-e_device_new(void);
-
-void
-e_device_name_set(E_Device *dev, const char *name);
-
-const gchar *
-e_device_name_get(const E_Device *dev);
-
-void
-e_device_class_set(E_Device *dev, Ecore_Device_Class device_class);
-
-Ecore_Device_Class
-e_device_class_get(const E_Device *dev);
-
-void
-e_device_subclass_set(E_Device *dev, Ecore_Device_Subclass subclass);
-
-Ecore_Device_Subclass
-e_device_subclass_get(const E_Device *dev);
-
-void e_device_identifier_set(E_Device *dev, const char *identifier);
-const gchar *e_device_identifier_get(const E_Device *dev);
-
-const GList *
-e_device_list_get(void);
-
-G_END_DECLS
-
-#endif /* end of include guard: E_DEVICE_H */

diff --git a/src/bin/e_device_intern.h b/src/bin/e_device_intern.h
new file mode 100644 (file)
index 0000000..4e4e503
--- /dev/null
+++ b/src/bin/e_device_intern.h
@@ -0,0 +1,29 @@
+#ifndef E_DEVICE_INTERN_H
+#define E_DEVICE_INTERN_H
+
+#include <glib-object.h>
+#include <Ecore.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_E_DEVICE e_device_get_type()
+G_DECLARE_DERIVABLE_TYPE(E_Device, e_device, E, DEVICE, GObject)
+
+struct _E_DeviceClass {
+    GObjectClass parent_class;
+};
+
+EINTERN E_Device             *e_device_new(void);
+EINTERN void                  e_device_name_set(E_Device *dev, const char *name);
+EINTERN const gchar          *e_device_name_get(const E_Device *dev);
+EINTERN void                  e_device_class_set(E_Device *dev, Ecore_Device_Class device_class);
+EINTERN Ecore_Device_Class    e_device_class_get(const E_Device *dev);
+EINTERN void                  e_device_subclass_set(E_Device *dev, Ecore_Device_Subclass subclass);
+EINTERN Ecore_Device_Subclass e_device_subclass_get(const E_Device *dev);
+EINTERN void                  e_device_identifier_set(E_Device *dev, const char *identifier);
+EINTERN const gchar          *e_device_identifier_get(const E_Device *dev);
+EINTERN const GList          *e_device_list_get(void);
+
+G_END_DECLS
+
+#endif /* end of include guard: E_DEVICE_INTERN_H */

diff --git a/src/bin/e_input_evdev.c b/src/bin/e_input_evdev.c
index b2d7af8..caa3602 100644 (file)
--- a/src/bin/e_input_evdev.c
+++ b/src/bin/e_input_evdev.c
@@ -1,7 +1,7 @@
 #include "e.h"
 #include "e_input_intern.h"
 #include "e_input_private.h"
-#include "e_device.h"
+#include "e_device_intern.h"
 #include "e_keyrouter_private.h"
 #include "e_input_event.h"
 #include "e_devicemgr.h"

diff --git a/src/bin/e_input_intern.h b/src/bin/e_input_intern.h
index 002d3c5..abce807 100644 (file)
--- a/src/bin/e_input_intern.h
+++ b/src/bin/e_input_intern.h
@@ -1,7 +1,7 @@
 #ifndef E_INPUT_INTERN_H
 #define E_INPUT_INTERN_H
 
-#include "e_device.h"
+#include "e_device_intern.h"
 
 EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
 EINTERN extern int E_EVENT_INPUT_ENABLED;

diff --git a/src/bin/e_input_private.h b/src/bin/e_input_private.h
index 8d0a526..a0b0f44 100644 (file)
--- a/src/bin/e_input_private.h
+++ b/src/bin/e_input_private.h
@@ -7,7 +7,7 @@
 
 #include "e.h"
 #include "e_input.h"
-#include "e_device.h"
+#include "e_device_intern.h"
 #include "e_input_event.h"
 #include <libinput.h>
 #include <Eeze.h>

diff --git a/src/bin/e_keyrouter_private.h b/src/bin/e_keyrouter_private.h
index 62717ec..6b9fd39 100644 (file)
--- a/src/bin/e_keyrouter_private.h
+++ b/src/bin/e_keyrouter_private.h
@@ -1,7 +1,7 @@
 #include "e.h"
 #include "e_keyrouter.h"
 #include "e_input_event.h"
-#include "e_device.h"
+#include "e_device_intern.h"
 
 #ifdef HAVE_CYNARA
 #include <cynara-session.h>