PreviewJob API change (KFileItems by value)

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index e06bc72f279c784aff3d27f28419f9aec04d428c..6070fdd66f71c8f080b128c4efa3e654c4f73906 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -801,24 +801,24 @@ void DolphinView::generatePreviews(const KFileItemList& items)
 {
     if (m_controller->showPreview()) {
         KIO::PreviewJob* job = KIO::filePreview(items, 128);
-        connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem*, const QPixmap&)));
+        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
     }
 }
 
-void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
+void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
 {
     Q_ASSERT(item != 0);
-    if (item->url().directory() != m_dirLister->url().path()) {
+    if (item.url().directory() != m_dirLister->url().path()) {
         // the preview job is still working on items of an older URL, hence
         // the item is not part of the directory model anymore
         return;
     }
 
-    const QModelIndex idx = m_dirModel->indexForItem(*item);
+    const QModelIndex idx = m_dirModel->indexForItem(item);
     if (idx.isValid() && (idx.column() == 0)) {
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(*item)) {
+        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
             KIconEffect iconEffect;
             const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
             m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);

diff --git a/src/dolphinview.h b/src/dolphinview.h
index ec7fcf85bc8399d2b18824f65abfe8f942cff0ef..953e8f11d3fed8dd0e77ffee0f3950c25e61dede 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -451,7 +451,7 @@ private slots:
      * Replaces the icon of the item \a item by the preview pixmap
      * \a pixmap.
      */
-    void showPreview(const KFileItem* item, const QPixmap& pixmap);
+    void showPreview(const KFileItem& item, const QPixmap& pixmap);
 
     /**
      * Restores the x- and y-position of the contents if the

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index e4ca55b470d0cefc0a46d8d18264fb1c8a9d0044..77df565f04300fb1ac1689965c6b4974177b42ec 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -187,10 +187,10 @@ void InfoSidebarPage::showItemInfo()
                                                 false);
         job->setIgnoreMaximumSize(true);
 
-        connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
-                this, SLOT(gotPreview(const KFileItem*, const QPixmap&)));
-        connect(job, SIGNAL(failed(const KFileItem*)),
-                this, SLOT(slotPreviewFailed(const KFileItem*)));
+        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(gotPreview(const KFileItem&, const QPixmap&)));
+        connect(job, SIGNAL(failed(const KFileItem&)),
+                this, SLOT(slotPreviewFailed(const KFileItem&)));
 
         QString text("<b>");
         text.append(file.fileName());
@@ -208,15 +208,15 @@ void InfoSidebarPage::slotTimeout()
     showItemInfo();
 }
 
-void InfoSidebarPage::slotPreviewFailed(const KFileItem* item)
+void InfoSidebarPage::slotPreviewFailed(const KFileItem& item)
 {
     m_pendingPreview = false;
-    if (!applyBookmark(item->url())) {
-        m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous));
+    if (!applyBookmark(item.url())) {
+        m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
     }
 }
 
-void InfoSidebarPage::gotPreview(const KFileItem* item,
+void InfoSidebarPage::gotPreview(const KFileItem& item,
                                  const QPixmap& pixmap)
 {
     Q_UNUSED(item);

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index a5de0a23b8dbcc33b3a51f5f349cb073c476d49b..bb5994eaa04a8bf9fcd70b7fdb727a2da0a044ac 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -90,13 +90,13 @@ private slots:
      * Is invoked if no preview is available for the item. In this
      * case the icon will be shown.
      */
-    void slotPreviewFailed(const KFileItem* item);
+    void slotPreviewFailed(const KFileItem& item);
 
     /**
      * Is invoked if a preview is available for the item. The preview
      * \a pixmap is shown inside the info page.
      */
-    void gotPreview(const KFileItem* item, const QPixmap& pixmap);
+    void gotPreview(const KFileItem& item, const QPixmap& pixmap);
 
     /**
      * Starts the service of m_actionsVector with the index \index on