From 2bddf709c7433a69a9d861545780c75ffe4b4e21 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 16 Feb 2016 14:00:46 +0000
Subject: [PATCH] Ecore poller: Fix Eolian warnings.

This includes either migrating types to eolian, fixing namespace or
importing extra types.
---
 src/lib/ecore/Ecore_Common.h  | 37 -----------------------------------
 src/lib/ecore/Ecore_Legacy.h  |  4 ++--
 src/lib/ecore/ecore_poller.eo |  9 ++++++++-
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 8e704ca143..fe2c5c9012 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2587,43 +2587,6 @@ EAPI double ecore_throttle_get(void);
  * @{
  */
 
-/**
- * @enum _Ecore_Poller_Type
- * Defines the frequency of ticks for the poller.
- */
-enum _Ecore_Poller_Type    /* Poller types */
-{
-   ECORE_POLLER_CORE = 0 /**< The core poller interval */
-};
-typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
-
-/*
- * @since 1.8
- */
-
-typedef Eo    Ecore_Poller; /**< A handle for pollers */
-
-#define _ECORE_POLLER_EO_CLASS_TYPE
-
-/**
- * @brief Sets the time(in seconds) between ticks for the given poller type.
- * @param type The poller type to adjust.
- * @param poll_time The time(in seconds) between ticks of the timer.
- *
- * This will adjust the time between ticks of the given timer type defined by
- * @p type to the time period defined by @p poll_time.
- */
-EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
-
-/**
- * @brief Gets the time(in seconds) between ticks for the given poller type.
- * @param type The poller type to query.
- * @return The time in seconds between ticks of the poller timer.
- *
- * This will get the time between ticks of the specified poller timer.
- */
-EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
-
 /**
  * @}
  */
diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h
index b457b9713c..90d52482ef 100644
--- a/src/lib/ecore/Ecore_Legacy.h
+++ b/src/lib/ecore/Ecore_Legacy.h
@@ -8,6 +8,8 @@ extern "C" {
  * @{
  */
 
+#include "ecore_poller.eo.legacy.h"
+
 /**
  * @brief Creates a poller to call the given function at a particular tick interval.
  * @param type The ticker type to attach the poller to. Must be ECORE_POLLER_CORE.
@@ -46,8 +48,6 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_
  */
 EAPI void *ecore_poller_del(Ecore_Poller *poller);
 
-#include "ecore_poller.eo.legacy.h"
-
 /**
  * @}
  */
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index 4dad5845ad..0c647bb6b6 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -1,5 +1,12 @@
 type @extern Ecore_Task_Cb: __undefined_type;
 
+enum Ecore.Poller_Type
+{
+   [[Defines the frequency of ticks for the poller.]]
+   legacy: ecore_poller;
+   core = 0 [[The core poller interval]]
+}
+
 class Ecore.Poller (Eo.Base)
 {
    methods {
@@ -7,7 +14,7 @@ class Ecore.Poller (Eo.Base)
          [[Constructor with parameters for Ecore Poller.]]
          legacy: null;
          params {
-            @in type: Ecore_Poller_Type;
+            @in type: Ecore.Poller_Type;
             @in interval: int;
             @in func: Ecore_Task_Cb;
             @in data: const(void)*;