don't keep a KFileItem inside the selection manager for the whole lifetime, work...

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

diff --git a/src/selectionmanager.cpp b/src/selectionmanager.cpp
index 02125d7c9263dcb681e310053d5d0af7ad8e5bda..fecbcbb721e533d56a5c94bc7268393ea7a74b70 100644 (file)
--- a/src/selectionmanager.cpp
+++ b/src/selectionmanager.cpp
@@ -62,7 +62,7 @@ void SelectionManager::slotEntered(const QModelIndex& index)
 {
     m_toggle->hide();
     if (index.isValid() && (index.column() == DolphinModel::Name)) {
 {
     m_toggle->hide();
     if (index.isValid() && (index.column() == DolphinModel::Name)) {

-        m_toggle->setFileItem(itemForIndex(index));
+        m_toggle->setUrl(urlForIndex(index));

 
         connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                 this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
 
         connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                 this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));


@@ -78,7 +78,7 @@ void SelectionManager::slotEntered(const QModelIndex& index)
         m_toggle->setChecked(selModel->isSelected(index));
         m_toggle->show();
     } else {
         m_toggle->setChecked(selModel->isSelected(index));
         m_toggle->show();
     } else {

-        m_toggle->setFileItem(KFileItem());
+        m_toggle->setUrl(KUrl());

         disconnect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                    this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
     }
         disconnect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
                    this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
     }


@@ -92,9 +92,8 @@ void SelectionManager::slotViewportEntered()
 void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();
 void SelectionManager::setItemSelected(bool selected)
 {
     emit selectionChanged();

-    Q_ASSERT(!m_toggle->fileItem().isNull());

 
 

-    const QModelIndex index = indexForItem(m_toggle->fileItem());
+    const QModelIndex index = indexForUrl(m_toggle->url());

     if (index.isValid()) {
         QItemSelectionModel* selModel = m_view->selectionModel();
         if (selected) {
     if (index.isValid()) {
         QItemSelectionModel* selModel = m_view->selectionModel();
         if (selected) {


@@ -113,19 +112,19 @@ void SelectionManager::slotRowsRemoved(const QModelIndex& parent, int start, int
     m_toggle->hide();
 }
 
     m_toggle->hide();
 }
 

-KFileItem SelectionManager::itemForIndex(const QModelIndex& index) const
+KUrl SelectionManager::urlForIndex(const QModelIndex& index) const

 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
     const QModelIndex dirIndex = proxyModel->mapToSource(index);
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
     const QModelIndex dirIndex = proxyModel->mapToSource(index);

-    return dirModel->itemForIndex(dirIndex);
+    return dirModel->itemForIndex(dirIndex).url();

 }
 
 }
 

-const QModelIndex SelectionManager::indexForItem(const KFileItem& item) const
+const QModelIndex SelectionManager::indexForUrl(const KUrl& url) const

 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
 {
     QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_view->model());
     KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());

-    const QModelIndex dirIndex = dirModel->indexForItem(item);
+    const QModelIndex dirIndex = dirModel->indexForUrl(url);

     return proxyModel->mapFromSource(dirIndex);
 }
 
     return proxyModel->mapFromSource(dirIndex);
 }
 

diff --git a/src/selectionmanager.h b/src/selectionmanager.h
index 04e6e29c160ce9e9edd17aed5ec33df89f3c738f..c263da3ea6a6be15e5f3a625c30315f7a4caf7c3 100644 (file)
--- a/src/selectionmanager.h
+++ b/src/selectionmanager.h
@@ -62,8 +62,8 @@ private slots:
     void slotRowsRemoved(const QModelIndex& parent, int start, int end);
 
 private:
     void slotRowsRemoved(const QModelIndex& parent, int start, int end);
 
 private:

-    KFileItem itemForIndex(const QModelIndex& index) const;
-    const QModelIndex indexForItem(const KFileItem& item) const;
+    KUrl urlForIndex(const QModelIndex& index) const;
+    const QModelIndex indexForUrl(const KUrl& url) const;

 
 private:
     QAbstractItemView* m_view;
 
 private:
     QAbstractItemView* m_view;

diff --git a/src/selectiontoggle.cpp b/src/selectiontoggle.cpp
index 7a3f0ef567a1f1442cfa59c021881b41b8e2e077..16d3c5979f3391733fe626947f42ba736298d3cb 100644 (file)
--- a/src/selectiontoggle.cpp
+++ b/src/selectiontoggle.cpp
@@ -54,21 +54,21 @@ QSize SelectionToggle::sizeHint() const
 
 void SelectionToggle::reset()
 {
 
 void SelectionToggle::reset()
 {

-    m_item = KFileItem();
+    m_url = KUrl();

     hide();
 }
 
     hide();
 }
 

-void SelectionToggle::setFileItem(const KFileItem& item)
+void SelectionToggle::setUrl(const KUrl& url)

 {
 {

-    m_item = item;
-    if (!item.isNull()) {
+    m_url = url;
+    if (!url.isEmpty()) {

         startFading();
     }
 }
 
         startFading();
     }
 }
 

-KFileItem SelectionToggle::fileItem() const
+KUrl SelectionToggle::url() const

 {
 {

-    return m_item;
+    return m_url;

 }
 
 void SelectionToggle::setVisible(bool visible)
 }
 
 void SelectionToggle::setVisible(bool visible)

diff --git a/src/selectiontoggle.h b/src/selectiontoggle.h
index 653104ab5777f2785baf310c8b227c348fcc15ca..a6d5eae580f3ec62444d037b0b5aa9c3ec73fe2b 100644 (file)
--- a/src/selectiontoggle.h
+++ b/src/selectiontoggle.h
@@ -20,7 +20,7 @@
 #ifndef SELECTIONTOGGLE_H
 #define SELECTIONTOGGLE_H
 
 #ifndef SELECTIONTOGGLE_H
 #define SELECTIONTOGGLE_H
 

-#include <kfileitem.h>
+#include <kurl.h>

 
 #include <QAbstractButton>
 #include <QPixmap>
 
 #include <QAbstractButton>
 #include <QPixmap>


@@ -50,8 +50,8 @@ public:
      */
     void reset();
 
      */
     void reset();
 

-    void setFileItem(const KFileItem& item);
-    KFileItem fileItem() const;
+    void setUrl(const KUrl& url);
+    KUrl url() const;

 
 public slots:
     virtual void setVisible(bool visible);
 
 public slots:
     virtual void setVisible(bool visible);


@@ -78,7 +78,7 @@ private:
     int m_fadingValue;
     QPixmap m_icon;
     QTimeLine* m_fadingTimeLine;
     int m_fadingValue;
     QPixmap m_icon;
     QTimeLine* m_fadingTimeLine;

-    KFileItem m_item;
+    KUrl m_url;

 };
 
 #endif
 };
 
 #endif