X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Flinklist.h;h=0c580defded3c95b8ff8836fbdf562c98ebd9792;hb=04031cc2a664d2a6d9d2a37954c55cc68742d78c;hp=000f0f212324d1d708dc2fa06a9e6adc3f8d9888;hpb=1f78d86b5532943b2a3ea51f409a1fe5bd961e02;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/linklist.h b/cinelerra-5.1/guicast/linklist.h index 000f0f21..0c580def 100644 --- a/cinelerra-5.1/guicast/linklist.h +++ b/cinelerra-5.1/guicast/linklist.h @@ -18,7 +18,6 @@ public: template class List { TYPE *split(int (*cmpr)(TYPE *a, TYPE *b),TYPE *l, TYPE *r); - void sort(int (*cmpr)(TYPE *a, TYPE *b),TYPE *ll, TYPE *rr); static int cmpr(TYPE *a, TYPE *b) { if( *a == *b ) return 0; return *a > *b ? 1 : -1; @@ -26,7 +25,7 @@ class List { public: TYPE *first, *last; void remove(TYPE *item) { if(item) delete item; } - void remove_pointer(ListItem *item); + void remove_pointer(ListItem *item); TYPE *append(TYPE *new_item); TYPE *append() { return append(new TYPE()); } TYPE *insert_before(TYPE *here, TYPE *item); @@ -44,8 +43,8 @@ public: return p ? i : -1; } void swap(TYPE *item1, TYPE *item2); - void sort(int (*cmp)(TYPE *a, TYPE *b) = 0) { - return sort(cmp ? cmp : cmpr,0,0); } + void sort(TYPE *ap=0, TYPE *bp=0) { return sort(cmpr,ap,bp); } + void sort(int (*cmp)(TYPE *a, TYPE *b), TYPE *ap=0, TYPE *bp=0); List() { first = last = 0; } virtual ~List() { while(last) delete last; } };