summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-03 14:26:06 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-10 10:08:09 +0200
commit8aea9f88c3a36d6475ff3580fb7e95324dc4f2e1 (patch)
tree20432ab507a32ff3b0fdfa0c46ba28ea2d95c478
parent750dd34ae89fced237daf5ecb8ad8aa62a6b3f65 (diff)
fix warning
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c38
1 files changed, 22 insertions, 16 deletions
diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index 95cec93a0e..c945773515 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -299,7 +299,7 @@ if (!index)
299 insert->item.model = efl_ref(child); 299 insert->item.model = efl_ref(child);
300 } 300 }
301 else 301 else
302 ERR("Inserting a model that was already fetched, dropping new model %d", search_index); 302 ERR("Inserting a model that was already fetched, dropping new model %lu", search_index);
303 303
304 } 304 }
305 else 305 else
@@ -776,7 +776,7 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
776 Efl_Model *parent; 776 Efl_Model *parent;
777 Eina_List *requests = NULL; 777 Eina_List *requests = NULL;
778 Eina_Size2D item_base; 778 Eina_Size2D item_base;
779 unsigned int i, count, limit; 779 unsigned int limit;
780 unsigned int idx = 0; 780 unsigned int idx = 0;
781 781
782 // get the approximate value from the tree node 782 // get the approximate value from the tree node
@@ -789,7 +789,7 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
789 pd->last_base = item_base; 789 pd->last_base = item_base;
790 790
791 sizes = memory.mem; 791 sizes = memory.mem;
792 count = efl_model_children_count_get(parent); 792 //count = efl_model_children_count_get(parent);
793 limit = conf.range.end_id - conf.range.start_id; 793 limit = conf.range.end_id - conf.range.start_id;
794// printf("batch_size %u, %d\n", limit, start_id); 794// printf("batch_size %u, %d\n", limit, start_id);
795 795
@@ -927,14 +927,14 @@ _batch_entity_cb(void *data, Efl_Ui_Position_Manager_Request_Range range, Eina_R
927 Efl_Ui_Collection_Request *request = NULL; 927 Efl_Ui_Collection_Request *request = NULL;
928 Efl_Ui_Position_Manager_Object_Batch_Result result = {0}; 928 Efl_Ui_Position_Manager_Object_Batch_Result result = {0};
929 Eina_List *requests = NULL; 929 Eina_List *requests = NULL;
930 Efl_Model *parent; 930 //Efl_Model *parent;
931 unsigned int i, count, limit; 931 unsigned int limit;
932 unsigned int idx = 0; 932 unsigned int idx = 0;
933 933
934 parent = pd->model; 934 //parent = pd->model;
935 935
936 entities = memory.mem; 936 entities = memory.mem;
937 count = efl_model_children_count_get(parent); 937 //count = efl_model_children_count_get(parent);
938 limit = range.end_id - range.start_id;; 938 limit = range.end_id - range.start_id;;
939 939
940 // Look in the temporary cache now for the beginning of the buffer 940 // Look in the temporary cache now for the beginning of the buffer
@@ -1018,11 +1018,14 @@ _batch_entity_cb(void *data, Efl_Ui_Position_Manager_Request_Range range, Eina_R
1018 return result; 1018 return result;
1019} 1019}
1020 1020
1021
1022#if 0
1021static void 1023static void
1022_batch_free_cb(void *data) 1024_batch_free_cb(void *data)
1023{ 1025{
1024 efl_unref(data); 1026 efl_unref(data);
1025} 1027}
1028#endif
1026 1029
1027static void 1030static void
1028flush_min_size(Eo *obj, Efl_Ui_Collection_View_Data *pd) 1031flush_min_size(Eo *obj, Efl_Ui_Collection_View_Data *pd)
@@ -1058,6 +1061,7 @@ _manager_content_min_size_changed_cb(void *data, const Efl_Event *ev)
1058 flush_min_size(data, pd); 1061 flush_min_size(data, pd);
1059} 1062}
1060 1063
1064#if 0
1061static Eina_List * 1065static Eina_List *
1062_viewport_walk_fill(Eina_List *requests, 1066_viewport_walk_fill(Eina_List *requests,
1063 Efl_Ui_Collection_View *obj EINA_UNUSED, 1067 Efl_Ui_Collection_View *obj EINA_UNUSED,
@@ -1101,8 +1105,10 @@ _viewport_walk_fill(Eina_List *requests,
1101 return requests; 1105 return requests;
1102} 1106}
1103 1107
1108#endif
1109
1104static void 1110static void
1105_remove_data(Eo *obj, Efl_Ui_Collection_View_Data *pd, uint64_t remove_index) 1111_remove_data(Eo *obj EINA_UNUSED, Efl_Ui_Collection_View_Data *pd, uint64_t remove_index)
1106{ 1112{
1107 Efl_Ui_Collection_Item_Lookup *lookup; 1113 Efl_Ui_Collection_Item_Lookup *lookup;
1108 1114
@@ -1529,8 +1535,8 @@ _efl_model_child_added(void *data, const Efl_Event *event)
1529 // At the moment model only append child, but let's try to handle it theorically correct 1535 // At the moment model only append child, but let's try to handle it theorically correct
1530 Efl_Model_Children_Event *ev = event->info; 1536 Efl_Model_Children_Event *ev = event->info;
1531 MY_DATA_GET(data, pd); 1537 MY_DATA_GET(data, pd);
1532 Eina_List *requests = NULL; 1538 //Eina_List *requests = NULL;
1533 unsigned int i; 1539 //unsigned int i;
1534 1540
1535 _cache_cleanup(pd); 1541 _cache_cleanup(pd);
1536 1542
@@ -1586,7 +1592,7 @@ _efl_model_child_added(void *data, const Efl_Event *event)
1586 break; 1592 break;
1587 }*/ 1593 }*/
1588 1594
1589 notify_manager: 1595// notify_manager:
1590 efl_ui_position_manager_entity_item_added(pd->manager, ev->index, NULL); 1596 efl_ui_position_manager_entity_item_added(pd->manager, ev->index, NULL);
1591} 1597}
1592 1598
@@ -1595,8 +1601,8 @@ _efl_model_child_removed(void *data, const Efl_Event *event)
1595{ 1601{
1596 Efl_Model_Children_Event *ev = event->info; 1602 Efl_Model_Children_Event *ev = event->info;
1597 MY_DATA_GET(data, pd); 1603 MY_DATA_GET(data, pd);
1598 Eina_List *requests = NULL; 1604 //Eina_List *requests = NULL;
1599 unsigned int i; 1605 //unsigned int i;
1600 1606
1601 _cache_cleanup(pd); 1607 _cache_cleanup(pd);
1602 1608
@@ -1653,7 +1659,7 @@ _efl_model_child_removed(void *data, const Efl_Event *event)
1653 break; 1659 break;
1654 }*/ 1660 }*/
1655 1661
1656 notify_manager: 1662 //notify_manager:
1657 efl_ui_position_manager_entity_item_removed(pd->manager, ev->index, NULL); 1663 efl_ui_position_manager_entity_item_removed(pd->manager, ev->index, NULL);
1658} 1664}
1659 1665
@@ -1672,7 +1678,7 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
1672 Eina_Iterator *it; 1678 Eina_Iterator *it;
1673 const char *property; 1679 const char *property;
1674 Efl_Model *model = NULL; 1680 Efl_Model *model = NULL;
1675 unsigned int i, count; 1681 unsigned int count;
1676 Eina_Bool selection = EINA_FALSE, sizing = EINA_FALSE; 1682 Eina_Bool selection = EINA_FALSE, sizing = EINA_FALSE;
1677 1683
1678 if (ev->previous) efl_event_callback_array_del(ev->previous, model_cbs(), data); 1684 if (ev->previous) efl_event_callback_array_del(ev->previous, model_cbs(), data);
@@ -2052,7 +2058,7 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_request_move(Eo *obj,
2052 } 2058 }
2053 else 2059 else
2054 { 2060 {
2055 unsigned int i; 2061 //unsigned int i;
2056 2062
2057/* for (i = 0; i < 3; i++) 2063/* for (i = 0; i < 3; i++)
2058 { 2064 {