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/terminal/terminalpanel.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/panels/terminal/terminalpanel.cpp') diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index d6b370329..12b319f3c 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -52,26 +52,26 @@ QSize TerminalPanel::sizeHint() const return size; } -void TerminalPanel::setUrl(const KUrl& url) +void TerminalPanel::terminalExited() { - if (!url.isValid() || (url == Panel::url())) { - return; - } + emit hideTerminalPanel(); + m_terminal = 0; +} - Panel::setUrl(url); +bool TerminalPanel::urlChanged() +{ + if (!url().isValid()) { + return false; + } const bool sendInput = (m_terminal != 0) && (m_terminal->foregroundProcessId() == -1) && isVisible(); if (sendInput) { - changeDir(url); + changeDir(url()); } -} -void TerminalPanel::terminalExited() -{ - emit hideTerminalPanel(); - m_terminal = 0; + return true; } void TerminalPanel::showEvent(QShowEvent* event) -- cgit v1.3