Cleanup panel related class names: The terms "sidebar"/"sidebarpage" are relicts from the KDE 3 version of Dolphin and are called "Panels" in the KDE 4 version of Dolphin. Yes, renaming classes may take more than 1 year ;-)

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

6 files changed, 65 insertions, 65 deletions

diff --git a/src/panels/folders/treeviewsidebarpage.cpp b/src/panels/folders/folderspanel.cpp
index 7801a97cc..72d9a0952 100644
--- a/src/panels/folders/treeviewsidebarpage.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "treeviewsidebarpage.h"
+#include "folderspanel.h"
 
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
@@ -28,7 +28,7 @@
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
-#include "sidebartreeview.h"
+#include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
 
 #include <kfileplacesmodel.h>
@@ -44,8 +44,8 @@
 #include <QScrollBar>
 #include <QTimer>
 
-TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
-    SidebarPage(parent),
+FoldersPanel::FoldersPanel(QWidget* parent) :
+    Panel(parent),
     m_setLeafVisible(false),
     m_mouseButtons(Qt::NoButton),
     m_dirLister(0),
@@ -57,7 +57,7 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     setLayoutDirection(Qt::LeftToRight);
 }
 
-TreeViewSidebarPage::~TreeViewSidebarPage()
+FoldersPanel::~FoldersPanel()
 {
     FoldersPanelSettings::self()->writeConfig();
 
@@ -68,12 +68,12 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
-QSize TreeViewSidebarPage::sizeHint() const
+QSize FoldersPanel::sizeHint() const
 {
     return QSize(200, 400);
 }
 
-void TreeViewSidebarPage::setShowHiddenFiles(bool show)
+void FoldersPanel::setShowHiddenFiles(bool show)
 {
     FoldersPanelSettings::setShowHiddenFiles(show);
     if (m_dirLister != 0) {
@@ -82,12 +82,12 @@ void TreeViewSidebarPage::setShowHiddenFiles(bool show)
     }
 }
 
-bool TreeViewSidebarPage::showHiddenFiles() const
+bool FoldersPanel::showHiddenFiles() const
 {
     return FoldersPanelSettings::showHiddenFiles();
 }
 
-void TreeViewSidebarPage::rename(const KFileItem& item)
+void FoldersPanel::rename(const KFileItem& item)
 {
     if (DolphinSettings::instance().generalSettings()->renameInline()) {
         const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
@@ -108,30 +108,30 @@ void TreeViewSidebarPage::rename(const KFileItem& item)
     }
 }
 
-void TreeViewSidebarPage::setUrl(const KUrl& url)
+void FoldersPanel::setUrl(const KUrl& url)
 {
-    if (!url.isValid() || (url == SidebarPage::url())) {
+    if (!url.isValid() || (url == Panel::url())) {
         return;
     }
 
-    SidebarPage::setUrl(url);
+    Panel::setUrl(url);
     if (m_dirLister != 0) {
         m_setLeafVisible = true;
         loadTree(url);
     }
 }
 
-void TreeViewSidebarPage::showEvent(QShowEvent* event)
+void FoldersPanel::showEvent(QShowEvent* event)
 {
     if (event->spontaneous()) {
-        SidebarPage::showEvent(event);
+        Panel::showEvent(event);
         return;
     }
 
     if (m_dirLister == 0) {
         // Postpone the creating of the dir lister to the first show event.
         // This assures that no performance and memory overhead is given when the TreeView is not
-        // used at all (see TreeViewSidebarPage::setUrl()).
+        // used at all (see FoldersPanel::setUrl()).
         m_dirLister = new KDirLister();
         m_dirLister->setDirOnlyMode(true);
         m_dirLister->setAutoUpdate(true);
@@ -152,7 +152,7 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_proxyModel->setSourceModel(m_dolphinModel);
 
         Q_ASSERT(m_treeView == 0);
-        m_treeView = new SidebarTreeView(this);
+        m_treeView = new PanelTreeView(this);
         m_treeView->setModel(m_proxyModel);
         m_proxyModel->setSorting(DolphinView::SortByName);
         m_proxyModel->setSortOrder(Qt::AscendingOrder);
@@ -172,12 +172,12 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
     }
 
     loadTree(url());
-    SidebarPage::showEvent(event);
+    Panel::showEvent(event);
 }
 
-void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
+void FoldersPanel::contextMenuEvent(QContextMenuEvent* event)
 {
-    SidebarPage::contextMenuEvent(event);
+    Panel::contextMenuEvent(event);
 
     KFileItem item;
     const QModelIndex index = m_treeView->indexAt(event->pos());
@@ -191,7 +191,7 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
     contextMenu.open();
 }
 
-void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+void FoldersPanel::updateActiveView(const QModelIndex& index)
 {
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
     const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
@@ -200,7 +200,7 @@ void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
     }
 }
 
-void TreeViewSidebarPage::dropUrls(const QModelIndex& index, QDropEvent* event)
+void FoldersPanel::dropUrls(const QModelIndex& index, QDropEvent* event)
 {
     if (index.isValid()) {
         const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
@@ -212,14 +212,14 @@ void TreeViewSidebarPage::dropUrls(const QModelIndex& index, QDropEvent* event)
     }
 }
 
-void TreeViewSidebarPage::expandToDir(const QModelIndex& index)
+void FoldersPanel::expandToDir(const QModelIndex& index)
 {
     m_treeView->setExpanded(index, true);
     selectLeafDirectory();
     m_treeView->resizeColumnToContents(DolphinModel::Name);
 }
 
-void TreeViewSidebarPage::scrollToLeaf()
+void FoldersPanel::scrollToLeaf()
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
@@ -228,12 +228,12 @@ void TreeViewSidebarPage::scrollToLeaf()
     }
 }
 
