don't use the term "Bookmarks" anymore, use "Places" instead (includes devices etc.)

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 97db7480dc1e9b206fcfc75a7bad9f649c2d0314..c8bae088b48920ffe52bee7428ab531933d4c51b 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -128,9 +128,9 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
     }
 
     const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    KFileItem* item = m_dirModel->itemForIndex(dirModelIndex);
+    KFileItem item = m_dirModel->itemForIndex(dirModelIndex);
 
-    emit changeSelection(KFileItemList());
+    emit changeSelection(QList<KFileItem>());
     TreeViewContextMenu contextMenu(this, item);
     contextMenu.open();
 }
@@ -166,10 +166,9 @@ void TreeViewSidebarPage::expandSelectionParent()
 void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
 {
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-    const KFileItem* item = m_dirModel->itemForIndex(dirIndex);
-    if (item != 0) {
-        const KUrl& url = item->url();
-        emit changeUrl(url);
+    const KFileItem item = m_dirModel->itemForIndex(dirIndex);
+    if (!item.isNull()) {
+        emit changeUrl(item.url());
     }
 }
 
@@ -178,10 +177,10 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
 {
     if (index.isValid()) {
         const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
-        KFileItem* item = m_dirModel->itemForIndex(dirIndex);
-        Q_ASSERT(item != 0);
-        if (item->isDir()) {
-            emit urlsDropped(urls, item->url());
+        KFileItem item = m_dirModel->itemForIndex(dirIndex);
+        Q_ASSERT(!item.isNull());
+        if (item.isDir()) {
+            emit urlsDropped(urls, item.url());
         }
     }
 }
@@ -190,7 +189,7 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
 
-    // adjust the root of the tree to the base bookmark
+    // adjust the root of the tree to the base place
     KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
     KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
     if (!baseUrl.isValid()) {