From 0965fb9d0e570f238088310d907ab00c1c4cd299 Mon Sep 17 00:00:00 2001
From: "smfr%smfr.org" <smfr%smfr.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 19 Dec 2005 05:09:36 +0000
Subject: [PATCH] Minor tidyup from last set of changes.

git-svn-id: svn://10.0.0.236/trunk@186247 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/bookmarks/BookmarkItem.mm    |  2 --
 .../src/bookmarks/KindaSmartFolderManager.mm    | 17 +++--------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/mozilla/camino/src/bookmarks/BookmarkItem.mm b/mozilla/camino/src/bookmarks/BookmarkItem.mm
index fd2b4745cef..8ef11c7c86a 100644
--- a/mozilla/camino/src/bookmarks/BookmarkItem.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkItem.mm
@@ -144,8 +144,6 @@ static BOOL gSuppressAllUpdates = NO;
   [super dealloc];
 }
 
-@class BookmarkFolder;
-
 // Basic properties
 -(id) parent
 {
diff --git a/mozilla/camino/src/bookmarks/KindaSmartFolderManager.mm b/mozilla/camino/src/bookmarks/KindaSmartFolderManager.mm
index cd2b30c94fc..a96967b65b0 100644
--- a/mozilla/camino/src/bookmarks/KindaSmartFolderManager.mm
+++ b/mozilla/camino/src/bookmarks/KindaSmartFolderManager.mm
@@ -139,15 +139,6 @@ const unsigned kNumTop10Items = 10;   // well, 10, duh!
     if ([curItem isKindOfClass:[Bookmark class]])
       [self checkForNewTop10:curItem];
   }
-  
-  // This is somewhat broken. -checkForNewTop10 doesn't insert based on visit count,
-  // it just assumes that later added bookmarks should replace earlier ones (with
-  // the same visit count).
-  [mTop10Folder sortChildrenUsingPrimarySelector:@selector(compareVisitCount:sortDescending:)
-                              primaryReverseSort:YES
-                               secondarySelector:@selector(compareLastVisitDate:sortDescending:)
-                            secondaryReverseSort:YES
-                                        sortDeep:NO];
 }
 
 -(void)checkForNewTop10:(Bookmark *)aBookmark
@@ -180,11 +171,9 @@ const unsigned kNumTop10Items = 10;   // well, 10, duh!
     else
     {
       // just resort
-      [mTop10Folder sortChildrenUsingPrimarySelector:@selector(compareVisitCount:sortDescending:)
-                                  primaryReverseSort:YES
-                                   secondarySelector:@selector(compareLastVisitDate:sortDescending:)
-                                secondaryReverseSort:YES
-                                            sortDeep:NO];
+      [mTop10Folder sortChildrenUsingSelector:@selector(compareForTop10:sortDescending:)
+                                  reverseSort:YES
+                                     sortDeep:NO];
     }
   }
   else if (visitCount >= currentMinVisits)