-void TreeViewSidebarPage::updateMouseButtons()
+void FoldersPanel::updateMouseButtons()
 {
     m_mouseButtons = QApplication::mouseButtons();
 }
 
-void TreeViewSidebarPage::loadTree(const KUrl& url)
+void FoldersPanel::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
@@ -255,7 +255,7 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
     m_dolphinModel->expandToUrl(m_leafDir);
 }
 
-void TreeViewSidebarPage::selectLeafDirectory()
+void FoldersPanel::selectLeafDirectory()
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
@@ -276,4 +276,4 @@ void TreeViewSidebarPage::selectLeafDirectory()
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect);
 }
 
-#include "treeviewsidebarpage.moc"
+#include "folderspanel.moc"
diff --git a/src/panels/folders/treeviewsidebarpage.h b/src/panels/folders/folderspanel.h
index 39f2323ad..90f506fd0 100644
--- a/src/panels/folders/treeviewsidebarpage.h
+++ b/src/panels/folders/folderspanel.h
@@ -17,17 +17,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef TREEVIEWSIDEBARPAGE_H
-#define TREEVIEWSIDEBARPAGE_H
+#ifndef FOLDERSPANEL_H
+#define FOLDERSPANEL_H
 
 #include <kurl.h>
-#include <panels/sidebarpage.h>
+#include <panels/panel.h>
 
 class KDirLister;
 class DolphinModel;
 
 class DolphinSortFilterProxyModel;
-class SidebarTreeView;
+class PanelTreeView;
 class QModelIndex;
 
 /**
@@ -37,13 +37,13 @@ class QModelIndex;
  * The tree view is always synchronized with the currently active view
  * from the main window.
  */
-class TreeViewSidebarPage : public SidebarPage
+class FoldersPanel : public Panel
 {
     Q_OBJECT
 
 public:
-    TreeViewSidebarPage(QWidget* parent = 0);
-    virtual ~TreeViewSidebarPage();
+    FoldersPanel(QWidget* parent = 0);
+    virtual ~FoldersPanel();
 
     /** @see QWidget::sizeHint() */
     virtual QSize sizeHint() const;
@@ -60,7 +60,7 @@ signals:
     void changeUrl(const KUrl& url, Qt::MouseButtons buttons);
 
     /**
-     * This signal is emitted when the sidebar requests a change in the
+     * This signal is emitted when the panel requests a change in the
      * current selection. The file-management view recieving this signal is
      * not required to select all listed files, limiting the selection to
      * e.g. the current folder. The new selection will be reported via the
@@ -118,7 +118,7 @@ private:
     /**
      * Selects the current leaf directory m_leafDir and assures
      * that the directory is visible if the leaf has been set by
-     * TreeViewSidebarPage::setUrl().
+     * FoldersPanel::setUrl().
      */
     void selectLeafDirectory();
 
@@ -128,8 +128,8 @@ private:
     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
-    SidebarTreeView* m_treeView;
+    PanelTreeView* m_treeView;
     KUrl m_leafDir;
 };
 
-#endif // TREEVIEWSIDEBARPAGE_H
+#endif // FOLDERSPANEL_H
diff --git a/src/panels/folders/sidebartreeview.cpp b/src/panels/folders/paneltreeview.cpp
index a876ee6c3..b285789f0 100644
--- a/src/panels/folders/sidebartreeview.cpp
+++ b/src/panels/folders/paneltreeview.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "sidebartreeview.h"
+#include "paneltreeview.h"
 
 #include "dolphincontroller.h"
 #include "dolphinmodel.h"
@@ -29,7 +29,7 @@
 #include <QHeaderView>
 #include <QScrollBar>
 
-SidebarTreeView::SidebarTreeView(QWidget* parent) :
+PanelTreeView::PanelTreeView(QWidget* parent) :
     KTreeView(parent)
 {
     setAcceptDrops(true);
@@ -60,11 +60,11 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) :
     setItemDelegate(delegate);
 }
 
-SidebarTreeView::~SidebarTreeView()
+PanelTreeView::~PanelTreeView()
 {
 }
 
