minor code simplification

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

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index fb522fd99a48467fbf5df1cd5ce1d8429e963db2..a69029caff099a9925d39c64e1befbee948ac19e 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -49,7 +49,7 @@ IconManager::IconManager(QAbstractItemView* parent, DolphinSortFilterProxyModel*
 
     m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
     connect(m_dolphinModel->dirLister(), SIGNAL(newItems(const KFileItemList&)),
 
     m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel());
     connect(m_dolphinModel->dirLister(), SIGNAL(newItems(const KFileItemList&)),

-            this, SLOT(updateIcons(const KFileItemList&)));
+            this, SLOT(generatePreviews(const KFileItemList&)));

 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),


@@ -96,11 +96,37 @@ void IconManager::updatePreviews()
     generatePreviews(itemList);
 }
 
     generatePreviews(itemList);
 }
 

-void IconManager::updateIcons(const KFileItemList& items)
+void IconManager::generatePreviews(const KFileItemList &items)

 {
 {

-    if (m_showPreview) {
-        generatePreviews(items);
+    if (!m_showPreview) {
+        return;

     }
     }

+
+    const QRect visibleArea = m_view->viewport()->rect();
+
+    // Order the items in a way that the preview for the visible items
+    // is generated first, as this improves the feeled performance a lot.
+    KFileItemList orderedItems;
+    foreach (KFileItem item, items) {
+        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        const QRect itemRect = m_view->visualRect(proxyIndex);
+        if (itemRect.intersects(visibleArea)) {
+            orderedItems.insert(0, item);
+        } else {
+            orderedItems.append(item);
+        }
+    }
+
+    const QSize size = m_view->iconSize();
+    KIO::PreviewJob* job = KIO::filePreview(orderedItems, 128, 128);
+    connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+            this, SLOT(addToPreviewQueue(const KFileItem&, const QPixmap&)));
+    connect(job, SIGNAL(finished(KJob*)),
+            this, SLOT(slotPreviewJobFinished(KJob*)));
+
+    m_previewJobs.append(job);
+    m_previewTimer->start(200);

 }
 
 void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap)
 }
 
 void IconManager::addToPreviewQueue(const KFileItem& item, const QPixmap& pixmap)


@@ -167,36 +193,6 @@ void IconManager::dispatchPreviewQueue()
     }
 }
 
     }
 }
 

-void IconManager::generatePreviews(const KFileItemList &items)
-{
-    Q_ASSERT(m_showPreview);
-    const QRect visibleArea = m_view->viewport()->rect();
-
-    // Order the items in a way that the preview for the visible items
-    // is generated first, as this improves the feeled performance a lot.
-    KFileItemList orderedItems;
-    foreach (KFileItem item, items) {
-        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-        const QRect itemRect = m_view->visualRect(proxyIndex);
-        if (itemRect.intersects(visibleArea)) {
-            orderedItems.insert(0, item);
-        } else {
-            orderedItems.append(item);
-        }
-    }
-
-    const QSize size = m_view->iconSize();
-    KIO::PreviewJob* job = KIO::filePreview(orderedItems, 128, 128);
-    connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-            this, SLOT(addToPreviewQueue(const KFileItem&, const QPixmap&)));
-    connect(job, SIGNAL(finished(KJob*)),
-            this, SLOT(slotPreviewJobFinished(KJob*)));
-
-    m_previewJobs.append(job);
-    m_previewTimer->start(200);
-}
-

 void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
 {
     Q_ASSERT(!item.isNull());
 void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
 {
     Q_ASSERT(!item.isNull());

diff --git a/src/iconmanager.h b/src/iconmanager.h
index ed74946e6d6fdf94bad5d73576a1fdfd339bf51a..1621441d8111050f5f5210c2aa1be45ebbdf6843 100644 (file)
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -52,11 +52,9 @@ public:
 
 private slots:
     /**
 
 private slots:
     /**

-     * Updates the icons of for each item in \a items by making hidden
-     * items semitransparent and generating previews. The current preview
-     * settings (maximum size, 'Show Preview' menu) are respected.
+     * Generates previews for the items \a items asynchronously.

      */
      */

-    void updateIcons(const KFileItemList& items);
+    void generatePreviews(const KFileItemList &items);

 
     /**
      * Adds the preview \a pixmap for the item \a item to the preview
 
     /**
      * Adds the preview \a pixmap for the item \a item to the preview


@@ -81,8 +79,6 @@ private slots:
     void dispatchPreviewQueue();
 
 private:
     void dispatchPreviewQueue();
 
 private:

-    void generatePreviews(const KFileItemList &items);
-

     /**
      * Replaces the icon of the item \a item by the preview pixmap
      * \a pixmap.
     /**
      * Replaces the icon of the item \a item by the preview pixmap
      * \a pixmap.