diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp index 30cff509d..40f816158 100644 --- a/src/panels/panel.cpp +++ b/src/panels/panel.cpp @@ -1,77 +1,76 @@ /*************************************************************************** * Copyright (C) 2006 by Cvetoslav Ludmiloff * * 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 * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "panel.h" Panel::Panel(QWidget* parent) : QWidget(parent), m_url(), m_customContextMenuActions() { } Panel::~Panel() { } QUrl Panel::url() const { return m_url; } void Panel::setCustomContextMenuActions(const QList& actions) { m_customContextMenuActions = actions; } QList Panel::customContextMenuActions() const { return m_customContextMenuActions; } QSize Panel::sizeHint() const { // The size hint will be requested already when starting Dolphin even // if the panel is invisible. For performance reasons most panels delay // the creation and initialization of widgets until a showEvent() is called. // Because of this the size-hint of the embedded widgets cannot be used // and a default size is provided: return QSize(180, 180); } void Panel::setUrl(const QUrl& url) { if (url.matches(m_url, QUrl::StripTrailingSlash)) { return; } const QUrl oldUrl = m_url; m_url = url; - const bool accepted = urlChanged(); - if (!accepted) { + if (!urlChanged()) { m_url = oldUrl; } } void Panel::readSettings() { }