KDirLister openUrl parameters are now flags

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index d7fc15fc81dd4914a670146a4f7b4822f4c15a15..872368ed46bd07e94a1da5405bcf01b188fb48a2 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -118,12 +118,13 @@ ColumnWidget::ColumnWidget(QWidget* parent,
     viewport()->setAttribute(Qt::WA_Hover);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
-    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
     setSelectionBehavior(SelectItems);
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setFocusPolicy(Qt::NoFocus);
+    setVerticalScrollMode(QListView::ScrollPerPixel);
+    setHorizontalScrollMode(QListView::ScrollPerPixel);
 
     // apply the column mode settings to the widget
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
@@ -522,7 +523,7 @@ void DolphinColumnView::reload()
     // all columns are hidden, now reload the directory lister
     KDirLister* dirLister = m_dolphinModel->dirLister();
     const KUrl& rootUrl = m_columns[0]->url();
-    dirLister->openUrl(rootUrl, false, true);
+    dirLister->openUrl(rootUrl, KDirLister::Reload);
     updateColumns();
 }
 

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6a6c40c7bb23cc07753cdab7696b5ec6523b53e5..eae699a7bef42595db12c4fbae5e96c133f45434 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -573,11 +573,11 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
                 // The current URL is not a child of the dir lister
                 // URL. This may happen when e. g. a place has been selected
                 // and hence the view must be reset.
-                m_dirLister->openUrl(url, false, false);
+                m_dirLister->openUrl(url, KDirLister::NoFlags);
             }
         }
     } else {
-        m_dirLister->openUrl(url, false, reload);
+        m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
     }
 }
 

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index d3ad163c90416231ff1a20f1ecd32960f1340b3e..11b2f5454ebf6cec729b51b2fe3261011a5eb978 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -238,7 +238,7 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
 
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
-        m_dirLister->openUrl(baseUrl, false, true);
+        m_dirLister->openUrl(baseUrl, KDirLister::Reload);
     } else {
         loadSubTree();
     }