Internal cleanup: Remove public method selectedUrls() from DolphinView to keep the...

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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 20be6f4e8e1c616137f776e43606e13d6e022114..13fa6f35b9ec33e6aeecf20579641e7b248d9ec6 100644 (file)
--- 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();
     // 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();
     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)) {
 
     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 21b1817468c3251edb08b52ade656ae0f2f580cf..e3f3a4d10483bd458f3c744484bdc2fe7e210a22 100644 (file)
--- 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()) {
     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()) {
     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()) {
     }
 
     if (!newWindowUrl.isEmpty()) {


@@ -912,30 +912,31 @@ void DolphinMainWindow::compareFiles()
 
     KUrl urlA;
     KUrl urlB;
 
     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);
     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);
         Q_ASSERT(urls.count() == 2);

-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();

         break;
     }
 
     case 1: {
         break;
     }
 
     case 1: {

-        urlA = urls[0];
+        urlA = items[0].url();

         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
         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: {
         break;
     }
 
     case 2: {

-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();

         break;
     }
 
         break;
     }
 

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 238ce7ebcf829c88dc88418da480868d5079165f..0237a1dca37b7036533032e47b3a48cff0ebef67 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -314,16 +314,6 @@ KFileItemList DolphinView::selectedItems() const
     return itemList;
 }
 
     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();
 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 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
 }
 
 QMimeData* DolphinView::selectionMimeData() const

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index f24bb6be747872a5b27934c89550324575f69026..7416edf587a4f4eb5fc171c2d72c2560235f0a5d 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -195,13 +195,6 @@ public:
      */
     KFileItemList selectedItems() const;
 
      */
     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()).
     /**
      * Returns the number of selected items (this is faster than
      * invoking selectedItems().count()).