prevent a possible crash if an item is deleted during previews are generated

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

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 72549d71b196aec20b78ae17abb35ca91718658c..c6c07be7bd9b1eb10299c6e426f3f441fd753565 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -131,8 +131,8 @@ void IconManager::generatePreviews(const KFileItemList &items)
 
 void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap)
 {
-    Preview preview;
-    preview.item = item;
+    ItemInfo preview;
+    preview.url = item.url();
     preview.pixmap = pixmap;
     m_previews.append(preview);
 }
@@ -147,7 +147,7 @@ void IconManager::updateCutItems()
 {
     // restore the icons of all previously selected items to the
     // original state...
-    foreach (const CutItem &cutItem, m_cutItemsCache) {
+    foreach (const ItemInfo& cutItem, m_cutItemsCache) {
         const QModelIndex index = m_dolphinModel->indexForUrl(cutItem.url);
         if (index.isValid()) {
             m_dolphinModel->setData(index, QIcon(cutItem.pixmap), Qt::DecorationRole);
@@ -169,13 +169,13 @@ void IconManager::dispatchPreviewQueue()
         // of the view would be triggered for each single preview.
 
         int dispatchCount = 30;
-        if (dispatchCount > m_previews.count()) {
-            dispatchCount = m_previews.count();
+        if (dispatchCount > previewsCount) {
+            dispatchCount = previewsCount;
         }
 
         for (int i = 0; i < dispatchCount; ++i) {
-            const Preview& preview = m_previews.first();
-            replaceIcon(preview.item, preview.pixmap);
+            const ItemInfo& preview = m_previews.first();
+            replaceIcon(preview.url, preview.pixmap);
             m_previews.pop_front();
         }
 
@@ -193,9 +193,9 @@ void IconManager::dispatchPreviewQueue()
     }
 }
 
-void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
+void IconManager::replaceIcon(const KUrl& url, const QPixmap& pixmap)
 {
-    Q_ASSERT(!item.isNull());
+    Q_ASSERT(url.isValid());
     if (!m_showPreview) {
         // the preview has been canceled in the meantime
         return;
@@ -206,8 +206,8 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
     KDirLister* dirLister = m_dolphinModel->dirLister();
     bool isOldPreview = true;
     const KUrl::List dirs = dirLister->directories();
-    const QString itemDir = item.url().directory();
-    foreach (const KUrl &url, dirs) {
+    const QString itemDir = url.directory();
+    foreach (const KUrl& url, dirs) {
         if (url.path() == itemDir) {
             isOldPreview = false;
             break;
@@ -217,10 +217,11 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
         return;
     }
 
-    const QModelIndex idx = m_dolphinModel->indexForItem(item);
+    const QModelIndex idx = m_dolphinModel->indexForUrl(url);
     if (idx.isValid() && (idx.column() == 0)) {
         QPixmap icon = pixmap;
 
+        const KFileItem item = m_dolphinModel->itemForIndex(idx);
         const QString mimeType = item.mimetype();
         const QString mimeTypeGroup = mimeType.left(mimeType.indexOf('/'));
         if ((mimeTypeGroup != "image") || !applyImageFrame(icon)) {
@@ -243,8 +244,8 @@ bool IconManager::isCutItem(const KFileItem& item) const
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();
     const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData);
 
-    const KUrl& itemUrl = item.url();
-    foreach (const KUrl &url, cutUrls) {
+    const KUrl itemUrl = item.url();
+    foreach (const KUrl& url, cutUrls) {
         if (url == itemUrl) {
             return true;
         }
@@ -263,11 +264,11 @@ void IconManager::applyCutItemEffect()
     KFileItemList items;
     KDirLister* dirLister = m_dolphinModel->dirLister();
     const KUrl::List dirs = dirLister->directories();
-    foreach (const KUrl &url, dirs) {
+    foreach (const KUrl& url, dirs) {
         items << dirLister->itemsForDir(url);
     }
 
-    foreach (const KFileItem &item, items) {
+    foreach (const KFileItem& item, items) {
         if (isCutItem(item)) {
             const QModelIndex index = m_dolphinModel->indexForItem(item);
             const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
@@ -277,7 +278,7 @@ void IconManager::applyCutItemEffect()
 
                 // remember current pixmap for the item to be able
                 // to restore it when other items get cut
-                CutItem cutItem;
+                ItemInfo cutItem;
                 cutItem.url = item.url();
                 cutItem.pixmap = pixmap;
                 m_cutItemsCache.append(cutItem);

diff --git a/src/iconmanager.h b/src/iconmanager.h
index 1621441d8111050f5f5210c2aa1be45ebbdf6843..f72811c2722fd257502f875cfec5d37bee255624 100644 (file)
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -80,10 +80,10 @@ private slots:
 
 private:
     /**
-     * Replaces the icon of the item \a item by the preview pixmap
+     * Replaces the icon of the item with the \a url by the preview pixmap
      * \a pixmap.
      */
-    void replaceIcon(const KFileItem& item, const QPixmap& pixmap);
+    void replaceIcon(const KUrl& url, const QPixmap& pixmap);
 
     /**
      * Returns true, if the item \a item has been cut into
@@ -112,24 +112,14 @@ private:
 
 private:
     /**
-     * Remembers the original pixmap for an item before
-     * the cut effect is applied.
+     * Remembers the pixmap for an item specified by an URL.
      */
-    struct CutItem
+    struct ItemInfo
     {
         KUrl url;
         QPixmap pixmap;
     };
 
-    /**
-     * Remembers the received preview pixmap for an item.
-     */
-    struct Preview
-    {
-        KFileItem item;
-        QPixmap pixmap;
-    };
-
     bool m_showPreview;
 
     QAbstractItemView* m_view;
@@ -138,8 +128,8 @@ private:
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
 
-    QList<CutItem> m_cutItemsCache;
-    QList<Preview> m_previews;
+    QList<ItemInfo> m_cutItemsCache;
+    QList<ItemInfo> m_previews;
 };
 
 inline bool IconManager::showPreview() const