From ae1911e6b0065e73b70311e2a671c98005ff817a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 6 Nov 2013 16:46:09 +0100 Subject: [PATCH] Revert "Files passed as arguments: Ignore unsupported files" This reverts commit cd9e50ae4f3ded5a78d0cfb09a67684a9c15d726. See bug#327224 for details. --- src/dolphinmainwindow.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 9da73f96e..b477600f0 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -31,7 +31,6 @@ #include "panels/information/informationpanel.h" #include "settings/dolphinsettingsdialog.h" #include "statusbar/dolphinstatusbar.h" -#include "views/dolphinview.h" #include "views/dolphinviewactionhandler.h" #include "views/dolphinremoteencoding.h" #include "views/draganddrophelper.h" @@ -244,20 +243,8 @@ void DolphinMainWindow::openDirectories(const QList& dirs) return; } - // dirs could contain URLs that actually point to archives or other files. - // Replace them by URLs we can open where possible and filter the rest out. - QList urlsToOpen; - foreach (const KUrl& rawUrl, dirs) { - const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl); - item.determineMimeType(); - const KUrl& url = DolphinView::openItemAsFolderUrl(item); - if (!url.isEmpty()) { - urlsToOpen.append(url); - } - } - - if (urlsToOpen.count() == 1) { - m_activeViewContainer->setUrl(urlsToOpen.first()); + if (dirs.count() == 1) { + m_activeViewContainer->setUrl(dirs.first()); return; } @@ -267,12 +254,12 @@ void DolphinMainWindow::openDirectories(const QList& dirs) // Open each directory inside a new tab. If the "split view" option has been enabled, // always show two directories within one tab. - QList::const_iterator it = urlsToOpen.begin(); - while (it != urlsToOpen.end()) { + QList::const_iterator it = dirs.begin(); + while (it != dirs.end()) { openNewTab(*it); ++it; - if (hasSplitView && (it != urlsToOpen.end())) { + if (hasSplitView && (it != dirs.end())) { const int tabIndex = m_viewTab.count() - 1; m_viewTab[tabIndex].secondaryView->setUrl(*it); ++it; -- 2.47.3