X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c20f14478a527ec3a4169396d2c1472a8f4020af..175fe7ff47ccff39b0e77f80491a9701d025375e:/src/urlbutton.cpp

diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp
index 057bcff5a..b1faae393 100644
--- a/src/urlbutton.cpp
+++ b/src/urlbutton.cpp
@@ -29,33 +29,26 @@
 #include <klocale.h>
 
 #include "urlnavigator.h"
-#include "dolphin.h"
+#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(&Dolphin::mainWin(), SIGNAL(activeViewChanged()),
-            this, SLOT(update()));
+    connect(this, SIGNAL(clicked()), parent, SLOT(requestActivation()));
 }
 
-URLButton::~URLButton()
+UrlButton::~UrlButton()
 {
 }
 
-URLNavigator* URLButton::urlNavigator() const
-{
-    return m_urlNavigator;
-}
-
-void URLButton::setDisplayHintEnabled(DisplayHint hint,
+void UrlButton::setDisplayHintEnabled(DisplayHint hint,
                                       bool enable)
 {
     if (enable) {
@@ -67,26 +60,26 @@ void URLButton::setDisplayHintEnabled(DisplayHint hint,
     update();
 }
 
-bool URLButton::isDisplayHintEnabled(DisplayHint hint) const
+bool UrlButton::isDisplayHintEnabled(DisplayHint hint) const
 {
     return (m_displayHint & hint) > 0;
 }
 
-void URLButton::enterEvent(QEvent* event)
+void UrlButton::enterEvent(QEvent* event)
 {
     QPushButton::enterEvent(event);
     setDisplayHintEnabled(EnteredHint, true);
     update();
 }
 
-void URLButton::leaveEvent(QEvent* event)
+void UrlButton::leaveEvent(QEvent* event)
 {
     QPushButton::leaveEvent(event);
     setDisplayHintEnabled(EnteredHint, false);
     update();
 }
 
-QColor URLButton::mixColors(const QColor& c1,
+QColor UrlButton::mixColors(const QColor& c1,
                             const QColor& c2) const
 {
     const int red   = (c1.red()   + c2.red())   / 2;
@@ -94,3 +87,5 @@ QColor URLButton::mixColors(const QColor& c1,
     const int blue  = (c1.blue()  + c2.blue())  / 2;
     return QColor(red, green, blue);
 }
+
+#include "urlbutton.moc"