[vidalia-svn] r2313: Remove some dead code now that we require Qt >= 4.2. (in vidalia/trunk: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-21 13:42:03 -0500 (Mon, 21 Jan 2008)
New Revision: 2313

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
   vidalia/trunk/src/vidalia/network/routerlistwidget.h
Log:
 r61@lysithea:  edmanm | 2008-01-21 13:41:56 -0500
 Remove some dead code now that we require Qt >= 4.2.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r61] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-01-20 02:10:52 UTC (rev 2312)
+++ vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-01-21 18:42:03 UTC (rev 2313)
@@ -96,46 +96,6 @@
   QTreeWidget::clear();
 }
 
-/** Inserts a new router list item into the list, in its proper sorted place
- * according to the current sort column. */
-void
-RouterListWidget::insertSorted(RouterListItem *item)
-{
-  /* Qt >= 4.2 handles the sorting in addTopLevelItem(). We need to do the
-   * sorted inserts ourselves in older Qts. */
-#if QT_VERSION < 0x040200
-  Qt::SortOrder order = header()->sortIndicatorOrder();
-  int left  = 0;
-  int right = topLevelItemCount();
-  int mid;
-
-  while (left < right) {
-    mid = (left + right)/2;
-    if (order == Qt::AscendingOrder) {
-      if (*((RouterListItem *)topLevelItem(mid)) < *item) {
-        left = mid + 1;
-      } else {
-        right = mid;
-      }
-    } else {
-      if (*item < *((RouterListItem *)topLevelItem(mid))) {
-        left = mid+1;
-      } else {
-        right = mid;
-      }
-    }
-  }
- 
-  if (left == topLevelItemCount()) {
-    addTopLevelItem(item);
-  } else {
-    insertTopLevelItem(left, item);
-  }
-#else
-  addTopLevelItem(item);
-#endif
-}
-
 /** Called when the user selects a router from the list. This will search the
  * list for a router whose names starts with the key pressed. */
 void
@@ -219,7 +179,7 @@
 
     /* Add the router item to the list and store its descriptor. */
     item = new RouterListItem(this, rd);
-    insertSorted(item);
+    addTopLevelItem(item);
     _idmap.insert(id, item);
 
     /* Set our status tip to the number of servers in the list */

Modified: vidalia/trunk/src/vidalia/network/routerlistwidget.h
===================================================================
--- vidalia/trunk/src/vidalia/network/routerlistwidget.h	2008-01-20 02:10:52 UTC (rev 2312)
+++ vidalia/trunk/src/vidalia/network/routerlistwidget.h	2008-01-21 18:42:03 UTC (rev 2313)
@@ -90,9 +90,6 @@
   void keyPressEvent(QKeyEvent *event);
 
 private:
-  /** Inserts a new item into the router list, maintaining the current order.*/
-  void insertSorted(RouterListItem *item);
-
   /** Maps a server ID to that server's list item. */
   QHash<QString,RouterListItem*> _idmap;
   quint32  _onlineRouterCount; /**< Number of online routers. */