Cleanup of the URL navigator, so that the DolphinMainWindow and the DolphinView are not used anymore. This will make it easier for us later on when moving the URL navigator outside Dolphin to make it accessable for other parts. Currently the bookmarks are still accessed by DolphinSettings, but this will be cleaned up later...

svn path=/trunk/KDE/kdebase/apps/; revision=634432

1 files changed, 5 insertions, 12 deletions

diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp
index f2bf8ccda..b1faae393 100644
--- a/src/urlbutton.cpp
+++ b/src/urlbutton.cpp
@@ -32,29 +32,22 @@
 #include "dolphinmainwindow.h"
 
 
-UrlButton::UrlButton(UrlNavigator* parent)
-: QPushButton(parent),
-  m_displayHint(0),
-  m_urlNavigator(parent)
+UrlButton::UrlButton(UrlNavigator* parent) :
+    QPushButton(parent),
+    m_displayHint(0),
+    m_urlNavigator(parent)
 {
     setFocusPolicy(Qt::NoFocus);
     setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
     setMinimumHeight(parent->minimumHeight());
 
-    connect(this, SIGNAL(clicked()), parent, SLOT(slotRequestActivation()));
-    connect(parent->dolphinView()->mainWindow(), SIGNAL(activeViewChanged()),
-            this, SLOT(update()));
+    connect(this, SIGNAL(clicked()), parent, SLOT(requestActivation()));
 }
 
 UrlButton::~UrlButton()
 {
 }
 
-UrlNavigator* UrlButton::urlNavigator() const
-{
-    return m_urlNavigator;
-}
-
 void UrlButton::setDisplayHintEnabled(DisplayHint hint,
                                       bool enable)
 {