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

2 files changed, 24 insertions, 25 deletions

diff --git a/src/panels/terminal/terminalsidebarpage.cpp b/src/panels/terminal/terminalpanel.cpp
index 4749e7714..cc3b85318 100644
--- a/src/panels/terminal/terminalsidebarpage.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "terminalsidebarpage.h"
+#include "terminalpanel.h"
 
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
@@ -27,8 +27,8 @@
 #include <QBoxLayout>
 #include <QShowEvent>
 
-TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
-    SidebarPage(parent),
+TerminalPanel::TerminalPanel(QWidget* parent) :
+    Panel(parent),
     m_layout(0),
     m_terminal(0),
     m_terminalWidget(0)
@@ -37,40 +37,39 @@ TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     m_layout->setMargin(0);
 }
 
-TerminalSidebarPage::~TerminalSidebarPage()
+TerminalPanel::~TerminalPanel()
 {
 }
 
-QSize TerminalSidebarPage::sizeHint() const
+QSize TerminalPanel::sizeHint() const
 {
-    QSize size = SidebarPage::sizeHint();
+    QSize size = Panel::sizeHint();
     size.setHeight(200);
     return size;
 }
 
-void TerminalSidebarPage::setUrl(const KUrl& url)
+void TerminalPanel::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_terminal != 0) && isVisible() && url.isLocalFile()) {
         m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
     }
 }
 
-void TerminalSidebarPage::terminalExited()
+void TerminalPanel::terminalExited()
 {
-    emit hideTerminalSidebarPage();
-
+    emit hideTerminalPanel();
     m_terminal = 0;
 }
 
-void TerminalSidebarPage::showEvent(QShowEvent* event)
+void TerminalPanel::showEvent(QShowEvent* event)
 {
     if (event->spontaneous()) {
-        SidebarPage::showEvent(event);
+        Panel::showEvent(event);
         return;
     }
 
@@ -91,7 +90,7 @@ void TerminalSidebarPage::showEvent(QShowEvent* event)
         m_terminalWidget->setFocus();
     }
 
-    SidebarPage::showEvent(event);
+    Panel::showEvent(event);
 }
 
-#include "terminalsidebarpage.moc"
+#include "terminalpanel.moc"
diff --git a/src/panels/terminal/terminalsidebarpage.h b/src/panels/terminal/terminalpanel.h
index 4e8c40593..672938c32 100644
--- a/src/panels/terminal/terminalsidebarpage.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef TERMINALSIDEBARPAGE_H
-#define TERMINALSIDEBARPAGE_H
+#ifndef TERMINALPANEL_H
+#define TERMINALPANEL_H
 
-#include <panels/sidebarpage.h>
+#include <panels/panel.h>
 
 class TerminalInterface;
 class QVBoxLayout;
@@ -30,24 +30,24 @@ class QWidget;
  * @brief Shows the terminal which is synchronized with the URL of the
  *        active view.
  */
-class TerminalSidebarPage : public SidebarPage
+class TerminalPanel : public Panel
 {
     Q_OBJECT
 
 public:
-    TerminalSidebarPage(QWidget* parent = 0);
-    virtual ~TerminalSidebarPage();
+    TerminalPanel(QWidget* parent = 0);
+    virtual ~TerminalPanel();
 
     /** @see QWidget::sizeHint() */
     virtual QSize sizeHint() const;
 
 public slots:
-    /** @see SidebarPage::setUrl(). */
+    /** @see Panel::setUrl(). */
     virtual void setUrl(const KUrl& url);
     void terminalExited();
 
 signals:
-    void hideTerminalSidebarPage();
+    void hideTerminalPanel();
 
 protected:
     /** @see QWidget::showEvent() */
@@ -59,4 +59,4 @@ private:
     QWidget* m_terminalWidget;
 };
 
-#endif // TERMINALSIDEBARPAGE_H
+#endif // TERMINALPANEL_H