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/panel.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/panels/panel.cpp') diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp index 9e7ff4ff3..6d11422d8 100644 --- a/src/panels/panel.cpp +++ b/src/panels/panel.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Cvetoslav Ludmiloff * - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006-2010 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -31,14 +31,23 @@ Panel::~Panel() { } -const KUrl& Panel::url() const +KUrl Panel::url() const { return m_url; } void Panel::setUrl(const KUrl& url) { + if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) { + return; + } + + const KUrl oldUrl = m_url; m_url = url; + const bool accepted = urlChanged(); + if (!accepted) { + m_url = oldUrl; + } } #include "panel.moc" -- cgit v1.3