From 431da0482caa72f90a6a04785383eb1d133f678e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 7 Oct 2010 14:09:30 +0000 Subject: Internal cleanup for panels: Let the panel-implementations decide whether they accept an URL or not. svn path=/trunk/KDE/kdebase/apps/; revision=1183480 --- src/panels/folders/folderspanel.cpp | 15 ++++++--------- src/panels/folders/folderspanel.h | 9 +++------ 2 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src/panels/folders') diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 134d8ba7e..fae7ca6a1 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -103,23 +103,20 @@ void FoldersPanel::rename(const KFileItem& item) } } -void FoldersPanel::setUrl(const KUrl& url) +bool FoldersPanel::urlChanged() { - if (!url.isValid() || (url == Panel::url())) { - return; - } - - if (url.protocol().contains("search")) { + if (!url().isValid() || url().protocol().contains("search")) { // Skip results shown by a search, as possible identical // directory names are useless without parent-path information. - return; + return false; } - Panel::setUrl(url); if (m_dirLister != 0) { m_setLeafVisible = true; - loadTree(url); + loadTree(url()); } + + return true; } void FoldersPanel::showEvent(QShowEvent* event) diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h index 438a9ee68..972dc13a7 100644 --- a/src/panels/folders/folderspanel.h +++ b/src/panels/folders/folderspanel.h @@ -59,13 +59,10 @@ signals: */ void changeUrl(const KUrl& url, Qt::MouseButtons buttons); -public slots: - /** - * Changes the current selection inside the tree to \a url. - */ - virtual void setUrl(const KUrl& url); - protected: + /** @see Panel::urlChanged() */ + virtual bool urlChanged(); + /** @see QWidget::showEvent() */ virtual void showEvent(QShowEvent* event); -- cgit v1.3.1