Patch from Julian Foad:

[flightgear.git] / src / GUI / prop_picker.cxx

diff --git a/src/GUI/prop_picker.cxx b/src/GUI/prop_picker.cxx
index 39e45c5e012ef7d913a306f2a98f69c3df26e819..0f3371fe019df10d40021ad1f58fa0825124b914 100755 (executable)
--- a/src/GUI/prop_picker.cxx
+++ b/src/GUI/prop_picker.cxx
@@ -146,7 +146,7 @@ void fgPropPicker::fgPropPickerHandleSlider ( puObject * slider )
   float val ;
   slider -> getValue ( &val ) ;
   val = 1.0f - val ;
-  int scroll_range = list_box->getNumItems () - list_box->getNumVisible () ;
+  int scroll_range = list_box->getNumItems () - list_box->getNumVisible() ;
   if ( scroll_range > 0 )
   {
     int index = int ( scroll_range * val + 0.5 ) ;
@@ -168,7 +168,7 @@ void fgPropPicker::fgPropPickerHandleArrow ( puObject *arrow )
   float val ;
   slider -> getValue ( &val ) ;
   val = 1.0f - val ;
-  int scroll_range = list_box->getNumItems () - list_box->getNumVisible () ;
+  int scroll_range = list_box->getNumItems () - list_box->getNumVisible() ;
   if ( scroll_range > 0 )
   {
     int index = int ( scroll_range * val + 0.5 ) ;
@@ -473,25 +473,8 @@ void fgPropPicker::find_props ()
       children[i] = node->getChild(i);
     }
 
-#if 1
     // Sort the children into display order
     qsort(children, nChildren, sizeof(children[0]), nodeNameCompare);
-#else
-    // Sort the entries.  This is a simple N^2 extraction sort.  More
-    // elaborate algorithms aren't necessary for the few dozen
-    // properties we're going to sort.
-    for (i = 0; i < nChildren; i++) {
-      int j, min = i;
-      for (j = i+1; j < nChildren; j++)
-       if (nodeNameCompare(&children[j], &children[min]) < 0)
-         min = j;
-      if (i != min) {
-       SGPropertyNode_ptr tmp = children[min];
-       children[min] = children[i];
-       children[i] = tmp;
-      }
-    }
-#endif
 
     // Make lists of the children's names, values, etc.
     for (i = 0; i < nChildren; i++) {