Elementary migration revision 69448

[framework/uifw/elementary.git] / src / bin / test_factory.c

diff --git a/src/bin/test_factory.c b/src/bin/test_factory.c
index 0c8cd18..d7f98a7 100644 (file)
--- a/src/bin/test_factory.c
+++ b/src/bin/test_factory.c
@@ -28,11 +28,7 @@ fac_realize_end(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    int i;
 
    bx = elm_box_add(win);
-<<<<<<< HEAD
-   printf("   ADD lv 3 = %p [%i]\n", bx, (BLOK * (int)evas_object_data_get(obj, "num")));
-=======
    printf("   ADD lv 3 = %p [%i]\n", bx, (BLOK * (int)(long)evas_object_data_get(obj, "num")));
->>>>>>> remotes/origin/upstream
 #ifdef HOMOG
    elm_box_homogeneous_set(bx, EINA_TRUE);
 #endif
@@ -45,11 +41,7 @@ fac_realize_end(void *data, Evas_Object *obj, void *event_info __UNUSED__)
         char buf[32];
 
         snprintf(buf, sizeof(buf), "%i",
-<<<<<<< HEAD
-                 (i + (BLOK * (int)evas_object_data_get(obj, "num"))));
-=======
                  (i + (BLOK * (int)(long)evas_object_data_get(obj, "num"))));
->>>>>>> remotes/origin/upstream
 
         bt = elm_button_add(win);
         evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -71,11 +63,7 @@ fac_realize2(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    int i;
 
    bx = elm_box_add(win);
-<<<<<<< HEAD
-   printf("  ADD lv 2 = %p [%i]\n", bx, (BLOK * (int)evas_object_data_get(obj, "num")));
-=======
    printf("  ADD lv 2 = %p [%i]\n", bx, (BLOK * (int)(long)evas_object_data_get(obj, "num")));
->>>>>>> remotes/origin/upstream
 #ifdef HOMOG
    elm_box_homogeneous_set(bx, EINA_TRUE);
 #endif
@@ -91,11 +79,7 @@ fac_realize2(void *data, Evas_Object *obj, void *event_info __UNUSED__)
         // scrollbar will be wrong until enough
         // children have been realized and the
         // real size is known
-<<<<<<< HEAD
-        evas_object_data_set(fc, "num", (void *)(i + (BLOK * (int)evas_object_data_get(obj, "num"))));
-=======
         evas_object_data_set(fc, "num", (void *)(long)(i + (BLOK * (int)(long)evas_object_data_get(obj, "num"))));
->>>>>>> remotes/origin/upstream
         evas_object_size_hint_min_set(fc, 0, DEFSZ);
         evas_object_size_hint_weight_set(fc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(fc, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -117,11 +101,7 @@ fac_realize1(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    int i;
 
    bx = elm_box_add(win);
-<<<<<<< HEAD
-   printf(" ADD lv 1 = %p [%i]\n", bx, (BLOK * (int)evas_object_data_get(obj, "num")));
-=======
    printf(" ADD lv 1 = %p [%i]\n", bx, (BLOK * (int)(long)evas_object_data_get(obj, "num")));
->>>>>>> remotes/origin/upstream
 #ifdef HOMOG
    elm_box_homogeneous_set(bx, EINA_TRUE);
 #endif
@@ -137,11 +117,7 @@ fac_realize1(void *data, Evas_Object *obj, void *event_info __UNUSED__)
         // scrollbar will be wrong until enough
         // children have been realized and the
         // real size is known
-<<<<<<< HEAD
-        evas_object_data_set(fc, "num", (void *)(i + (BLOK * (int)evas_object_data_get(obj, "num"))));
-=======
         evas_object_data_set(fc, "num", (void *)(long)(i + (BLOK * (int)(long)evas_object_data_get(obj, "num"))));
->>>>>>> remotes/origin/upstream
         evas_object_size_hint_min_set(fc, 0, DEFSZ);
         evas_object_size_hint_weight_set(fc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(fc, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -187,11 +163,7 @@ test_factory(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
         // scrollbar will be wrong until enough
         // children have been realized and the
         // real size is known
-<<<<<<< HEAD
-        evas_object_data_set(fc, "num", (void *)i);
-=======
         evas_object_data_set(fc, "num", (void *)(long)i);
->>>>>>> remotes/origin/upstream
         evas_object_size_hint_min_set(fc, 0, DEFSZ);
         evas_object_size_hint_weight_set(fc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(fc, EVAS_HINT_FILL, EVAS_HINT_FILL);