Simplify code:

* Use KFileItems for all lists instead a mixture of KFileItemList and QList<KUrl>.
* Use a common helper method for generatePreviews() and resumePreviews() to order the visible items at the beginning of the list.

svn path=/trunk/KDE/kdebase/apps/; revision=819681

1 files changed, 5 insertions, 9 deletions

diff --git a/src/iconmanager.h b/src/iconmanager.h
index b5a822175..011040a2e 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -152,11 +152,7 @@ private:
     /** Kills all ongoing preview jobs. */
     void killPreviewJobs();
 
-    /**
-     * Returns true, if the item list \a items contains an item with the
-     * URL \a url. This is a helper method for IconManager::generatePreviews().
-     */
-    bool itemListContains(const KFileItemList& items, const KUrl& url) const;
+    void orderItems(KFileItemList& items);
 
 private:
     /** Remembers the pixmap for an item specified by an URL. */
@@ -187,16 +183,16 @@ private:
     QList<ItemInfo> m_previews;
 
     /**
-     * Contains the URLs of all items where a preview must be generated, but
+     * Contains all items where a preview must be generated, but
      * where the preview job has not dispatched the items yet.
      */
-    QList<KUrl> m_pendingItems;
+    KFileItemList m_pendingItems;
 
     /**
-     * Contains the URLs of all items, where a preview has already been
+     * Contains all items, where a preview has already been
      * generated by the preview jobs.
      */
-    QList<KUrl> m_dispatchedItems;
+    KFileItemList m_dispatchedItems;
 };
 
 inline bool IconManager::showPreview() const