SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / panels / panel.cpp

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index 712e3ef5f329b4361e1ecd8753e6a74a8a1d5e98..e13684922771575cc9b0a543cbe5774996eae468 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -1,30 +1,16 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
- *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
- *                                                                         *
- *   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          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Cvetoslav Ludmiloff <ludmiloff@gmail.com>
+ * SPDX-FileCopyrightText: 2006-2010 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "panel.h"
-#include <KUrl>
 
-Panel::Panel(QWidget* parent) :
-    QWidget(parent),
-    m_url(),
-    m_customContextMenuActions()
+Panel::Panel(QWidget *parent)
+    : QWidget(parent)
+    , m_url()
+    , m_customContextMenuActions()
 {
 }
 
@@ -32,17 +18,17 @@ Panel::~Panel()
 {
 }
 
-KUrl Panel::url() const
+QUrl Panel::url() const
 {
     return m_url;
 }
 
-void Panel::setCustomContextMenuActions(const QList<QAction*>& actions)
+void Panel::setCustomContextMenuActions(const QList<QAction *> &actions)
 {
     m_customContextMenuActions = actions;
 }
 
-QList<QAction*> Panel::customContextMenuActions() const
+QList<QAction *> Panel::customContextMenuActions() const
 {
     return m_customContextMenuActions;
 }
@@ -57,18 +43,21 @@ QSize Panel::sizeHint() const
     return QSize(180, 180);
 }
 
-void Panel::setUrl(const KUrl& url)
+void Panel::setUrl(const QUrl &url)
 {
-    if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) {
+    if (url.matches(m_url, QUrl::StripTrailingSlash)) {
         return;
     }
 
-    const KUrl oldUrl = m_url;
+    const QUrl oldUrl = m_url;
     m_url = url;
-    const bool accepted = urlChanged();
-    if (!accepted) {
+    if (!urlChanged()) {
         m_url = oldUrl;
     }
 }
 
-#include "panel.moc"
+void Panel::readSettings()
+{
+}
+
+#include "moc_panel.cpp"