Cleanup: use BLI_listbase_*** prefix for count,sort,sort_r

4 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 709a174731f..158c2aa4263 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -582,7 +582,7 @@ void BM_log_free(BMLog *log)
 /* Get the number of log entries */
 int BM_log_length(const BMLog *log)
 {
-	return BLI_countlist(&log->entries);
+	return BLI_listbase_count(&log->entries);
 }
 
 /* Apply a consistent ordering to BMesh vertices */
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 05f3ff5b60b..8c96cc9addf 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -788,7 +788,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface)
 
 	{
 		BMEditSelection *selected;
-		me->totselect = BLI_countlist(&(bm->selected));
+		me->totselect = BLI_listbase_count(&(bm->selected));
 
 		if (me->mselect) MEM_freeN(me->mselect);
 
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c
index 80ed287b4bf..418e75b7ac3 100644
--- a/source/blender/bmesh/operators/bmo_connect_pair.c
+++ b/source/blender/bmesh/operators/bmo_connect_pair.c
@@ -496,7 +496,7 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op)
 		PathLinkState *state, *state_next;
 		found_all = true;
 #ifdef DEBUG_PRINT
-		printf("\n%s: stepping %d\n", __func__, BLI_countlist(&pc.state_lb));
+		printf("\n%s: stepping %d\n", __func__, BLI_listbase_count(&pc.state_lb));
 #endif
 		for (state = pc.state_lb.first; state; state = state_next) {
 			state_next = state->next;
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c
index 4e714f8fbe9..562f123ef4b 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.c
+++ b/source/blender/bmesh/tools/bmesh_region_match.c
@@ -656,7 +656,7 @@ static bool bm_uuidwalk_facestep_begin(
 	bool ok = false;
 
 	BLI_assert(BLI_ghash_size(uuidwalk->cache.faces_from_uuid) == 0);
-	BLI_assert(BLI_countlist(&fstep->items) == 0);
+	BLI_assert(BLI_listbase_count(&fstep->items) == 0);
 
 	f_link_prev_p = &fstep->faces;
 	for (f_link = fstep->faces; f_link; f_link = f_link_next) {
@@ -695,7 +695,7 @@ static bool bm_uuidwalk_facestep_begin(
 
 	BLI_ghash_clear(uuidwalk->cache.faces_from_uuid, NULL, NULL);
 
-	BLI_sortlist(&fstep->items, facestep_sort);
+	BLI_listbase_sort(&fstep->items, facestep_sort);
 
 	return ok;
 }
@@ -781,7 +781,7 @@ static BMFace **bm_mesh_region_match_pair(
 		UUIDFaceStep *fstep_src = w_src->faces_step.first;
 		UUIDFaceStep *fstep_dst = w_dst->faces_step.first;
 
-		BLI_assert(BLI_countlist(&w_src->faces_step) == BLI_countlist(&w_dst->faces_step));
+		BLI_assert(BLI_listbase_count(&w_src->faces_step) == BLI_listbase_count(&w_dst->faces_step));
 
 		while (fstep_src) {