X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7eef5ebec2ceaebb4088629093ecd3f0c2635816..fbf046b8bb7869229e85eb46e6bcfcf1acbbbf1f:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index c53b77818..59c2e5e3c 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -127,8 +127,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                              m_proxyModel);
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
-    connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)),
-            this, SLOT(openContextMenu(KFileItem*, const KUrl&)));
+    connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&)),
+            this, SLOT(openContextMenu(KFileItem, const KUrl&)));
     connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
     connect(m_view, SIGNAL(contentsMoved(int, int)),
@@ -190,10 +190,11 @@ void DolphinViewContainer::renameSelectedItems()
 {
     DolphinViewContainer* view = m_mainWindow->activeViewContainer();
     const KUrl::List urls = m_view->selectedUrls();
+    const QList<KFileItem> items = m_view->selectedItems();
     if (urls.count() > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(urls);
+        RenameDialog dialog(urls, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
@@ -238,7 +239,7 @@ void DolphinViewContainer::renameSelectedItems()
         // TODO: Think about using KFileItemDelegate as soon as it supports editing.
         // Currently the RenameDialog is used, but I'm not sure whether inline renaming
         // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(urls);
+        RenameDialog dialog(urls, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
@@ -266,7 +267,7 @@ bool DolphinViewContainer::isUrlEditable() const
     return m_urlNavigator->isUrlEditable();
 }
 
-KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const
+KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const
 {
     const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
     return m_dirModel->itemForIndex(dirModelIndex);
@@ -358,7 +359,7 @@ QString DolphinViewContainer::defaultStatusBarText() const
 QString DolphinViewContainer::selectionStatusBarText() const
 {
     QString text;
-    const KFileItemList list = m_view->selectedItems();
+    const QList<KFileItem> list = m_view->selectedItems();
     if (list.isEmpty()) {
         // when an item is triggered, it is temporary selected but selectedItems()
         // will return an empty list
@@ -368,15 +369,15 @@ QString DolphinViewContainer::selectionStatusBarText() const
     int fileCount = 0;
     int folderCount = 0;
     KIO::filesize_t byteSize = 0;
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
+    QList<KFileItem>::const_iterator it = list.begin();
+    const QList<KFileItem>::const_iterator end = list.end();
     while (it != end) {
-        KFileItem* item = *it;
-        if (item->isDir()) {
+        const KFileItem& item = *it;
+        if (item.isDir()) {
             ++folderCount;
         } else {
             ++fileCount;
-            byteSize += item->size();
+            byteSize += item.size();
         }
         ++it;
     }
@@ -450,7 +451,7 @@ void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
 #endif
 }
 
-void DolphinViewContainer::openContextMenu(KFileItem* item,
+void DolphinViewContainer::openContextMenu(const KFileItem& item,
                                            const KUrl& url)
 {
     DolphinContextMenu contextMenu(m_mainWindow, item, url);