-bool SidebarTreeView::event(QEvent* event)
+bool PanelTreeView::event(QEvent* event)
 {
     switch (event->type()) {
     case QEvent::Polish:
@@ -79,20 +79,20 @@ bool SidebarTreeView::event(QEvent* event)
         hideColumn(DolphinModel::Tags);
         header()->hide();
         break;
-        
+
     case QEvent::Show:
         // TODO: The opening/closing animation of subtrees flickers in combination with the
-        // sidebar when using the Oxygen style. As workaround the animation is turned off:
+        // panel when using the Oxygen style. As workaround the animation is turned off:
         setAnimated(false);
         break;
-    
+
     case QEvent::UpdateRequest:
         // a wheel movement will scroll 1 item
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3);
         }
         break;
-        
+
     default:
         break;
     }
@@ -100,12 +100,12 @@ bool SidebarTreeView::event(QEvent* event)
     return KTreeView::event(event);
 }
 
-void SidebarTreeView::startDrag(Qt::DropActions supportedActions)
+void PanelTreeView::startDrag(Qt::DropActions supportedActions)
 {
     DragAndDropHelper::instance().startDrag(this, supportedActions);
 }
 
-void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event)
+void PanelTreeView::dragEnterEvent(QDragEnterEvent* event)
 {
     KTreeView::dragEnterEvent(event);
     if (event->mimeData()->hasUrls()) {
@@ -113,13 +113,13 @@ void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event)
     }
 }
 
-void SidebarTreeView::dragLeaveEvent(QDragLeaveEvent* event)
+void PanelTreeView::dragLeaveEvent(QDragLeaveEvent* event)
 {
     KTreeView::dragLeaveEvent(event);
     setDirtyRegion(m_dropRect);
 }
 
-void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event)
+void PanelTreeView::dragMoveEvent(QDragMoveEvent* event)
 {
     KTreeView::dragMoveEvent(event);
 
@@ -135,7 +135,7 @@ void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event)
     }
 }
 
-void SidebarTreeView::dropEvent(QDropEvent* event)
+void PanelTreeView::dropEvent(QDropEvent* event)
 {
     const QModelIndex index = indexAt(event->pos());
     if (index.isValid()) {
@@ -144,4 +144,4 @@ void SidebarTreeView::dropEvent(QDropEvent* event)
     KTreeView::dropEvent(event);
 }
 
-#include "sidebartreeview.moc"
+#include "paneltreeview.moc"
diff --git a/src/panels/folders/sidebartreeview.h b/src/panels/folders/paneltreeview.h
index a5e8b63ce..0f0996875 100644
--- a/src/panels/folders/sidebartreeview.h
+++ b/src/panels/folders/paneltreeview.h
@@ -17,24 +17,24 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef SIDEBARTREEVIEW_H
-#define SIDEBARTREEVIEW_H
+#ifndef PANELTREEVIEW_H
+#define PANELTREEVIEW_H
 
 #include <kurl.h>
 #include <panels/folders/ktreeview.h>
 
 /**
- * @brief Tree view widget which is used for the sidebar panel.
+ * @brief Tree view widget which is used for the folders panel.
  *
- * @see TreeViewSidebarPage
+ * @see FoldersPanel
  */
-class SidebarTreeView : public KTreeView
+class PanelTreeView : public KTreeView
 {
     Q_OBJECT
 
 public:
-    explicit SidebarTreeView(QWidget* parent = 0);
-    virtual ~SidebarTreeView();
+    explicit PanelTreeView(QWidget* parent = 0);
+    virtual ~PanelTreeView();
 
 signals:
     /**
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 9e8638002..c63772a38 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -32,12 +32,12 @@
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 
-#include "treeviewsidebarpage.h"
+#include "folderspanel.h"
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
 
-TreeViewContextMenu::TreeViewContextMenu(TreeViewSidebarPage* parent,
+TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
     QObject(parent),
     m_parent(parent),
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 20a603573..8da23721b 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include <KFileItem>
 
-class TreeViewSidebarPage;
+class FoldersPanel;
 
 /**
  * @brief Represents the context menu which appears when doing a right
@@ -35,13 +35,13 @@ class TreeViewContextMenu : public QObject
 
 public:
     /**
-     * @parent        Pointer to the treeview sidebar page the context menu
+     * @parent        Pointer to the folders panel the context menu
      *                belongs to.
      * @fileInfo      Pointer to the file item the context menu
      *                is applied. If 0 is passed, the context menu
      *                is above the viewport.
      */
-    TreeViewContextMenu(TreeViewSidebarPage* parent,
+    TreeViewContextMenu(FoldersPanel* parent,
                         const KFileItem& fileInfo);
 
     virtual ~TreeViewContextMenu();
@@ -81,7 +81,7 @@ private:
     void populateMimeData(QMimeData* mimeData, bool cut);
 
 private:
-    TreeViewSidebarPage* m_parent;
+    FoldersPanel* m_parent;
     KFileItem m_fileInfo;
 };