Merge "[copy&paste] add interface for OSP"

[framework/uifw/elementary.git] / src / lib / elm_clock.c

diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 55451a4..3bd0b2d 100644 (file)
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -1,10 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-<<<<<<< HEAD
-=======
 #define DEFAULT_FIRST_INTERVAL 0.85
->>>>>>> remotes/origin/upstream
 typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
@@ -14,11 +11,7 @@ struct _Widget_Data
    Eina_Bool seconds : 1;
    Eina_Bool am_pm : 1;
    Eina_Bool edit : 1;
-<<<<<<< HEAD
-   Elm_Clock_Digedit digedit;
-=======
    Elm_Clock_Edit_Mode digedit;
->>>>>>> remotes/origin/upstream
    int hrs, min, sec, timediff;
    Evas_Object *digit[6];
    Evas_Object *ampm;
@@ -31,11 +24,7 @@ struct _Widget_Data
       Eina_Bool seconds : 1;
       Eina_Bool am_pm : 1;
       Eina_Bool edit : 1;
-<<<<<<< HEAD
-      Elm_Clock_Digedit digedit;
-=======
       Elm_Clock_Edit_Mode digedit;
->>>>>>> remotes/origin/upstream
    } cur;
 };
 
@@ -553,13 +542,8 @@ elm_clock_add(Evas_Object *parent)
    wd->cur.seconds = EINA_TRUE;
    wd->cur.am_pm = EINA_TRUE;
    wd->cur.edit = EINA_TRUE;
-<<<<<<< HEAD
-   wd->cur.digedit = ELM_CLOCK_NONE;
-   wd->first_interval = 0.85;
-=======
    wd->cur.digedit = ELM_CLOCK_EDIT_DEFAULT;
    wd->first_interval = DEFAULT_FIRST_INTERVAL;
->>>>>>> remotes/origin/upstream
    wd->timediff = 0;
 
    _time_update(obj);
@@ -603,13 +587,8 @@ elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit)
    wd->edit = edit;
    if (!edit)
      _timediff_set(wd);
-<<<<<<< HEAD
-   if ((edit) && (wd->digedit == ELM_CLOCK_NONE))
-     elm_clock_digit_edit_set(obj, ELM_CLOCK_ALL);
-=======
    if ((edit) && (wd->digedit == ELM_CLOCK_EDIT_DEFAULT))
      elm_clock_edit_mode_set(obj, ELM_CLOCK_EDIT_ALL);
->>>>>>> remotes/origin/upstream
    else
      _time_update(obj);
 }
@@ -624,33 +603,20 @@ elm_clock_edit_get(const Evas_Object *obj)
 }
 
 EAPI void
-<<<<<<< HEAD
-elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit)
-=======
 elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit)
->>>>>>> remotes/origin/upstream
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    wd->digedit = digedit;
-<<<<<<< HEAD
-   if (digedit == ELM_CLOCK_NONE)
-=======
    if (digedit == ELM_CLOCK_EDIT_DEFAULT)
->>>>>>> remotes/origin/upstream
      elm_clock_edit_set(obj, EINA_FALSE);
    else
      _time_update(obj);
 }
 
-<<<<<<< HEAD
-EAPI Elm_Clock_Digedit
-elm_clock_digit_edit_get(const Evas_Object *obj)
-=======
 EAPI Elm_Clock_Edit_Mode
 elm_clock_edit_mode_get(const Evas_Object *obj)
->>>>>>> remotes/origin/upstream
 {
    ELM_CHECK_WIDTYPE(obj, widtype) 0;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -664,11 +630,7 @@ elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-<<<<<<< HEAD
-   wd->am_pm = am_pm;
-=======
    wd->am_pm = !!am_pm;
->>>>>>> remotes/origin/upstream
    _time_update(obj);
 }
 
@@ -687,11 +649,7 @@ elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-<<<<<<< HEAD
-   wd->seconds = seconds;
-=======
    wd->seconds = !!seconds;
->>>>>>> remotes/origin/upstream
    _time_update(obj);
 }
 
@@ -705,28 +663,16 @@ elm_clock_show_seconds_get(const Evas_Object *obj)
 }
 
 EAPI void
-<<<<<<< HEAD
-elm_clock_interval_set(Evas_Object *obj, double interval)
-=======
 elm_clock_first_interval_set(Evas_Object *obj, double interval)
->>>>>>> remotes/origin/upstream
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-<<<<<<< HEAD
-   wd->first_interval = interval;
-}
-
-EAPI double
-elm_clock_interval_get(const Evas_Object *obj)
-=======
    wd->first_interval = !!interval;
 }
 
 EAPI double
 elm_clock_first_interval_get(const Evas_Object *obj)
->>>>>>> remotes/origin/upstream
 {
    ELM_CHECK_WIDTYPE(obj, widtype) 0.0;
    Widget_Data *wd = elm_widget_data_get(obj);