[Pinfo-devel] r90 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-30 12:06:33 +0000 (Tue, 30 Aug 2005)
New Revision: 90

Modified:
   pinfo/branches/cxx/src/initializelinks.cxx
   pinfo/branches/cxx/src/manual.cxx
Log:
Remove if 0'd sort stuff, which appears to be unnecessary.


Modified: pinfo/branches/cxx/src/initializelinks.cxx
===================================================================
--- pinfo/branches/cxx/src/initializelinks.cxx	2005-08-30 12:03:01 UTC (rev 89)
+++ pinfo/branches/cxx/src/initializelinks.cxx	2005-08-30 12:06:33 UTC (rev 90)
@@ -28,21 +28,6 @@
 #define MENU_DOT 0
 #define NOTE_DOT 1
 
-/* Unusable with vectors */
-/* Try life without sorting.  :-) FIXME */
-#if 0
-int
-compare_hyperlink(const void *a, const void *b)
-{
-	return ((HyperObject *) a)->col -((HyperObject *) b)->col;
-}
-void
-sort_hyperlinks_from_current_line(long startlink, long endlink)
-{
-	qsort(hyperobjects[startlink], endlink - startlink, sizeof(HyperObject), compare_hyperlink);
-}
-#endif
-
 /*
  * Compares two strings, ignoring whitespaces(tabs, spaces)
  */

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-08-30 12:03:01 UTC (rev 89)
+++ pinfo/branches/cxx/src/manual.cxx	2005-08-30 12:06:33 UTC (rev 90)
@@ -535,22 +535,6 @@
 
 }
 
-int
-compare_manuallink(const void *a, const void *b)
-{
-	return ((manuallink *) a)->col -((manuallink *) b)->col;
-}
-
-void
-sort_manuallinks_from_current_line(long startlink, long endlink)
-{
-/* Can't do this with a std::vector.  FIXME */
-#if 0
-	qsort(manuallinks + startlink, endlink - startlink, sizeof(manuallink), compare_manuallink);
-#endif
-}
-
-
 /* initializes hyperlinks in manual */
 void
 man_initializelinks(char *tmp, int carry)
@@ -742,10 +726,6 @@
 		}
 	} while (link != NULL);
 	/* do this loop until strchr() won't find a '(' in string */
-
-	/* FIXME: Doesn't work with std::vector */
-	if (initialManualLinks != manuallinks.size())
-		sort_manuallinks_from_current_line(initialManualLinks, manuallinks.size());
 }
 
 /* viewer function. Handles keyboard actions--main event loop */