summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-12-12 17:13:30 -0800
committerCedric BAIL <cedric.bail@free.fr>2019-12-18 10:33:09 -0800
commit52aa2f629f9e63c22d9fa641daf30f9ff8f957ee (patch)
tree3f31a32dbf96c047d38f14d432ca2d9aff7e2a99
parentdef04c933cb6887714cff6936f280abaafa72188 (diff)
efl: make sure all index for Efl_Model are unsigned int.
T8469 Reviewed-by: SangHyeon Jade Lee <sh10233.lee@samsung.com> Differential Revision: https://phab.enlightenment.org/D10869
-rw-r--r--src/lib/ecore/efl_boolean_model.c6
-rw-r--r--src/lib/ecore/efl_filter_model.c24
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c94
-rw-r--r--src/tests/elementary/efl_ui_test_select_model.c2
4 files changed, 63 insertions, 63 deletions
diff --git a/src/lib/ecore/efl_boolean_model.c b/src/lib/ecore/efl_boolean_model.c
index 552baf1096..9e61ce398d 100644
--- a/src/lib/ecore/efl_boolean_model.c
+++ b/src/lib/ecore/efl_boolean_model.c
@@ -406,8 +406,8 @@ struct _Eina_Iterator_Boolean
406 Efl_Boolean_Model_Storage_Range *sr; 406 Efl_Boolean_Model_Storage_Range *sr;
407 Eina_Iterator *infix; 407 Eina_Iterator *infix;
408 408
409 uint64_t index; 409 unsigned int index;
410 uint64_t total; 410 unsigned int total;
411 411
412 Eina_Bool request; 412 Eina_Bool request;
413}; 413};
@@ -423,7 +423,7 @@ _efl_boolean_model_iterator_storage_index_find(Eina_Iterator_Boolean *it)
423 423
424 while (offset < it->sr->length) 424 while (offset < it->sr->length)
425 { 425 {
426 uint64_t upidx; 426 unsigned int upidx;
427 427
428 upidx = offset >> 3; 428 upidx = offset >> 3;
429 429
diff --git a/src/lib/ecore/efl_filter_model.c b/src/lib/ecore/efl_filter_model.c
index a382b7bd92..cc18dca89b 100644
--- a/src/lib/ecore/efl_filter_model.c
+++ b/src/lib/ecore/efl_filter_model.c
@@ -11,8 +11,8 @@ struct _Efl_Filter_Model_Mapping
11{ 11{
12 EINA_RBTREE; 12 EINA_RBTREE;
13 13
14 uint64_t original; 14 unsigned int original;
15 uint64_t mapped; 15 unsigned int mapped;
16 16
17 EINA_REFCOUNT; 17 EINA_REFCOUNT;
18}; 18};
@@ -28,10 +28,10 @@ struct _Efl_Filter_Model_Data
28 void *data; 28 void *data;
29 EflFilterModel cb; 29 EflFilterModel cb;
30 Eina_Free_Cb free_cb; 30 Eina_Free_Cb free_cb;
31 uint64_t count; 31 unsigned int count;
32 } filter; 32 } filter;
33 33
34 uint64_t counted; 34 unsigned int counted;
35 Eina_Bool counting_started : 1; 35 Eina_Bool counting_started : 1;
36 Eina_Bool processed : 1; 36 Eina_Bool processed : 1;
37}; 37};
@@ -54,7 +54,7 @@ _filter_mapping_looking_cb(const Eina_Rbtree *node, const void *key,
54 int length EINA_UNUSED, void *data EINA_UNUSED) 54 int length EINA_UNUSED, void *data EINA_UNUSED)
55{ 55{
56 const Efl_Filter_Model_Mapping *n = (const Efl_Filter_Model_Mapping *) node; 56 const Efl_Filter_Model_Mapping *n = (const Efl_Filter_Model_Mapping *) node;
57 const uint64_t *k = key; 57 const unsigned int *k = key;
58 58
59 return n->mapped - *k; 59 return n->mapped - *k;
60} 60}
@@ -85,7 +85,7 @@ struct _Efl_Filter_Request
85 Efl_Filter_Model_Data *pd; 85 Efl_Filter_Model_Data *pd;
86 Efl_Model *parent; 86 Efl_Model *parent;
87 Efl_Model *child; 87 Efl_Model *child;
88 uint64_t index; 88 unsigned int index;
89}; 89};
90 90
91static Efl_Filter_Model * 91static Efl_Filter_Model *
@@ -243,7 +243,7 @@ _efl_filter_model_child_removed(void *data, const Efl_Event *event)
243 Efl_Filter_Model_Mapping *mapping; 243 Efl_Filter_Model_Mapping *mapping;
244 Efl_Filter_Model_Data *pd = data; 244 Efl_Filter_Model_Data *pd = data;
245 Efl_Model_Children_Event *ev = event->info; 245 Efl_Model_Children_Event *ev = event->info;
246 uint64_t removed = ev->index; 246 unsigned int removed = ev->index;
247 247
248 mapping = (void *)eina_rbtree_inline_lookup(pd->mapping, 248 mapping = (void *)eina_rbtree_inline_lookup(pd->mapping,
249 &removed, sizeof (uint64_t), 249 &removed, sizeof (uint64_t),
@@ -370,10 +370,10 @@ _efl_filter_model_efl_model_children_slice_get(Eo *obj, Efl_Filter_Model_Data *p
370 370
371 for (i = 0; i < count; i++) 371 for (i = 0; i < count; i++)
372 { 372 {
373 uint64_t lookup = start + i; 373 unsigned int lookup = start + i;
374 374
375 mapping[i] = (void *)eina_rbtree_inline_lookup(pd->mapping, 375 mapping[i] = (void *)eina_rbtree_inline_lookup(pd->mapping,
376 &lookup, sizeof (uint64_t), 376 &lookup, sizeof (unsigned int),
377 _filter_mapping_looking_cb, NULL); 377 _filter_mapping_looking_cb, NULL);
378 if (!mapping[i]) goto on_error; 378 if (!mapping[i]) goto on_error;
379 } 379 }
@@ -410,7 +410,7 @@ typedef struct _Efl_Filter_Model_Result Efl_Filter_Model_Result;
410struct _Efl_Filter_Model_Result 410struct _Efl_Filter_Model_Result
411{ 411{
412 Efl_Filter_Model_Data *pd; 412 Efl_Filter_Model_Data *pd;
413 uint64_t count; 413 unsigned int count;
414 Efl_Model *targets[1]; 414 Efl_Model *targets[1];
415}; 415};
416 416
@@ -422,7 +422,7 @@ _efl_filter_model_array_result_request(Eo *o EINA_UNUSED, void *data, const Eina
422 Efl_Filter_Model_Data *pd = req->pd; 422 Efl_Filter_Model_Data *pd = req->pd;
423 unsigned int i, len; 423 unsigned int i, len;
424 Eina_Value request = EINA_VALUE_EMPTY; 424 Eina_Value request = EINA_VALUE_EMPTY;
425 uint64_t pcount = pd->filter.count; 425 unsigned int pcount = pd->filter.count;
426 426
427 EINA_VALUE_ARRAY_FOREACH(&v, len, i, request) 427 EINA_VALUE_ARRAY_FOREACH(&v, len, i, request)
428 { 428 {
@@ -465,7 +465,7 @@ static void
465_efl_filter_model_array_result_free(Eo *o EINA_UNUSED, void *data, const Eina_Future *dead_future EINA_UNUSED) 465_efl_filter_model_array_result_free(Eo *o EINA_UNUSED, void *data, const Eina_Future *dead_future EINA_UNUSED)
466{ 466{
467 Efl_Filter_Model_Result *req = data; 467 Efl_Filter_Model_Result *req = data;
468 uint64_t i; 468 unsigned int i;
469 469
470 for (i = 0; i < req->count; i++) 470 for (i = 0; i < req->count; i++)
471 efl_unref(req->targets[i]); 471 efl_unref(req->targets[i]);
diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index 2598849f36..75210982ce 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -38,7 +38,7 @@ struct _Efl_Ui_Collection_Item_Lookup
38{ 38{
39 EINA_RBTREE; 39 EINA_RBTREE;
40 40
41 uint64_t index; 41 unsigned int index;
42 Efl_Ui_Collection_Item item; 42 Efl_Ui_Collection_Item item;
43}; 43};
44 44
@@ -46,7 +46,7 @@ struct _Efl_Ui_Collection_Viewport
46{ 46{
47 Efl_Ui_Collection_Item *items; 47 Efl_Ui_Collection_Item *items;
48 48
49 uint64_t offset; 49 unsigned int offset;
50 uint16_t count; 50 uint16_t count;
51}; 51};
52 52
@@ -54,8 +54,8 @@ struct _Efl_Ui_Collection_Request
54{ 54{
55 Eina_Future *f; 55 Eina_Future *f;
56 56
57 uint64_t offset; 57 unsigned int offset;
58 uint64_t length; 58 unsigned int length;
59 59
60 Eina_Bool need_size : 1; 60 Eina_Bool need_size : 1;
61 Eina_Bool need_entity : 1; 61 Eina_Bool need_entity : 1;
@@ -79,8 +79,8 @@ struct _Efl_Ui_Collection_View_Data
79 79
80 Eina_List *requests; // Array of Efl_Ui_Collection_Request in progress 80 Eina_List *requests; // Array of Efl_Ui_Collection_Request in progress
81 81
82 uint64_t start_id; 82 unsigned int start_id;
83 uint64_t end_id; 83 unsigned int end_id;
84 84
85 Eina_Size2D content_min_size; 85 Eina_Size2D content_min_size;
86 86
@@ -116,7 +116,7 @@ _cache_tree_lookup(const Eina_Rbtree *node, const void *key,
116 int length EINA_UNUSED, void *data EINA_UNUSED) 116 int length EINA_UNUSED, void *data EINA_UNUSED)
117{ 117{
118 const Efl_Ui_Collection_Item_Lookup *n = (Efl_Ui_Collection_Item_Lookup *)node; 118 const Efl_Ui_Collection_Item_Lookup *n = (Efl_Ui_Collection_Item_Lookup *)node;
119 const uint64_t *index = key; 119 const unsigned int *index = key;
120 120
121 if (n->index > *index) 121 if (n->index > *index)
122 return 1; 122 return 1;
@@ -344,7 +344,7 @@ _size_to_model(Efl_Model *model, Eina_Size2D state)
344 344
345static Eina_List * 345static Eina_List *
346_request_add(Eina_List *requests, Efl_Ui_Collection_Request **request, 346_request_add(Eina_List *requests, Efl_Ui_Collection_Request **request,
347 uint64_t index, Eina_Bool need_entity) 347 unsigned int index, Eina_Bool need_entity)
348{ 348{
349 if (!(*request)) goto create; 349 if (!(*request)) goto create;
350 350
@@ -393,7 +393,7 @@ _model_fetched_cb(Eo *obj, void *data, const Eina_Value v)
393 if ((pd->viewport[v]->offset <= request->offset + i) && 393 if ((pd->viewport[v]->offset <= request->offset + i) &&
394 (request->offset + i < pd->viewport[v]->offset + pd->viewport[v]->count)) 394 (request->offset + i < pd->viewport[v]->offset + pd->viewport[v]->count))
395 { 395 {
396 uint64_t index = request->offset + i - pd->viewport[v]->offset; 396 unsigned int index = request->offset + i - pd->viewport[v]->offset;
397 397
398 efl_replace(&pd->viewport[v]->items[index].model, child); 398 efl_replace(&pd->viewport[v]->items[index].model, child);
399 child = NULL; 399 child = NULL;
@@ -405,7 +405,7 @@ _model_fetched_cb(Eo *obj, void *data, const Eina_Value v)
405 // When requesting a model, it should not be in the cache prior to the request 405 // When requesting a model, it should not be in the cache prior to the request
406 if (!child) continue; 406 if (!child) continue;
407 407
408 uint64_t search_index = request->offset + i; 408 unsigned int search_index = request->offset + i;
409 409
410 insert = (void*) eina_rbtree_inline_lookup(pd->cache, &search_index, 410 insert = (void*) eina_rbtree_inline_lookup(pd->cache, &search_index,
411 sizeof (search_index), _cache_tree_lookup, 411 sizeof (search_index), _cache_tree_lookup,
@@ -418,7 +418,7 @@ _model_fetched_cb(Eo *obj, void *data, const Eina_Value v)
418 efl_replace(&insert->item.model, child); 418 efl_replace(&insert->item.model, child);
419 } 419 }
420 else 420 else
421 ERR("Inserting a model that was already fetched, dropping new model %" PRIu64, search_index); 421 ERR("Inserting a model that was already fetched, dropping new model %u", search_index);
422 } 422 }
423 else 423 else
424 { 424 {
@@ -518,7 +518,7 @@ _entity_fetched_cb(Eo *obj, void *data, const Eina_Value v)
518 Efl_Ui_Collection_Request *request = data; 518 Efl_Ui_Collection_Request *request = data;
519 Efl_Gfx_Entity *child; 519 Efl_Gfx_Entity *child;
520 unsigned int i, len; 520 unsigned int i, len;
521 uint64_t updated_size_start_id = 0, updated_entity_start_id = 0; 521 unsigned int updated_size_start_id = 0, updated_entity_start_id = 0;
522 Eina_Bool updated_size = EINA_FALSE, updated_entity = EINA_FALSE; 522 Eina_Bool updated_size = EINA_FALSE, updated_entity = EINA_FALSE;
523 Evas *e; 523 Evas *e;
524 524
@@ -528,7 +528,7 @@ _entity_fetched_cb(Eo *obj, void *data, const Eina_Value v)
528 EINA_VALUE_ARRAY_FOREACH(&v, len, i, child) 528 EINA_VALUE_ARRAY_FOREACH(&v, len, i, child)
529 { 529 {
530 Efl_Ui_Collection_Item_Lookup *lookup; 530 Efl_Ui_Collection_Item_Lookup *lookup;
531 uint64_t search_index; 531 unsigned int search_index;
532 //unsigned int v; 532 //unsigned int v;
533 533
534 efl_key_data_set(child, COLLECTION_VIEW_MANAGED, COLLECTION_VIEW_MANAGED_YES); 534 efl_key_data_set(child, COLLECTION_VIEW_MANAGED, COLLECTION_VIEW_MANAGED_YES);
@@ -546,7 +546,7 @@ _entity_fetched_cb(Eo *obj, void *data, const Eina_Value v)
546 if ((pd->viewport[v]->offset <= request->offset + i) && 546 if ((pd->viewport[v]->offset <= request->offset + i) &&
547 (request->offset + i < pd->viewport[v]->offset + pd->viewport[v]->count)) 547 (request->offset + i < pd->viewport[v]->offset + pd->viewport[v]->count))
548 { 548 {
549 uint64_t index = request->offset + i - pd->viewport[v]->offset; 549 unsigned int index = request->offset + i - pd->viewport[v]->offset;
550 550
551 if (pd->viewport[v]->items[index].entity) 551 if (pd->viewport[v]->items[index].entity)
552 { 552 {
@@ -597,7 +597,7 @@ _entity_fetched_cb(Eo *obj, void *data, const Eina_Value v)
597 } 597 }
598 if (lookup->item.entity) 598 if (lookup->item.entity)
599 { 599 {
600 ERR("Entity already existing for id %" PRIu64, search_index); 600 ERR("Entity already existing for id %u", search_index);
601 _entity_cleanup(obj, pd->factory, &lookup->item, NULL); 601 _entity_cleanup(obj, pd->factory, &lookup->item, NULL);
602 } 602 }
603 603
@@ -670,7 +670,7 @@ _entity_free_cb(Eo *o, void *data, const Eina_Future *dead_future EINA_UNUSED)
670static Eina_List * 670static Eina_List *
671_cache_size_fetch(Eina_List *requests, Efl_Ui_Collection_Request **request, 671_cache_size_fetch(Eina_List *requests, Efl_Ui_Collection_Request **request,
672 Efl_Ui_Collection_View_Data *pd, 672 Efl_Ui_Collection_View_Data *pd,
673 uint64_t search_index, 673 unsigned int search_index,
674 Efl_Ui_Position_Manager_Size_Batch_Entity *target, 674 Efl_Ui_Position_Manager_Size_Batch_Entity *target,
675 Eina_Size2D item_base) 675 Eina_Size2D item_base)
676{ 676{
@@ -727,7 +727,7 @@ _cache_size_fetch(Eina_List *requests, Efl_Ui_Collection_Request **request,
727static Eina_List * 727static Eina_List *
728_cache_entity_fetch(Eina_List *requests, Efl_Ui_Collection_Request **request, 728_cache_entity_fetch(Eina_List *requests, Efl_Ui_Collection_Request **request,
729 Efl_Ui_Collection_View_Data *pd, 729 Efl_Ui_Collection_View_Data *pd,
730 uint64_t search_index, 730 unsigned int search_index,
731 Efl_Ui_Position_Manager_Object_Batch_Entity *target) 731 Efl_Ui_Position_Manager_Object_Batch_Entity *target)
732{ 732{
733 Efl_Ui_Collection_Item_Lookup *lookup; 733 Efl_Ui_Collection_Item_Lookup *lookup;
@@ -802,10 +802,10 @@ _batch_request_flush(Eina_List *requests,
802 802
803 EINA_LIST_FOREACH(pd->requests, l, inflight) 803 EINA_LIST_FOREACH(pd->requests, l, inflight)
804 { 804 {
805 uint64_t istart = inflight->offset; 805 unsigned int istart = inflight->offset;
806 uint64_t iend = inflight->offset + inflight->length; 806 unsigned int iend = inflight->offset + inflight->length;
807 uint64_t rstart = request->offset; 807 unsigned int rstart = request->offset;
808 uint64_t rend = request->offset + request->length; 808 unsigned int rend = request->offset + request->length;
809 809
810 // Way before 810 // Way before
811 if (rend < istart) continue; 811 if (rend < istart) continue;
@@ -923,11 +923,11 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
923 923
924 // Look in the temporary cache now for the beginning of the buffer 924 // Look in the temporary cache now for the beginning of the buffer
925#ifdef VIEWPORT_ENABLE 925#ifdef VIEWPORT_ENABLE
926 if (pd->viewport[0] && ((uint64_t)(conf.range.start_id + idx) < pd->viewport[0]->offset)) 926 if (pd->viewport[0] && ((unsigned int)(conf.range.start_id + idx) < pd->viewport[0]->offset))
927 { 927 {
928 while ((uint64_t)(conf.range.start_id + idx) < pd->viewport[0]->offset && idx < limit) 928 while ((unsigned int)(conf.range.start_id + idx) < pd->viewport[0]->offset && idx < limit)
929 { 929 {
930 uint64_t search_index = conf.range.start_id + idx; 930 unsigned int search_index = conf.range.start_id + idx;
931 requests = _cache_size_fetch(requests, &request, pd, 931 requests = _cache_size_fetch(requests, &request, pd,
932 search_index, &sizes[idx], item_base); 932 search_index, &sizes[idx], item_base);
933 idx++; 933 idx++;
@@ -943,7 +943,7 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
943 (pd->viewport[i]->offset <= conf.range.start_id + idx) && 943 (pd->viewport[i]->offset <= conf.range.start_id + idx) &&
944 (conf.range.start_id + idx < (pd->viewport[i]->offset + pd->viewport[i]->count))) 944 (conf.range.start_id + idx < (pd->viewport[i]->offset + pd->viewport[i]->count)))
945 { 945 {
946 uint64_t offset = conf.range.start_id + idx - pd->viewport[i]->offset; 946 unsigned int offset = conf.range.start_id + idx - pd->viewport[i]->offset;
947 Efl_Model *model = pd->viewport[i]->items[offset].model; 947 Efl_Model *model = pd->viewport[i]->items[offset].model;
948 Efl_Gfx_Entity *entity = pd->viewport[i]->items[offset].entity; 948 Efl_Gfx_Entity *entity = pd->viewport[i]->items[offset].entity;
949 Eina_Bool entity_request = EINA_FALSE; 949 Eina_Bool entity_request = EINA_FALSE;
@@ -999,7 +999,7 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
999 // Look in the temporary cache now for the end of the buffer 999 // Look in the temporary cache now for the end of the buffer
1000 while (idx < limit) 1000 while (idx < limit)
1001 { 1001 {
1002 uint64_t search_index = conf.range.start_id + idx; 1002 unsigned int search_index = conf.range.start_id + idx;
1003 requests = _cache_size_fetch(requests, &request, pd, 1003 requests = _cache_size_fetch(requests, &request, pd,
1004 search_index, &sizes[idx], item_base); 1004 search_index, &sizes[idx], item_base);
1005 idx++; 1005 idx++;
@@ -1022,7 +1022,7 @@ _batch_size_cb(void *data, Efl_Ui_Position_Manager_Size_Call_Config conf, Eina_R
1022 { 1022 {
1023 while (idx < limit) 1023 while (idx < limit)
1024 { 1024 {
1025 uint64_t search_index = conf.range.start_id + idx; 1025 unsigned int search_index = conf.range.start_id + idx;
1026 requests = _cache_size_fetch(requests, &request, pd, 1026 requests = _cache_size_fetch(requests, &request, pd,
1027 search_index, &sizes[idx], item_base); 1027 search_index, &sizes[idx], item_base);
1028 idx++; 1028 idx++;
@@ -1063,11 +1063,11 @@ _batch_entity_cb(void *data, Efl_Ui_Position_Manager_Request_Range range, Eina_R
1063 1063
1064 // Look in the temporary cache now for the beginning of the buffer 1064 // Look in the temporary cache now for the beginning of the buffer
1065#ifdef VIEWPORT_ENABLE 1065#ifdef VIEWPORT_ENABLE
1066 if (pd->viewport[0] && ((uint64_t)(range.start_id + idx) < pd->viewport[0]->offset)) 1066 if (pd->viewport[0] && ((unsigned int)(range.start_id + idx) < pd->viewport[0]->offset))
1067 { 1067 {
1068 while (idx < limit && (uint64_t)(range.start_id + idx) < pd->viewport[0]->offset) 1068 while (idx < limit && (unsigned int)(range.start_id + idx) < pd->viewport[0]->offset)
1069 { 1069 {
1070 uint64_t search_index = range.start_id + idx; 1070 unsigned int search_index = range.start_id + idx;
1071 1071
1072 requests = _cache_entity_fetch(requests, &request, pd, 1072 requests = _cache_entity_fetch(requests, &request, pd,
1073 search_index, &entities[idx]); 1073 search_index, &entities[idx]);
@@ -1085,7 +1085,7 @@ _batch_entity_cb(void *data, Efl_Ui_Position_Manager_Request_Range range, Eina_R
1085 (pd->viewport[i]->offset <= range.start_id + idx) && 1085 (pd->viewport[i]->offset <= range.start_id + idx) &&
1086 (range.start_id + idx < (pd->viewport[i]->offset + pd->viewport[i]->count))) 1086 (range.start_id + idx < (pd->viewport[i]->offset + pd->viewport[i]->count)))
1087 { 1087 {
1088 uint64_t offset = range.start_id + idx - pd->viewport[i]->offset; 1088 unsigned int offset = range.start_id + idx - pd->viewport[i]->offset;
1089 Efl_Gfx_Entity *entity = pd->viewport[i]->items[offset].entity; 1089 Efl_Gfx_Entity *entity = pd->viewport[i]->items[offset].entity;
1090 1090
1091 if (!entity) 1091 if (!entity)
@@ -1112,7 +1112,7 @@ _batch_entity_cb(void *data, Efl_Ui_Position_Manager_Request_Range range, Eina_R
1112 // Look in the temporary cache now for the end of the buffer 1112 // Look in the temporary cache now for the end of the buffer
1113 while (idx < limit) 1113 while (idx < limit)
1114 { 1114 {
1115 uint64_t search_index = range.start_id + idx; 1115 unsigned int search_index = range.start_id + idx;
1116 1116
1117 requests = _cache_entity_fetch(requests, &request, pd, 1117 requests = _cache_entity_fetch(requests, &request, pd,
1118 search_index, &entities[idx]); 1118 search_index, &entities[idx]);
@@ -1188,7 +1188,7 @@ _viewport_walk_fill(Eina_List *requests,
1188 for (j = 0; j < viewport->count; j++) 1188 for (j = 0; j < viewport->count; j++)
1189 { 1189 {
1190 Efl_Ui_Collection_Item_Lookup *lookup; 1190 Efl_Ui_Collection_Item_Lookup *lookup;
1191 uint64_t index = viewport->offset + j; 1191 unsigned int index = viewport->offset + j;
1192 1192
1193 if (viewport->items[j].model) goto check_entity; 1193 if (viewport->items[j].model) goto check_entity;
1194 1194
@@ -1320,7 +1320,7 @@ _manager_content_visible_range_changed_cb(void *data, const Efl_Event *ev)
1320 idx = lower_end; 1320 idx = lower_end;
1321 while (idx < upper_end) 1321 while (idx < upper_end)
1322 { 1322 {
1323 uint64_t search_index = idx; 1323 unsigned int search_index = idx;
1324 1324
1325 requests = _cache_entity_fetch(requests, &request, pd, 1325 requests = _cache_entity_fetch(requests, &request, pd,
1326 search_index, NULL); 1326 search_index, NULL);
@@ -1343,7 +1343,7 @@ _manager_content_visible_range_changed_cb(void *data, const Efl_Event *ev)
1343 Eina_List *requests = NULL; 1343 Eina_List *requests = NULL;
1344 long baseid; 1344 long baseid;
1345 unsigned int delta, marginup, margindown; 1345 unsigned int delta, marginup, margindown;
1346 uint64_t upperlimit_offset, lowerlimit_offset; 1346 unsigned int upperlimit_offset, lowerlimit_offset;
1347 unsigned int i; 1347 unsigned int i;
1348 1348
1349 pd->start_id = event->start_id; 1349 pd->start_id = event->start_id;
@@ -1449,7 +1449,7 @@ _manager_content_visible_range_changed_cb(void *data, const Efl_Event *ev)
1449 // We could optimize this to actually just move viewport around in most cases 1449 // We could optimize this to actually just move viewport around in most cases
1450 Efl_Ui_Collection_Item *items[3]; 1450 Efl_Ui_Collection_Item *items[3];
1451 unsigned int j = 0, t = 0; 1451 unsigned int j = 0, t = 0;
1452 uint64_t target, current; 1452 unsigned int target, current;
1453 1453
1454 // Case where are at the top 1454 // Case where are at the top
1455 if (pd->start_id < delta && pd->viewport[0]->offset == 0) goto build_request; 1455 if (pd->start_id < delta && pd->viewport[0]->offset == 0) goto build_request;
@@ -1575,7 +1575,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(manager_cbs,
1575static void 1575static void
1576_item_scroll_internal(Eo *obj EINA_UNUSED, 1576_item_scroll_internal(Eo *obj EINA_UNUSED,
1577 Efl_Ui_Collection_View_Data *pd, 1577 Efl_Ui_Collection_View_Data *pd,
1578 uint64_t index, 1578 unsigned int index,
1579 double align EINA_UNUSED, 1579 double align EINA_UNUSED,
1580 Eina_Bool anim) 1580 Eina_Bool anim)
1581{ 1581{
@@ -1793,7 +1793,7 @@ _efl_model_child_removed(void *data, const Efl_Event *event)
1793 unsigned int upper_end; 1793 unsigned int upper_end;
1794 long length; 1794 long length;
1795 unsigned int count; 1795 unsigned int count;
1796 uint64_t request_length; 1796 unsigned int request_length;
1797 1797
1798 // FIXME: later optimization, instead of reloading everyone, we could actually track index and self 1798 // FIXME: later optimization, instead of reloading everyone, we could actually track index and self
1799 // update would be more efficient, but it is also more tricky 1799 // update would be more efficient, but it is also more tricky
@@ -2197,11 +2197,11 @@ _efl_ui_collection_view_efl_ui_focus_manager_move(Eo *obj, Efl_Ui_Collection_Vie
2197 { 2197 {
2198 Efl_Model *model; 2198 Efl_Model *model;
2199 Eina_Value *vindex; 2199 Eina_Value *vindex;
2200 uint64_t index; 2200 unsigned int index;
2201 2201
2202 model = efl_ui_view_model_get(new_obj); 2202 model = efl_ui_view_model_get(new_obj);
2203 vindex = efl_model_property_get(model, "child.index"); 2203 vindex = efl_model_property_get(model, "child.index");
2204 if (eina_value_uint64_convert(vindex, &index)) 2204 if (eina_value_uint_convert(vindex, &index))
2205 _item_scroll_internal(obj, pd, index, .0, EINA_TRUE); 2205 _item_scroll_internal(obj, pd, index, .0, EINA_TRUE);
2206 eina_value_free(vindex); 2206 eina_value_free(vindex);
2207 } 2207 }
@@ -2244,7 +2244,7 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_manager_focus_set(Eo
2244{ 2244{
2245 MY_DATA_GET(pd->collection, cpd); 2245 MY_DATA_GET(pd->collection, cpd);
2246 Efl_Ui_Item *item = NULL; 2246 Efl_Ui_Item *item = NULL;
2247 uint64_t item_id; 2247 unsigned int item_id;
2248 2248
2249 if (focus == efl_ui_focus_manager_root_get(obj)) 2249 if (focus == efl_ui_focus_manager_root_get(obj))
2250 { 2250 {
@@ -2261,7 +2261,7 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_manager_focus_set(Eo
2261 2261
2262 model = efl_ui_view_model_get(item); 2262 model = efl_ui_view_model_get(item);
2263 vindex = efl_model_property_get(model, "child.index"); 2263 vindex = efl_model_property_get(model, "child.index");
2264 if (!eina_value_uint64_convert(vindex, &item_id)) return; 2264 if (!eina_value_uint_convert(vindex, &item_id)) return;
2265 eina_value_free(vindex); 2265 eina_value_free(vindex);
2266 } 2266 }
2267 2267
@@ -2276,7 +2276,7 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_manager_focus_set(Eo
2276} 2276}
2277 2277
2278static int 2278static int
2279_id_from_item(Efl_Ui_Item *item, uint64_t *index) 2279_id_from_item(Efl_Ui_Item *item, unsigned int *index)
2280{ 2280{
2281 Eina_Value *vindex; 2281 Eina_Value *vindex;
2282 Efl_Model *model; 2282 Efl_Model *model;
@@ -2284,7 +2284,7 @@ _id_from_item(Efl_Ui_Item *item, uint64_t *index)
2284 model = efl_ui_view_model_get(item); 2284 model = efl_ui_view_model_get(item);
2285 2285
2286 vindex = efl_model_property_get(model, "child.index"); 2286 vindex = efl_model_property_get(model, "child.index");
2287 EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_uint64_convert(vindex, index), EINA_FALSE); 2287 EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_uint_convert(vindex, index), EINA_FALSE);
2288 eina_value_free(vindex); 2288 eina_value_free(vindex);
2289 return EINA_TRUE; 2289 return EINA_TRUE;
2290} 2290}
@@ -2294,7 +2294,7 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_request_move(Eo *obj,
2294{ 2294{
2295 MY_DATA_GET(pd->collection, cpd); 2295 MY_DATA_GET(pd->collection, cpd);
2296 Efl_Ui_Item *new_item, *item; 2296 Efl_Ui_Item *new_item, *item;
2297 uint64_t item_id; 2297 unsigned int item_id;
2298 2298
2299 if (!child) 2299 if (!child)
2300 child = efl_ui_focus_manager_focus_get(obj); 2300 child = efl_ui_focus_manager_focus_get(obj);
@@ -2339,9 +2339,9 @@ _efl_ui_collection_view_focus_manager_efl_ui_focus_manager_request_move(Eo *obj,
2339 _assert_item_available(new_item, new_id, cpd); 2339 _assert_item_available(new_item, new_id, cpd);
2340 } 2340 }
2341#else 2341#else
2342 uint64_t search_index = (uint64_t)new_id; 2342 unsigned int search_index = new_id;
2343 lookup = (void*) eina_rbtree_inline_lookup(cpd->cache, &search_index, 2343 lookup = (void*) eina_rbtree_inline_lookup(cpd->cache, &search_index,
2344 sizeof (new_id), _cache_tree_lookup, 2344 sizeof (search_index), _cache_tree_lookup,
2345 NULL); 2345 NULL);
2346 if (lookup) 2346 if (lookup)
2347 { 2347 {
diff --git a/src/tests/elementary/efl_ui_test_select_model.c b/src/tests/elementary/efl_ui_test_select_model.c
index 63f5340052..12d5e6e148 100644
--- a/src/tests/elementary/efl_ui_test_select_model.c
+++ b/src/tests/elementary/efl_ui_test_select_model.c
@@ -84,7 +84,7 @@ EFL_START_TEST(efl_test_select_model)
84 Efl_Ui_Select_Model *model; 84 Efl_Ui_Select_Model *model;
85 Eina_Future *future; 85 Eina_Future *future;
86 Eina_Iterator *it; 86 Eina_Iterator *it;
87 uint64_t *index; 87 unsigned int *index;
88 88
89 eina_value_setup(&v, EINA_VALUE_TYPE_INT); 89 eina_value_setup(&v, EINA_VALUE_TYPE_INT);
90 90