SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 32779ffce8eb6ffd4a6b23c9d57f467149bc943b..d8387aea2ce3f9c6e46de41a31e19466f574ceca 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -156,7 +156,7 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_treeView->setModel(m_proxyModel);
         m_proxyModel->setSorting(DolphinView::SortByName);
         m_proxyModel->setSortOrder(Qt::AscendingOrder);
-        
+
         new FolderExpander(m_treeView, m_proxyModel);
 
         connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
@@ -207,7 +207,7 @@ void TreeViewSidebarPage::dropUrls(const QModelIndex& index, QDropEvent* event)
         KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
         Q_ASSERT(!item.isNull());
         if (item.isDir()) {
-            DragAndDropHelper::dropUrls(item, item.url(), event, this);
+            DragAndDropHelper::instance().dropUrls(item, item.url(), event, this);
         }
     }
 }
@@ -216,6 +216,7 @@ void TreeViewSidebarPage::expandToDir(const QModelIndex& index)
 {
     m_treeView->setExpanded(index, true);
     selectLeafDirectory();
+    m_treeView->resizeColumnToContents(DolphinModel::Name);
 }
 
 void TreeViewSidebarPage::scrollToLeaf()
@@ -237,14 +238,14 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
 
-    KUrl baseUrl = url;
+    KUrl baseUrl;
     if (url.isLocalFile()) {
-        // use the root directory as base for local URLs
+        // use the root directory as base for local URLs (#150941)
         baseUrl = QDir::rootPath();
     } else {
         // clear the path for non-local URLs and use it as base
         baseUrl = url;
-        baseUrl.setPath(QString());
+        baseUrl.setPath(QString('/'));
     }
 
     if (m_dirLister->url() != baseUrl) {