Rename sort() to qsort()
In an effort to make the algorithm used clear.
diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index 06ccfd8..864e9e7 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -477,7 +477,7 @@
event->start = false;
event->feature = feature;
}
- feature_events.sort ();
+ feature_events.qsort ();
/* Add a strategic final event. */
{
active_feature_t feature;
@@ -512,7 +512,7 @@
CFMutableArrayRef features_array = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
/* TODO sort and resolve conflicting features? */
- /* active_features.sort (); */
+ /* active_features.qsort (); */
for (unsigned int j = 0; j < active_features.len; j++)
{
CFStringRef keys[2] = {
diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc
index 559193c..bd2d87f 100644
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
@@ -141,7 +141,7 @@
/* Sort features and merge duplicates */
{
- feature_infos.sort ();
+ feature_infos.qsort ();
unsigned int j = 0;
for (unsigned int i = 1; i < feature_infos.len; i++)
if (feature_infos[i].tag != feature_infos[j].tag)
@@ -251,7 +251,7 @@
/* Sort lookups and merge duplicates */
if (last_num_lookups < m.lookups[table_index].len)
{
- m.lookups[table_index].sort (last_num_lookups, m.lookups[table_index].len);
+ m.lookups[table_index].qsort (last_num_lookups, m.lookups[table_index].len);
unsigned int j = last_num_lookups;
for (unsigned int i = j + 1; i < m.lookups[table_index].len; i++)
diff --git a/src/hb-private.hh b/src/hb-private.hh
index f361875..5179912 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -353,14 +353,14 @@
return NULL;
}
- inline void sort (void)
+ inline void qsort (void)
{
- qsort (array, len, sizeof (Type), (hb_compare_func_t) Type::cmp);
+ ::qsort (array, len, sizeof (Type), (hb_compare_func_t) Type::cmp);
}
- inline void sort (unsigned int start, unsigned int end)
+ inline void qsort (unsigned int start, unsigned int end)
{
- qsort (array + start, end - start, sizeof (Type), (hb_compare_func_t) Type::cmp);
+ ::qsort (array + start, end - start, sizeof (Type), (hb_compare_func_t) Type::cmp);
}
template <typename T>
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index 6571448..f699415 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -631,7 +631,7 @@
event->start = false;
event->feature = feature;
}
- feature_events.sort ();
+ feature_events.qsort ();
/* Add a strategic final event. */
{
active_feature_t feature;
@@ -663,7 +663,7 @@
unsigned int offset = feature_records.len;
- active_features.sort ();
+ active_features.qsort ();
for (unsigned int j = 0; j < active_features.len; j++)
{
if (!j || active_features[j].rec.tagFeature != feature_records[feature_records.len - 1].tagFeature)
