redo service menu ruby helpers from ground up more or less

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

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index 7673134456f7ae84c61375f1a88b927dc8cdd431..40f8161582df97cdbc3752d301f8c9c9b043f8d3 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <KUrl>
 
 Panel::Panel(QWidget* parent) :
     QWidget(parent),
@@ -32,7 +31,7 @@ Panel::~Panel()
 {
 }
 
-KUrl Panel::url() const
+QUrl Panel::url() const
 {
     return m_url;
 }
@@ -57,16 +56,15 @@ 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;
     }
 }