From 36e89e9fa614cbc428ada94784147dca341d2fb7 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 10 Oct 2010 11:11:45 +0000
Subject: [PATCH] Internal cleanup: Remove public method selectedUrls() from
 DolphinView to keep the interface minimal (selectedItems() is already
 available)

svn path=/trunk/KDE/kdebase/apps/; revision=1184457
---
 src/dolphincontextmenu.cpp |  4 +++-
 src/dolphinmainwindow.cpp  | 27 ++++++++++++++-------------
 src/views/dolphinview.cpp  | 26 ++++++++++++--------------
 src/views/dolphinview.h    |  7 -------
 4 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 20be6f4e8..13fa6f35b 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -74,8 +74,10 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
+    foreach (const KFileItem &item, m_selectedItems) {
+        m_selectedUrls.append(item.url());
+    }
 
     if (m_keyInfo != 0) {
         if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 21b181746..e3f3a4d10 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -465,7 +465,7 @@ void DolphinMainWindow::openInNewTab()
     if (list.isEmpty()) {
         openNewTab(m_activeViewContainer->url());
     } else if ((list.count() == 1) && list[0].isDir()) {
-        openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);
+        openNewTab(list[0].url());
     }
 }
 
@@ -477,7 +477,7 @@ void DolphinMainWindow::openInNewWindow()
     if (list.isEmpty()) {
         newWindowUrl = m_activeViewContainer->url();
     } else if ((list.count() == 1) && list[0].isDir()) {
-        newWindowUrl = m_activeViewContainer->view()->selectedUrls()[0];
+        newWindowUrl = list[0].url();
     }
 
     if (!newWindowUrl.isEmpty()) {
@@ -912,30 +912,31 @@ void DolphinMainWindow::compareFiles()
 
     KUrl urlA;
     KUrl urlB;
-    KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();
 
-    switch (urls.count()) {
+    KFileItemList items = m_viewTab[m_tabIndex].primaryView->view()->selectedItems();
+
+    switch (items.count()) {
     case 0: {
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
-        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(urls.count() == 2);
-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();
         break;
     }
 
     case 1: {
-        urlA = urls[0];
+        urlA = items[0].url();
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
-        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
-        Q_ASSERT(urls.count() == 1);
-        urlB = urls[0];
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+        Q_ASSERT(items.count() == 1);
+        urlB = items[0].url();
         break;
     }
 
     case 2: {
-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();
         break;
     }
 
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 238ce7ebc..0237a1dca 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -314,16 +314,6 @@ KFileItemList DolphinView::selectedItems() const
     return itemList;
 }
 
-KUrl::List DolphinView::selectedUrls() const
-{
-    KUrl::List urls;
-    const KFileItemList list = selectedItems();
-    foreach (const KFileItem &item, list) {
-        urls.append(item.url());
-    }
-    return urls;
-}
-
 int DolphinView::selectedItemsCount() const
 {
     const QAbstractItemView* view = m_viewAccessor.itemView();
@@ -1261,11 +1251,19 @@ void DolphinView::updateZoomLevel(int oldZoomLevel)
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
-    KUrl::List list = selectedUrls();
-    if (itemsExpandable() ) {
-        list = KDirModel::simplifiedUrlList(list);
+    KUrl::List urls;
+
+    const KFileItemList items = selectedItems();
+    foreach (const KFileItem &item, items) {
+        urls.append(item.url());
+    }
+
+
+    if (itemsExpandable()) {
+        urls = KDirModel::simplifiedUrlList(urls);
     }
-    return list;
+
+    return urls;
 }
 
 QMimeData* DolphinView::selectionMimeData() const
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index f24bb6be7..7416edf58 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -195,13 +195,6 @@ public:
      */
     KFileItemList selectedItems() const;
 
-    /**
-     * Returns a list of URLs for all selected items. An empty list
-     * is returned, if no item is selected.
-     * @see DolphinView::selectedItems()
-     */
-    KUrl::List selectedUrls() const;
-
     /**
      * Returns the number of selected items (this is faster than
      * invoking selectedItems().count()).
-- 
2.47.3